diff --git a/BUILD_DASHBOARD.md b/BUILD_DASHBOARD.md deleted file mode 100644 index 8bf6669..0000000 --- a/BUILD_DASHBOARD.md +++ /dev/null @@ -1,138 +0,0 @@ -# Dashboard Build System - -This document explains how to keep the Flutter web dashboard in sync with the server's static files. - -## Overview - -The XP Nix server serves static files from `xp_server/lib/src/web/static/` directory. The Flutter dashboard is a separate project in `xp_dashboard/` that needs to be built for web and copied to the static directory. - -## Build Methods - -### Method 1: Using the Server Command (Recommended) - -When the server is running, you can use the interactive `build` command: - -1. Start the server: - ```bash - cd xp_server - dart run bin/xp_nix.dart - ``` - -2. Type `build` in the server console and press Enter: - ``` - build - ``` - -The server will: -- Check if Flutter is available -- Build the Flutter dashboard with `flutter build web --release` -- Copy all files from `xp_dashboard/build/web/` to `xp_server/lib/src/web/static/` -- Provide feedback on the build status - -### Method 2: Using the Shell Script - -For building outside of the running server, use the provided shell script: - -```bash -./build_dashboard.sh -``` - -This script: -- Checks for Flutter availability -- Builds the Flutter dashboard -- Clears old static files -- Copies new files to the static directory - -## Build Process Details - -### What Gets Built - -The Flutter build process creates: -- `index.html` - Main HTML file -- `main.dart.js` - Compiled Dart code -- `flutter.js`, `flutter_bootstrap.js` - Flutter runtime -- `flutter_service_worker.js` - Service worker for PWA features -- `assets/` - Flutter assets and fonts -- `canvaskit/` - CanvasKit rendering engine -- `icons/` - App icons -- `manifest.json` - Web app manifest -- Other supporting files - -### File Synchronization - -The build process: -1. **Clears** the existing `xp_server/lib/src/web/static/` directory -2. **Copies** all files from `xp_dashboard/build/web/` to the static directory -3. **Preserves** the directory structure including subdirectories - -## Development Workflow - -### When to Rebuild - -Rebuild the dashboard when you: -- Make changes to Flutter widgets in `xp_dashboard/lib/` -- Update dependencies in `xp_dashboard/pubspec.yaml` -- Modify theme or styling -- Add new features to the dashboard - -### Typical Workflow - -1. Make changes to the Flutter dashboard code -2. Test locally if needed: `cd xp_dashboard && flutter run -d web-server` -3. Build and deploy: Use either the server `build` command or `./build_dashboard.sh` -4. Refresh your browser to see the changes - -## Troubleshooting - -### Flutter Not Found -``` -❌ Flutter is not available in the system PATH -``` -**Solution**: Ensure Flutter is installed and added to your PATH. - -### Build Failed -``` -❌ Flutter build failed -``` -**Solution**: Check the error output, usually related to: -- Dart compilation errors -- Missing dependencies (`flutter pub get`) -- Invalid Flutter code - -### Files Not Copied -``` -❌ Build output directory not found -``` -**Solution**: The Flutter build didn't complete successfully. Check the build output for errors. - -## File Structure - -``` -xp_nix/ -├── xp_dashboard/ # Flutter dashboard source -│ ├── lib/ # Flutter source code -│ ├── web/ # Web-specific files -│ └── build/web/ # Build output (generated) -├── xp_server/ -│ ├── lib/src/web/static/ # Static files served by server -│ └── lib/src/build/ # Build system code -├── build_dashboard.sh # Standalone build script -└── BUILD_DASHBOARD.md # This documentation -``` - -## Advanced Usage - -### Custom Build Options - -To modify build options, edit the Flutter build command in: -- `xp_server/lib/src/build/dashboard_builder.dart` (for server command) -- `build_dashboard.sh` (for shell script) - -Current build command: `flutter build web --release` - -### Development vs Production - -- **Development**: Use `flutter build web` (debug mode, faster builds) -- **Production**: Use `flutter build web --release` (optimized, smaller files) - -The current setup uses `--release` for optimal performance. diff --git a/build_dashboard.sh b/build_dashboard.sh deleted file mode 100755 index 0744322..0000000 --- a/build_dashboard.sh +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/bash - -# Build Dashboard Script -# This script builds the Flutter dashboard and copies the files to the server's static directory - -set -e # Exit on any error - -echo "🔨 Building Flutter Dashboard..." -echo "================================" - -# Check if Flutter is available -if ! command -v flutter &> /dev/null; then - echo "❌ Flutter is not available in the system PATH" - echo " Please ensure Flutter is installed and available in your PATH" - exit 1 -fi - -# Check if dashboard directory exists -if [ ! -d "xp_dashboard" ]; then - echo "❌ Dashboard directory 'xp_dashboard' not found" - echo " Please run this script from the project root directory" - exit 1 -fi - -# Build Flutter web app -echo "🚀 Running flutter build web..." -cd xp_dashboard -flutter build web --release -cd .. - -# Check if build was successful -if [ ! -d "xp_dashboard/build/web" ]; then - echo "❌ Build failed - output directory not found" - exit 1 -fi - -# Create static directory if it doesn't exist -mkdir -p xp_server/lib/src/web/static - -# Clear existing static files -echo "🧹 Clearing old static files..." -rm -rf xp_server/lib/src/web/static/* - -# Copy new files -echo "📁 Copying new files to static directory..." -cp -r xp_dashboard/build/web/* xp_server/lib/src/web/static/ - -echo "✅ Dashboard build completed successfully!" -echo " Files copied to: xp_server/lib/src/web/static/" -echo " The server will now serve the updated Flutter dashboard" diff --git a/xp_server/flake.lock b/flake.lock similarity index 100% rename from xp_server/flake.lock rename to flake.lock diff --git a/xp_server/flake.nix b/flake.nix similarity index 96% rename from xp_server/flake.nix rename to flake.nix index cb11e68..d301097 100644 --- a/xp_server/flake.nix +++ b/flake.nix @@ -30,7 +30,8 @@ libepoxy # For drift sqlite - + # For xp overlay + gtk-layer-shell # Dev deps libuuid # for mount.pc xorg.libXdmcp.dev diff --git a/xp_overlay_app/.gitignore b/xp_overlay_app/.gitignore new file mode 100644 index 0000000..79c113f --- /dev/null +++ b/xp_overlay_app/.gitignore @@ -0,0 +1,45 @@ +# Miscellaneous +*.class +*.log +*.pyc +*.swp +.DS_Store +.atom/ +.build/ +.buildlog/ +.history +.svn/ +.swiftpm/ +migrate_working_dir/ + +# IntelliJ related +*.iml +*.ipr +*.iws +.idea/ + +# The .vscode folder contains launch configuration and tasks you configure in +# VS Code which you may wish to be included in version control, so this line +# is commented out by default. +#.vscode/ + +# Flutter/Dart/Pub related +**/doc/api/ +**/ios/Flutter/.last_build_id +.dart_tool/ +.flutter-plugins +.flutter-plugins-dependencies +.pub-cache/ +.pub/ +/build/ + +# Symbolication related +app.*.symbols + +# Obfuscation related +app.*.map.json + +# Android Studio will place build artifacts here +/android/app/debug +/android/app/profile +/android/app/release diff --git a/xp_overlay_app/.ignore b/xp_overlay_app/.ignore new file mode 100644 index 0000000..c366618 --- /dev/null +++ b/xp_overlay_app/.ignore @@ -0,0 +1,5 @@ +ios/ +android/ +windows/ +macos/ +# linux/ diff --git a/xp_overlay_app/.metadata b/xp_overlay_app/.metadata new file mode 100644 index 0000000..59e7353 --- /dev/null +++ b/xp_overlay_app/.metadata @@ -0,0 +1,45 @@ +# This file tracks properties of this Flutter project. +# Used by Flutter tool to assess capabilities and perform upgrades etc. +# +# This file should be version controlled and should not be manually edited. + +version: + revision: "nixpkgs000000000000000000000000000000000" + channel: "stable" + +project_type: app + +# Tracks metadata for the flutter migrate command +migration: + platforms: + - platform: root + create_revision: nixpkgs000000000000000000000000000000000 + base_revision: nixpkgs000000000000000000000000000000000 + - platform: android + create_revision: nixpkgs000000000000000000000000000000000 + base_revision: nixpkgs000000000000000000000000000000000 + - platform: ios + create_revision: nixpkgs000000000000000000000000000000000 + base_revision: nixpkgs000000000000000000000000000000000 + - platform: linux + create_revision: nixpkgs000000000000000000000000000000000 + base_revision: nixpkgs000000000000000000000000000000000 + - platform: macos + create_revision: nixpkgs000000000000000000000000000000000 + base_revision: nixpkgs000000000000000000000000000000000 + - platform: web + create_revision: nixpkgs000000000000000000000000000000000 + base_revision: nixpkgs000000000000000000000000000000000 + - platform: windows + create_revision: nixpkgs000000000000000000000000000000000 + base_revision: nixpkgs000000000000000000000000000000000 + + # User provided section + + # List of Local paths (relative to this file) that should be + # ignored by the migrate tool. + # + # Files that are not part of the templates will be ignored by default. + unmanaged_files: + - 'lib/main.dart' + - 'ios/Runner.xcodeproj/project.pbxproj' diff --git a/xp_overlay_app/README.md b/xp_overlay_app/README.md new file mode 100644 index 0000000..2b6ef36 --- /dev/null +++ b/xp_overlay_app/README.md @@ -0,0 +1,16 @@ +# xp_overlay_app + +A new Flutter project. + +## Getting Started + +This project is a starting point for a Flutter application. + +A few resources to get you started if this is your first Flutter project: + +- [Lab: Write your first Flutter app](https://docs.flutter.dev/get-started/codelab) +- [Cookbook: Useful Flutter samples](https://docs.flutter.dev/cookbook) + +For help getting started with Flutter development, view the +[online documentation](https://docs.flutter.dev/), which offers tutorials, +samples, guidance on mobile development, and a full API reference. diff --git a/xp_overlay_app/analysis_options.yaml b/xp_overlay_app/analysis_options.yaml new file mode 100644 index 0000000..0d29021 --- /dev/null +++ b/xp_overlay_app/analysis_options.yaml @@ -0,0 +1,28 @@ +# This file configures the analyzer, which statically analyzes Dart code to +# check for errors, warnings, and lints. +# +# The issues identified by the analyzer are surfaced in the UI of Dart-enabled +# IDEs (https://dart.dev/tools#ides-and-editors). The analyzer can also be +# invoked from the command line by running `flutter analyze`. + +# The following line activates a set of recommended lints for Flutter apps, +# packages, and plugins designed to encourage good coding practices. +include: package:flutter_lints/flutter.yaml + +linter: + # The lint rules applied to this project can be customized in the + # section below to disable rules from the `package:flutter_lints/flutter.yaml` + # included above or to enable additional rules. A list of all available lints + # and their documentation is published at https://dart.dev/lints. + # + # Instead of disabling a lint rule for the entire project in the + # section below, it can also be suppressed for a single line of code + # or a specific dart file by using the `// ignore: name_of_lint` and + # `// ignore_for_file: name_of_lint` syntax on the line or in the file + # producing the lint. + rules: + # avoid_print: false # Uncomment to disable the `avoid_print` rule + # prefer_single_quotes: true # Uncomment to enable the `prefer_single_quotes` rule + +# Additional information about this file can be found at +# https://dart.dev/guides/language/analysis-options diff --git a/xp_overlay_app/android/.gitignore b/xp_overlay_app/android/.gitignore new file mode 100644 index 0000000..be3943c --- /dev/null +++ b/xp_overlay_app/android/.gitignore @@ -0,0 +1,14 @@ +gradle-wrapper.jar +/.gradle +/captures/ +/gradlew +/gradlew.bat +/local.properties +GeneratedPluginRegistrant.java +.cxx/ + +# Remember to never publicly share your keystore. +# See https://flutter.dev/to/reference-keystore +key.properties +**/*.keystore +**/*.jks diff --git a/xp_overlay_app/android/app/build.gradle.kts b/xp_overlay_app/android/app/build.gradle.kts new file mode 100644 index 0000000..b87351b --- /dev/null +++ b/xp_overlay_app/android/app/build.gradle.kts @@ -0,0 +1,44 @@ +plugins { + id("com.android.application") + id("kotlin-android") + // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins. + id("dev.flutter.flutter-gradle-plugin") +} + +android { + namespace = "com.xpnix.xp_overlay_app" + compileSdk = flutter.compileSdkVersion + ndkVersion = flutter.ndkVersion + + compileOptions { + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 + } + + kotlinOptions { + jvmTarget = JavaVersion.VERSION_11.toString() + } + + defaultConfig { + // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). + applicationId = "com.xpnix.xp_overlay_app" + // You can update the following values to match your application needs. + // For more information, see: https://flutter.dev/to/review-gradle-config. + minSdk = flutter.minSdkVersion + targetSdk = flutter.targetSdkVersion + versionCode = flutter.versionCode + versionName = flutter.versionName + } + + buildTypes { + release { + // TODO: Add your own signing config for the release build. + // Signing with the debug keys for now, so `flutter run --release` works. + signingConfig = signingConfigs.getByName("debug") + } + } +} + +flutter { + source = "../.." +} diff --git a/xp_overlay_app/android/app/src/debug/AndroidManifest.xml b/xp_overlay_app/android/app/src/debug/AndroidManifest.xml new file mode 100644 index 0000000..399f698 --- /dev/null +++ b/xp_overlay_app/android/app/src/debug/AndroidManifest.xml @@ -0,0 +1,7 @@ + + + + diff --git a/xp_overlay_app/android/app/src/main/AndroidManifest.xml b/xp_overlay_app/android/app/src/main/AndroidManifest.xml new file mode 100644 index 0000000..7614d96 --- /dev/null +++ b/xp_overlay_app/android/app/src/main/AndroidManifest.xml @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/xp_overlay_app/android/app/src/main/kotlin/com/xpnix/xp_overlay_app/MainActivity.kt b/xp_overlay_app/android/app/src/main/kotlin/com/xpnix/xp_overlay_app/MainActivity.kt new file mode 100644 index 0000000..d413d4a --- /dev/null +++ b/xp_overlay_app/android/app/src/main/kotlin/com/xpnix/xp_overlay_app/MainActivity.kt @@ -0,0 +1,5 @@ +package com.xpnix.xp_overlay_app + +import io.flutter.embedding.android.FlutterActivity + +class MainActivity : FlutterActivity() diff --git a/xp_overlay_app/android/app/src/main/res/drawable-v21/launch_background.xml b/xp_overlay_app/android/app/src/main/res/drawable-v21/launch_background.xml new file mode 100644 index 0000000..f74085f --- /dev/null +++ b/xp_overlay_app/android/app/src/main/res/drawable-v21/launch_background.xml @@ -0,0 +1,12 @@ + + + + + + + + diff --git a/xp_overlay_app/android/app/src/main/res/drawable/launch_background.xml b/xp_overlay_app/android/app/src/main/res/drawable/launch_background.xml new file mode 100644 index 0000000..304732f --- /dev/null +++ b/xp_overlay_app/android/app/src/main/res/drawable/launch_background.xml @@ -0,0 +1,12 @@ + + + + + + + + diff --git a/xp_overlay_app/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/xp_overlay_app/android/app/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 0000000..db77bb4 Binary files /dev/null and b/xp_overlay_app/android/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/xp_overlay_app/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/xp_overlay_app/android/app/src/main/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 0000000..17987b7 Binary files /dev/null and b/xp_overlay_app/android/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/xp_overlay_app/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/xp_overlay_app/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 0000000..09d4391 Binary files /dev/null and b/xp_overlay_app/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/xp_overlay_app/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/xp_overlay_app/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 0000000..d5f1c8d Binary files /dev/null and b/xp_overlay_app/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/xp_overlay_app/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/xp_overlay_app/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 0000000..4d6372e Binary files /dev/null and b/xp_overlay_app/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/xp_overlay_app/android/app/src/main/res/values-night/styles.xml b/xp_overlay_app/android/app/src/main/res/values-night/styles.xml new file mode 100644 index 0000000..06952be --- /dev/null +++ b/xp_overlay_app/android/app/src/main/res/values-night/styles.xml @@ -0,0 +1,18 @@ + + + + + + + diff --git a/xp_overlay_app/android/app/src/main/res/values/styles.xml b/xp_overlay_app/android/app/src/main/res/values/styles.xml new file mode 100644 index 0000000..cb1ef88 --- /dev/null +++ b/xp_overlay_app/android/app/src/main/res/values/styles.xml @@ -0,0 +1,18 @@ + + + + + + + diff --git a/xp_overlay_app/android/app/src/profile/AndroidManifest.xml b/xp_overlay_app/android/app/src/profile/AndroidManifest.xml new file mode 100644 index 0000000..399f698 --- /dev/null +++ b/xp_overlay_app/android/app/src/profile/AndroidManifest.xml @@ -0,0 +1,7 @@ + + + + diff --git a/xp_overlay_app/android/build.gradle.kts b/xp_overlay_app/android/build.gradle.kts new file mode 100644 index 0000000..89176ef --- /dev/null +++ b/xp_overlay_app/android/build.gradle.kts @@ -0,0 +1,21 @@ +allprojects { + repositories { + google() + mavenCentral() + } +} + +val newBuildDir: Directory = rootProject.layout.buildDirectory.dir("../../build").get() +rootProject.layout.buildDirectory.value(newBuildDir) + +subprojects { + val newSubprojectBuildDir: Directory = newBuildDir.dir(project.name) + project.layout.buildDirectory.value(newSubprojectBuildDir) +} +subprojects { + project.evaluationDependsOn(":app") +} + +tasks.register("clean") { + delete(rootProject.layout.buildDirectory) +} diff --git a/xp_overlay_app/android/gradle.properties b/xp_overlay_app/android/gradle.properties new file mode 100644 index 0000000..f018a61 --- /dev/null +++ b/xp_overlay_app/android/gradle.properties @@ -0,0 +1,3 @@ +org.gradle.jvmargs=-Xmx8G -XX:MaxMetaspaceSize=4G -XX:ReservedCodeCacheSize=512m -XX:+HeapDumpOnOutOfMemoryError +android.useAndroidX=true +android.enableJetifier=true diff --git a/xp_overlay_app/android/gradle/wrapper/gradle-wrapper.properties b/xp_overlay_app/android/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..ac3b479 --- /dev/null +++ b/xp_overlay_app/android/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-all.zip diff --git a/xp_overlay_app/android/settings.gradle.kts b/xp_overlay_app/android/settings.gradle.kts new file mode 100644 index 0000000..ab39a10 --- /dev/null +++ b/xp_overlay_app/android/settings.gradle.kts @@ -0,0 +1,25 @@ +pluginManagement { + val flutterSdkPath = run { + val properties = java.util.Properties() + file("local.properties").inputStream().use { properties.load(it) } + val flutterSdkPath = properties.getProperty("flutter.sdk") + require(flutterSdkPath != null) { "flutter.sdk not set in local.properties" } + flutterSdkPath + } + + includeBuild("$flutterSdkPath/packages/flutter_tools/gradle") + + repositories { + google() + mavenCentral() + gradlePluginPortal() + } +} + +plugins { + id("dev.flutter.flutter-plugin-loader") version "1.0.0" + id("com.android.application") version "8.7.3" apply false + id("org.jetbrains.kotlin.android") version "2.1.0" apply false +} + +include(":app") diff --git a/xp_overlay_app/ios/.gitignore b/xp_overlay_app/ios/.gitignore new file mode 100644 index 0000000..7a7f987 --- /dev/null +++ b/xp_overlay_app/ios/.gitignore @@ -0,0 +1,34 @@ +**/dgph +*.mode1v3 +*.mode2v3 +*.moved-aside +*.pbxuser +*.perspectivev3 +**/*sync/ +.sconsign.dblite +.tags* +**/.vagrant/ +**/DerivedData/ +Icon? +**/Pods/ +**/.symlinks/ +profile +xcuserdata +**/.generated/ +Flutter/App.framework +Flutter/Flutter.framework +Flutter/Flutter.podspec +Flutter/Generated.xcconfig +Flutter/ephemeral/ +Flutter/app.flx +Flutter/app.zip +Flutter/flutter_assets/ +Flutter/flutter_export_environment.sh +ServiceDefinitions.json +Runner/GeneratedPluginRegistrant.* + +# Exceptions to above rules. +!default.mode1v3 +!default.mode2v3 +!default.pbxuser +!default.perspectivev3 diff --git a/xp_overlay_app/ios/Flutter/AppFrameworkInfo.plist b/xp_overlay_app/ios/Flutter/AppFrameworkInfo.plist new file mode 100644 index 0000000..7c56964 --- /dev/null +++ b/xp_overlay_app/ios/Flutter/AppFrameworkInfo.plist @@ -0,0 +1,26 @@ + + + + + CFBundleDevelopmentRegion + en + CFBundleExecutable + App + CFBundleIdentifier + io.flutter.flutter.app + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + App + CFBundlePackageType + FMWK + CFBundleShortVersionString + 1.0 + CFBundleSignature + ???? + CFBundleVersion + 1.0 + MinimumOSVersion + 12.0 + + diff --git a/xp_overlay_app/ios/Flutter/Debug.xcconfig b/xp_overlay_app/ios/Flutter/Debug.xcconfig new file mode 100644 index 0000000..592ceee --- /dev/null +++ b/xp_overlay_app/ios/Flutter/Debug.xcconfig @@ -0,0 +1 @@ +#include "Generated.xcconfig" diff --git a/xp_overlay_app/ios/Flutter/Release.xcconfig b/xp_overlay_app/ios/Flutter/Release.xcconfig new file mode 100644 index 0000000..592ceee --- /dev/null +++ b/xp_overlay_app/ios/Flutter/Release.xcconfig @@ -0,0 +1 @@ +#include "Generated.xcconfig" diff --git a/xp_overlay_app/ios/Runner.xcodeproj/project.pbxproj b/xp_overlay_app/ios/Runner.xcodeproj/project.pbxproj new file mode 100644 index 0000000..4f260e9 --- /dev/null +++ b/xp_overlay_app/ios/Runner.xcodeproj/project.pbxproj @@ -0,0 +1,616 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 54; + objects = { + +/* Begin PBXBuildFile section */ + 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; }; + 331C808B294A63AB00263BE5 /* RunnerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 331C807B294A618700263BE5 /* RunnerTests.swift */; }; + 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; }; + 74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; }; + 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; }; + 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; }; + 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; }; +/* End PBXBuildFile section */ + +/* Begin PBXContainerItemProxy section */ + 331C8085294A63A400263BE5 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 97C146E61CF9000F007C117D /* Project object */; + proxyType = 1; + remoteGlobalIDString = 97C146ED1CF9000F007C117D; + remoteInfo = Runner; + }; +/* End PBXContainerItemProxy section */ + +/* Begin PBXCopyFilesBuildPhase section */ + 9705A1C41CF9048500538489 /* Embed Frameworks */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = ""; + dstSubfolderSpec = 10; + files = ( + ); + name = "Embed Frameworks"; + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXCopyFilesBuildPhase section */ + +/* Begin PBXFileReference section */ + 1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = ""; }; + 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = ""; }; + 331C807B294A618700263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = ""; }; + 331C8081294A63A400263BE5 /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; + 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = ""; }; + 74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = ""; }; + 74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; + 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = ""; }; + 9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = ""; }; + 9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = ""; }; + 97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 97C146FB1CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; + 97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; + 97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; + 97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; +/* End PBXFileReference section */ + +/* Begin PBXFrameworksBuildPhase section */ + 97C146EB1CF9000F007C117D /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ + 331C8082294A63A400263BE5 /* RunnerTests */ = { + isa = PBXGroup; + children = ( + 331C807B294A618700263BE5 /* RunnerTests.swift */, + ); + path = RunnerTests; + sourceTree = ""; + }; + 9740EEB11CF90186004384FC /* Flutter */ = { + isa = PBXGroup; + children = ( + 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */, + 9740EEB21CF90195004384FC /* Debug.xcconfig */, + 7AFA3C8E1D35360C0083082E /* Release.xcconfig */, + 9740EEB31CF90195004384FC /* Generated.xcconfig */, + ); + name = Flutter; + sourceTree = ""; + }; + 97C146E51CF9000F007C117D = { + isa = PBXGroup; + children = ( + 9740EEB11CF90186004384FC /* Flutter */, + 97C146F01CF9000F007C117D /* Runner */, + 97C146EF1CF9000F007C117D /* Products */, + 331C8082294A63A400263BE5 /* RunnerTests */, + ); + sourceTree = ""; + }; + 97C146EF1CF9000F007C117D /* Products */ = { + isa = PBXGroup; + children = ( + 97C146EE1CF9000F007C117D /* Runner.app */, + 331C8081294A63A400263BE5 /* RunnerTests.xctest */, + ); + name = Products; + sourceTree = ""; + }; + 97C146F01CF9000F007C117D /* Runner */ = { + isa = PBXGroup; + children = ( + 97C146FA1CF9000F007C117D /* Main.storyboard */, + 97C146FD1CF9000F007C117D /* Assets.xcassets */, + 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */, + 97C147021CF9000F007C117D /* Info.plist */, + 1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */, + 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */, + 74858FAE1ED2DC5600515810 /* AppDelegate.swift */, + 74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */, + ); + path = Runner; + sourceTree = ""; + }; +/* End PBXGroup section */ + +/* Begin PBXNativeTarget section */ + 331C8080294A63A400263BE5 /* RunnerTests */ = { + isa = PBXNativeTarget; + buildConfigurationList = 331C8087294A63A400263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */; + buildPhases = ( + 331C807D294A63A400263BE5 /* Sources */, + 331C807F294A63A400263BE5 /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + 331C8086294A63A400263BE5 /* PBXTargetDependency */, + ); + name = RunnerTests; + productName = RunnerTests; + productReference = 331C8081294A63A400263BE5 /* RunnerTests.xctest */; + productType = "com.apple.product-type.bundle.unit-test"; + }; + 97C146ED1CF9000F007C117D /* Runner */ = { + isa = PBXNativeTarget; + buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */; + buildPhases = ( + 9740EEB61CF901F6004384FC /* Run Script */, + 97C146EA1CF9000F007C117D /* Sources */, + 97C146EB1CF9000F007C117D /* Frameworks */, + 97C146EC1CF9000F007C117D /* Resources */, + 9705A1C41CF9048500538489 /* Embed Frameworks */, + 3B06AD1E1E4923F5004D2608 /* Thin Binary */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = Runner; + productName = Runner; + productReference = 97C146EE1CF9000F007C117D /* Runner.app */; + productType = "com.apple.product-type.application"; + }; +/* End PBXNativeTarget section */ + +/* Begin PBXProject section */ + 97C146E61CF9000F007C117D /* Project object */ = { + isa = PBXProject; + attributes = { + BuildIndependentTargetsInParallel = YES; + LastUpgradeCheck = 1510; + ORGANIZATIONNAME = ""; + TargetAttributes = { + 331C8080294A63A400263BE5 = { + CreatedOnToolsVersion = 14.0; + TestTargetID = 97C146ED1CF9000F007C117D; + }; + 97C146ED1CF9000F007C117D = { + CreatedOnToolsVersion = 7.3.1; + LastSwiftMigration = 1100; + }; + }; + }; + buildConfigurationList = 97C146E91CF9000F007C117D /* Build configuration list for PBXProject "Runner" */; + compatibilityVersion = "Xcode 9.3"; + developmentRegion = en; + hasScannedForEncodings = 0; + knownRegions = ( + en, + Base, + ); + mainGroup = 97C146E51CF9000F007C117D; + productRefGroup = 97C146EF1CF9000F007C117D /* Products */; + projectDirPath = ""; + projectRoot = ""; + targets = ( + 97C146ED1CF9000F007C117D /* Runner */, + 331C8080294A63A400263BE5 /* RunnerTests */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXResourcesBuildPhase section */ + 331C807F294A63A400263BE5 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 97C146EC1CF9000F007C117D /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */, + 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */, + 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */, + 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXResourcesBuildPhase section */ + +/* Begin PBXShellScriptBuildPhase section */ + 3B06AD1E1E4923F5004D2608 /* Thin Binary */ = { + isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + "${TARGET_BUILD_DIR}/${INFOPLIST_PATH}", + ); + name = "Thin Binary"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin"; + }; + 9740EEB61CF901F6004384FC /* Run Script */ = { + isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + name = "Run Script"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build"; + }; +/* End PBXShellScriptBuildPhase section */ + +/* Begin PBXSourcesBuildPhase section */ + 331C807D294A63A400263BE5 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 331C808B294A63AB00263BE5 /* RunnerTests.swift in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 97C146EA1CF9000F007C117D /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */, + 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ + +/* Begin PBXTargetDependency section */ + 331C8086294A63A400263BE5 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 97C146ED1CF9000F007C117D /* Runner */; + targetProxy = 331C8085294A63A400263BE5 /* PBXContainerItemProxy */; + }; +/* End PBXTargetDependency section */ + +/* Begin PBXVariantGroup section */ + 97C146FA1CF9000F007C117D /* Main.storyboard */ = { + isa = PBXVariantGroup; + children = ( + 97C146FB1CF9000F007C117D /* Base */, + ); + name = Main.storyboard; + sourceTree = ""; + }; + 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */ = { + isa = PBXVariantGroup; + children = ( + 97C147001CF9000F007C117D /* Base */, + ); + name = LaunchScreen.storyboard; + sourceTree = ""; + }; +/* End PBXVariantGroup section */ + +/* Begin XCBuildConfiguration section */ + 249021D3217E4FDB00AE95B9 /* Profile */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; + CLANG_ANALYZER_NONNULL = YES; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_USER_SCRIPT_SANDBOXING = NO; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; + MTL_ENABLE_DEBUG_INFO = NO; + SDKROOT = iphoneos; + SUPPORTED_PLATFORMS = iphoneos; + TARGETED_DEVICE_FAMILY = "1,2"; + VALIDATE_PRODUCT = YES; + }; + name = Profile; + }; + 249021D4217E4FDB00AE95B9 /* Profile */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ENABLE_MODULES = YES; + CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; + ENABLE_BITCODE = NO; + INFOPLIST_FILE = Runner/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); + PRODUCT_BUNDLE_IDENTIFIER = com.xpnix.xpOverlayApp; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; + SWIFT_VERSION = 5.0; + VERSIONING_SYSTEM = "apple-generic"; + }; + name = Profile; + }; + 331C8088294A63A400263BE5 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + BUNDLE_LOADER = "$(TEST_HOST)"; + CODE_SIGN_STYLE = Automatic; + CURRENT_PROJECT_VERSION = 1; + GENERATE_INFOPLIST_FILE = YES; + MARKETING_VERSION = 1.0; + PRODUCT_BUNDLE_IDENTIFIER = com.xpnix.xpOverlayApp.RunnerTests; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 5.0; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner"; + }; + name = Debug; + }; + 331C8089294A63A400263BE5 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + BUNDLE_LOADER = "$(TEST_HOST)"; + CODE_SIGN_STYLE = Automatic; + CURRENT_PROJECT_VERSION = 1; + GENERATE_INFOPLIST_FILE = YES; + MARKETING_VERSION = 1.0; + PRODUCT_BUNDLE_IDENTIFIER = com.xpnix.xpOverlayApp.RunnerTests; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 5.0; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner"; + }; + name = Release; + }; + 331C808A294A63A400263BE5 /* Profile */ = { + isa = XCBuildConfiguration; + buildSettings = { + BUNDLE_LOADER = "$(TEST_HOST)"; + CODE_SIGN_STYLE = Automatic; + CURRENT_PROJECT_VERSION = 1; + GENERATE_INFOPLIST_FILE = YES; + MARKETING_VERSION = 1.0; + PRODUCT_BUNDLE_IDENTIFIER = com.xpnix.xpOverlayApp.RunnerTests; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 5.0; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner"; + }; + name = Profile; + }; + 97C147031CF9000F007C117D /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; + CLANG_ANALYZER_NONNULL = YES; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = dwarf; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; + ENABLE_USER_SCRIPT_SANDBOXING = NO; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_DYNAMIC_NO_PIC = NO; + GCC_NO_COMMON_BLOCKS = YES; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; + MTL_ENABLE_DEBUG_INFO = YES; + ONLY_ACTIVE_ARCH = YES; + SDKROOT = iphoneos; + TARGETED_DEVICE_FAMILY = "1,2"; + }; + name = Debug; + }; + 97C147041CF9000F007C117D /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; + CLANG_ANALYZER_NONNULL = YES; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_USER_SCRIPT_SANDBOXING = NO; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; + MTL_ENABLE_DEBUG_INFO = NO; + SDKROOT = iphoneos; + SUPPORTED_PLATFORMS = iphoneos; + SWIFT_COMPILATION_MODE = wholemodule; + SWIFT_OPTIMIZATION_LEVEL = "-O"; + TARGETED_DEVICE_FAMILY = "1,2"; + VALIDATE_PRODUCT = YES; + }; + name = Release; + }; + 97C147061CF9000F007C117D /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ENABLE_MODULES = YES; + CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; + ENABLE_BITCODE = NO; + INFOPLIST_FILE = Runner/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); + PRODUCT_BUNDLE_IDENTIFIER = com.xpnix.xpOverlayApp; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 5.0; + VERSIONING_SYSTEM = "apple-generic"; + }; + name = Debug; + }; + 97C147071CF9000F007C117D /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ENABLE_MODULES = YES; + CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; + ENABLE_BITCODE = NO; + INFOPLIST_FILE = Runner/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); + PRODUCT_BUNDLE_IDENTIFIER = com.xpnix.xpOverlayApp; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; + SWIFT_VERSION = 5.0; + VERSIONING_SYSTEM = "apple-generic"; + }; + name = Release; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + 331C8087294A63A400263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 331C8088294A63A400263BE5 /* Debug */, + 331C8089294A63A400263BE5 /* Release */, + 331C808A294A63A400263BE5 /* Profile */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 97C146E91CF9000F007C117D /* Build configuration list for PBXProject "Runner" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 97C147031CF9000F007C117D /* Debug */, + 97C147041CF9000F007C117D /* Release */, + 249021D3217E4FDB00AE95B9 /* Profile */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 97C147061CF9000F007C117D /* Debug */, + 97C147071CF9000F007C117D /* Release */, + 249021D4217E4FDB00AE95B9 /* Profile */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; +/* End XCConfigurationList section */ + }; + rootObject = 97C146E61CF9000F007C117D /* Project object */; +} diff --git a/xp_overlay_app/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/xp_overlay_app/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata new file mode 100644 index 0000000..919434a --- /dev/null +++ b/xp_overlay_app/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ + + + + + diff --git a/xp_overlay_app/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/xp_overlay_app/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/xp_overlay_app/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/xp_overlay_app/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/xp_overlay_app/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings new file mode 100644 index 0000000..f9b0d7c --- /dev/null +++ b/xp_overlay_app/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings @@ -0,0 +1,8 @@ + + + + + PreviewsEnabled + + + diff --git a/xp_overlay_app/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/xp_overlay_app/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme new file mode 100644 index 0000000..e3773d4 --- /dev/null +++ b/xp_overlay_app/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -0,0 +1,101 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/xp_overlay_app/ios/Runner.xcworkspace/contents.xcworkspacedata b/xp_overlay_app/ios/Runner.xcworkspace/contents.xcworkspacedata new file mode 100644 index 0000000..1d526a1 --- /dev/null +++ b/xp_overlay_app/ios/Runner.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ + + + + + diff --git a/xp_overlay_app/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/xp_overlay_app/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/xp_overlay_app/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/xp_overlay_app/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/xp_overlay_app/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings new file mode 100644 index 0000000..f9b0d7c --- /dev/null +++ b/xp_overlay_app/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings @@ -0,0 +1,8 @@ + + + + + PreviewsEnabled + + + diff --git a/xp_overlay_app/ios/Runner/AppDelegate.swift b/xp_overlay_app/ios/Runner/AppDelegate.swift new file mode 100644 index 0000000..6266644 --- /dev/null +++ b/xp_overlay_app/ios/Runner/AppDelegate.swift @@ -0,0 +1,13 @@ +import Flutter +import UIKit + +@main +@objc class AppDelegate: FlutterAppDelegate { + override func application( + _ application: UIApplication, + didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]? + ) -> Bool { + GeneratedPluginRegistrant.register(with: self) + return super.application(application, didFinishLaunchingWithOptions: launchOptions) + } +} diff --git a/xp_overlay_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/xp_overlay_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json new file mode 100644 index 0000000..d36b1fa --- /dev/null +++ b/xp_overlay_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -0,0 +1,122 @@ +{ + "images" : [ + { + "size" : "20x20", + "idiom" : "iphone", + "filename" : "Icon-App-20x20@2x.png", + "scale" : "2x" + }, + { + "size" : "20x20", + "idiom" : "iphone", + "filename" : "Icon-App-20x20@3x.png", + "scale" : "3x" + }, + { + "size" : "29x29", + "idiom" : "iphone", + "filename" : "Icon-App-29x29@1x.png", + "scale" : "1x" + }, + { + "size" : "29x29", + "idiom" : "iphone", + "filename" : "Icon-App-29x29@2x.png", + "scale" : "2x" + }, + { + "size" : "29x29", + "idiom" : "iphone", + "filename" : "Icon-App-29x29@3x.png", + "scale" : "3x" + }, + { + "size" : "40x40", + "idiom" : "iphone", + "filename" : "Icon-App-40x40@2x.png", + "scale" : "2x" + }, + { + "size" : "40x40", + "idiom" : "iphone", + "filename" : "Icon-App-40x40@3x.png", + "scale" : "3x" + }, + { + "size" : "60x60", + "idiom" : "iphone", + "filename" : "Icon-App-60x60@2x.png", + "scale" : "2x" + }, + { + "size" : "60x60", + "idiom" : "iphone", + "filename" : "Icon-App-60x60@3x.png", + "scale" : "3x" + }, + { + "size" : "20x20", + "idiom" : "ipad", + "filename" : "Icon-App-20x20@1x.png", + "scale" : "1x" + }, + { + "size" : "20x20", + "idiom" : "ipad", + "filename" : "Icon-App-20x20@2x.png", + "scale" : "2x" + }, + { + "size" : "29x29", + "idiom" : "ipad", + "filename" : "Icon-App-29x29@1x.png", + "scale" : "1x" + }, + { + "size" : "29x29", + "idiom" : "ipad", + "filename" : "Icon-App-29x29@2x.png", + "scale" : "2x" + }, + { + "size" : "40x40", + "idiom" : "ipad", + "filename" : "Icon-App-40x40@1x.png", + "scale" : "1x" + }, + { + "size" : "40x40", + "idiom" : "ipad", + "filename" : "Icon-App-40x40@2x.png", + "scale" : "2x" + }, + { + "size" : "76x76", + "idiom" : "ipad", + "filename" : "Icon-App-76x76@1x.png", + "scale" : "1x" + }, + { + "size" : "76x76", + "idiom" : "ipad", + "filename" : "Icon-App-76x76@2x.png", + "scale" : "2x" + }, + { + "size" : "83.5x83.5", + "idiom" : "ipad", + "filename" : "Icon-App-83.5x83.5@2x.png", + "scale" : "2x" + }, + { + "size" : "1024x1024", + "idiom" : "ios-marketing", + "filename" : "Icon-App-1024x1024@1x.png", + "scale" : "1x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} diff --git a/xp_overlay_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png b/xp_overlay_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png new file mode 100644 index 0000000..dc9ada4 Binary files /dev/null and b/xp_overlay_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png differ diff --git a/xp_overlay_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png b/xp_overlay_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png new file mode 100644 index 0000000..7353c41 Binary files /dev/null and b/xp_overlay_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png differ diff --git a/xp_overlay_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png b/xp_overlay_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png new file mode 100644 index 0000000..797d452 Binary files /dev/null and b/xp_overlay_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png differ diff --git a/xp_overlay_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png b/xp_overlay_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png new file mode 100644 index 0000000..6ed2d93 Binary files /dev/null and b/xp_overlay_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png differ diff --git a/xp_overlay_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png b/xp_overlay_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png new file mode 100644 index 0000000..4cd7b00 Binary files /dev/null and b/xp_overlay_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png differ diff --git a/xp_overlay_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png b/xp_overlay_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png new file mode 100644 index 0000000..fe73094 Binary files /dev/null and b/xp_overlay_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png differ diff --git a/xp_overlay_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png b/xp_overlay_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png new file mode 100644 index 0000000..321773c Binary files /dev/null and b/xp_overlay_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png differ diff --git a/xp_overlay_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png b/xp_overlay_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png new file mode 100644 index 0000000..797d452 Binary files /dev/null and b/xp_overlay_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png differ diff --git a/xp_overlay_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png b/xp_overlay_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png new file mode 100644 index 0000000..502f463 Binary files /dev/null and b/xp_overlay_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png differ diff --git a/xp_overlay_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png b/xp_overlay_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png new file mode 100644 index 0000000..0ec3034 Binary files /dev/null and b/xp_overlay_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png differ diff --git a/xp_overlay_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png b/xp_overlay_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png new file mode 100644 index 0000000..0ec3034 Binary files /dev/null and b/xp_overlay_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png differ diff --git a/xp_overlay_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png b/xp_overlay_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png new file mode 100644 index 0000000..e9f5fea Binary files /dev/null and b/xp_overlay_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png differ diff --git a/xp_overlay_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png b/xp_overlay_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png new file mode 100644 index 0000000..84ac32a Binary files /dev/null and b/xp_overlay_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png differ diff --git a/xp_overlay_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png b/xp_overlay_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png new file mode 100644 index 0000000..8953cba Binary files /dev/null and b/xp_overlay_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png differ diff --git a/xp_overlay_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png b/xp_overlay_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png new file mode 100644 index 0000000..0467bf1 Binary files /dev/null and b/xp_overlay_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png differ diff --git a/xp_overlay_app/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json b/xp_overlay_app/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json new file mode 100644 index 0000000..0bedcf2 --- /dev/null +++ b/xp_overlay_app/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "LaunchImage.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "LaunchImage@2x.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "LaunchImage@3x.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} diff --git a/xp_overlay_app/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png b/xp_overlay_app/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png new file mode 100644 index 0000000..9da19ea Binary files /dev/null and b/xp_overlay_app/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png differ diff --git a/xp_overlay_app/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png b/xp_overlay_app/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png new file mode 100644 index 0000000..9da19ea Binary files /dev/null and b/xp_overlay_app/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png differ diff --git a/xp_overlay_app/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png b/xp_overlay_app/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png new file mode 100644 index 0000000..9da19ea Binary files /dev/null and b/xp_overlay_app/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png differ diff --git a/xp_overlay_app/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md b/xp_overlay_app/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md new file mode 100644 index 0000000..89c2725 --- /dev/null +++ b/xp_overlay_app/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md @@ -0,0 +1,5 @@ +# Launch Screen Assets + +You can customize the launch screen with your own desired assets by replacing the image files in this directory. + +You can also do it by opening your Flutter project's Xcode project with `open ios/Runner.xcworkspace`, selecting `Runner/Assets.xcassets` in the Project Navigator and dropping in the desired images. \ No newline at end of file diff --git a/xp_overlay_app/ios/Runner/Base.lproj/LaunchScreen.storyboard b/xp_overlay_app/ios/Runner/Base.lproj/LaunchScreen.storyboard new file mode 100644 index 0000000..f2e259c --- /dev/null +++ b/xp_overlay_app/ios/Runner/Base.lproj/LaunchScreen.storyboard @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/xp_overlay_app/ios/Runner/Base.lproj/Main.storyboard b/xp_overlay_app/ios/Runner/Base.lproj/Main.storyboard new file mode 100644 index 0000000..f3c2851 --- /dev/null +++ b/xp_overlay_app/ios/Runner/Base.lproj/Main.storyboard @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/xp_overlay_app/ios/Runner/Info.plist b/xp_overlay_app/ios/Runner/Info.plist new file mode 100644 index 0000000..eff203e --- /dev/null +++ b/xp_overlay_app/ios/Runner/Info.plist @@ -0,0 +1,49 @@ + + + + + CFBundleDevelopmentRegion + $(DEVELOPMENT_LANGUAGE) + CFBundleDisplayName + Xp Overlay App + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + xp_overlay_app + CFBundlePackageType + APPL + CFBundleShortVersionString + $(FLUTTER_BUILD_NAME) + CFBundleSignature + ???? + CFBundleVersion + $(FLUTTER_BUILD_NUMBER) + LSRequiresIPhoneOS + + UILaunchStoryboardName + LaunchScreen + UIMainStoryboardFile + Main + UISupportedInterfaceOrientations + + UIInterfaceOrientationPortrait + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + UISupportedInterfaceOrientations~ipad + + UIInterfaceOrientationPortrait + UIInterfaceOrientationPortraitUpsideDown + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + CADisableMinimumFrameDurationOnPhone + + UIApplicationSupportsIndirectInputEvents + + + diff --git a/xp_overlay_app/ios/Runner/Runner-Bridging-Header.h b/xp_overlay_app/ios/Runner/Runner-Bridging-Header.h new file mode 100644 index 0000000..308a2a5 --- /dev/null +++ b/xp_overlay_app/ios/Runner/Runner-Bridging-Header.h @@ -0,0 +1 @@ +#import "GeneratedPluginRegistrant.h" diff --git a/xp_overlay_app/ios/RunnerTests/RunnerTests.swift b/xp_overlay_app/ios/RunnerTests/RunnerTests.swift new file mode 100644 index 0000000..86a7c3b --- /dev/null +++ b/xp_overlay_app/ios/RunnerTests/RunnerTests.swift @@ -0,0 +1,12 @@ +import Flutter +import UIKit +import XCTest + +class RunnerTests: XCTestCase { + + func testExample() { + // If you add code to the Runner application, consider adding tests here. + // See https://developer.apple.com/documentation/xctest for more information about using XCTest. + } + +} diff --git a/xp_overlay_app/lib/main.dart b/xp_overlay_app/lib/main.dart new file mode 100644 index 0000000..8a762b3 --- /dev/null +++ b/xp_overlay_app/lib/main.dart @@ -0,0 +1,182 @@ +import 'package:flutter/material.dart'; +import 'package:wayland_layer_shell/types.dart'; +import 'package:wayland_layer_shell/wayland_layer_shell.dart'; +import 'dart:io'; + +void main(List args) async { + WidgetsFlutterBinding.ensureInitialized(); + + // Parse command line arguments: x y xp_value duration_seconds + if (args.length < 4) { + print('Usage: xp_overlay_app '); + exit(1); + } + + final x = int.tryParse(args[0]) ?? 0; + final y = int.tryParse(args[1]) ?? 0; + final xpValue = int.tryParse(args[2]) ?? 0; + final duration = int.tryParse(args[3]) ?? 3; + + final shell = WaylandLayerShell(); + final success = await shell.initialize(50, 200); + if (!success) { + print('wayland layer shell could not initialize'); + exit(1); + } + await shell.setLayer(ShellLayer.layerBackground); + await shell.setExclusiveZone(0); + await shell.setKeyboardMode(ShellKeyboardMode.keyboardModeNone); + await shell.setAnchor(ShellEdge.edgeLeft, true); + // shell.setAnchor(ShellEdge.edgeRight, true); + await shell.setAnchor(ShellEdge.edgeTop, true); + // shell.setAnchor(ShellEdge.edgeBottom, true); + await shell.setMargin(ShellEdge.edgeLeft, x); + await shell.setMargin(ShellEdge.edgeTop, y); + + runApp( + XPOverlayScreen( + xpValue: xpValue, + duration: Duration(seconds: duration), + shell: shell, + ), + ); +} + +class XPOverlayScreen extends StatefulWidget { + final int xpValue; + final Duration duration; + final WaylandLayerShell shell; + + const XPOverlayScreen({super.key, required this.xpValue, required this.duration, required this.shell}); + + @override + State createState() => _XPOverlayScreenState(); +} + +class _XPOverlayScreenState extends State { + @override + void initState() { + super.initState(); + _scheduleExit(); + widget.shell.setLayer(ShellLayer.layerOverlay); + } + + void _scheduleExit() { + Future.delayed(widget.duration, () { + exit(0); + }); + } + + @override + Widget build(BuildContext context) { + return MaterialApp( + color: Colors.transparent, + home: Scaffold( + backgroundColor: Colors.transparent, + body: Center( + child: XPNumberWidget(xpValue: widget.xpValue, duration: widget.duration), + ), + ), + ); + } +} + +class XPNumberWidget extends StatefulWidget { + final int xpValue; + final Duration duration; + + const XPNumberWidget({super.key, required this.xpValue, required this.duration}); + + @override + State createState() => _XPNumberWidgetState(); +} + +class _XPNumberWidgetState extends State with SingleTickerProviderStateMixin { + late AnimationController _controller; + late Animation _slideAnimation; + late Animation _fadeAnimation; + late Animation _scaleAnimation; + + @override + void initState() { + super.initState(); + + _controller = AnimationController(duration: widget.duration, vsync: this); + + // Slide up animation + _slideAnimation = Tween( + begin: 0.0, + end: -100.0, + ).animate(CurvedAnimation(parent: _controller, curve: Curves.easeOut)); + + // Fade out animation + _fadeAnimation = Tween(begin: 1.0, end: 0.0).animate( + CurvedAnimation( + parent: _controller, + curve: const Interval(0.7, 1.0, curve: Curves.easeIn), + ), + ); + + // Scale bounce animation + _scaleAnimation = Tween(begin: 0.8, end: 1.0).animate( + CurvedAnimation( + parent: _controller, + curve: const Interval(0.0, 0.3, curve: Curves.elasticOut), + ), + ); + + _controller.forward(); + } + + @override + void dispose() { + _controller.dispose(); + super.dispose(); + } + + @override + Widget build(BuildContext context) { + return AnimatedBuilder( + animation: _controller, + builder: (context, child) { + return Transform.translate( + offset: Offset(0, _slideAnimation.value), + child: Transform.scale( + scale: _scaleAnimation.value, + child: Opacity( + opacity: _fadeAnimation.value, + child: Container( + padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 6), + decoration: BoxDecoration( + color: _getXPColor().withOpacity(0.9), + borderRadius: BorderRadius.circular(16), + border: Border.all(color: _getXPColor(), width: 2), + boxShadow: [BoxShadow(color: _getXPColor().withOpacity(0.3), blurRadius: 8, spreadRadius: 2)], + ), + child: Text( + '+${widget.xpValue}', + style: TextStyle( + color: Colors.white, + fontSize: 18, + fontWeight: FontWeight.bold, + shadows: [Shadow(color: Colors.black.withOpacity(0.7), offset: const Offset(1, 1), blurRadius: 2)], + ), + ), + ), + ), + ), + ); + }, + ); + } + + Color _getXPColor() { + if (widget.xpValue >= 100) { + return Colors.amber; // Gold for bonus XP + } else if (widget.xpValue >= 50) { + return Colors.orange; // Orange for high XP + } else { + return Colors.green; // Green for regular XP + } + } +} diff --git a/xp_overlay_app/linux/.gitignore b/xp_overlay_app/linux/.gitignore new file mode 100644 index 0000000..d3896c9 --- /dev/null +++ b/xp_overlay_app/linux/.gitignore @@ -0,0 +1 @@ +flutter/ephemeral diff --git a/xp_overlay_app/linux/CMakeLists.txt b/xp_overlay_app/linux/CMakeLists.txt new file mode 100644 index 0000000..0d41a0b --- /dev/null +++ b/xp_overlay_app/linux/CMakeLists.txt @@ -0,0 +1,129 @@ +# Project-level configuration. +cmake_minimum_required(VERSION 3.13) +project(runner LANGUAGES CXX) + +# The name of the executable created for the application. Change this to change +# the on-disk name of your application. +set(BINARY_NAME "xp_overlay_app") +# The unique GTK application identifier for this application. See: +# https://wiki.gnome.org/HowDoI/ChooseApplicationID +set(APPLICATION_ID "com.xpnix.xp_overlay_app") + +# Explicitly opt in to modern CMake behaviors to avoid warnings with recent +# versions of CMake. +cmake_policy(SET CMP0063 NEW) + +# Load bundled libraries from the lib/ directory relative to the binary. +set(CMAKE_INSTALL_RPATH "$ORIGIN/lib") + +# Root filesystem for cross-building. +if(FLUTTER_TARGET_PLATFORM_SYSROOT) + set(CMAKE_SYSROOT ${FLUTTER_TARGET_PLATFORM_SYSROOT}) + set(CMAKE_FIND_ROOT_PATH ${CMAKE_SYSROOT}) + set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) + set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY) + set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) + set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) +endif() + +# Define build configuration options. +if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES) + set(CMAKE_BUILD_TYPE "Debug" CACHE + STRING "Flutter build mode" FORCE) + set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS + "Debug" "Profile" "Release") +endif() + +# Compilation settings that should be applied to most targets. +# +# Be cautious about adding new options here, as plugins use this function by +# default. In most cases, you should add new options to specific targets instead +# of modifying this function. +function(APPLY_STANDARD_SETTINGS TARGET) + target_compile_features(${TARGET} PUBLIC cxx_std_14) + target_compile_options(${TARGET} PRIVATE -Wall -Werror) + target_compile_options(${TARGET} PRIVATE "$<$>:-O3>") + target_compile_definitions(${TARGET} PRIVATE "$<$>:NDEBUG>") +endfunction() + +# Flutter library and tool build rules. +set(FLUTTER_MANAGED_DIR "${CMAKE_CURRENT_SOURCE_DIR}/flutter") +add_subdirectory(${FLUTTER_MANAGED_DIR}) + +# System-level dependencies. +find_package(PkgConfig REQUIRED) +pkg_check_modules(GTK REQUIRED IMPORTED_TARGET gtk+-3.0) + +# Application build; see runner/CMakeLists.txt. +add_subdirectory("runner") + +# Run the Flutter tool portions of the build. This must not be removed. +add_dependencies(${BINARY_NAME} flutter_assemble) + +# Only the install-generated bundle's copy of the executable will launch +# correctly, since the resources must in the right relative locations. To avoid +# people trying to run the unbundled copy, put it in a subdirectory instead of +# the default top-level location. +set_target_properties(${BINARY_NAME} + PROPERTIES + RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/intermediates_do_not_run" +) + + +# Generated plugin build rules, which manage building the plugins and adding +# them to the application. +include(flutter/generated_plugins.cmake) + + +# === Installation === +# By default, "installing" just makes a relocatable bundle in the build +# directory. +set(BUILD_BUNDLE_DIR "${PROJECT_BINARY_DIR}/bundle") +# Must remove on nixos machines...? https://github.com/NixOS/nixpkgs/issues/24215#issuecomment-1065924731 +# if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) +set(CMAKE_INSTALL_PREFIX "${BUILD_BUNDLE_DIR}" CACHE PATH "..." FORCE) +# endif() + +# Start with a clean build bundle directory every time. +install(CODE " + file(REMOVE_RECURSE \"${BUILD_BUNDLE_DIR}/\") + " COMPONENT Runtime) + +set(INSTALL_BUNDLE_DATA_DIR "${CMAKE_INSTALL_PREFIX}/data") +set(INSTALL_BUNDLE_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib") + +install(TARGETS ${BINARY_NAME} RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}" + COMPONENT Runtime) + +install(FILES "${FLUTTER_ICU_DATA_FILE}" DESTINATION "${INSTALL_BUNDLE_DATA_DIR}" + COMPONENT Runtime) + +install(FILES "${FLUTTER_LIBRARY}" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" + COMPONENT Runtime) + +foreach(bundled_library ${PLUGIN_BUNDLED_LIBRARIES}) + install(FILES "${bundled_library}" + DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" + COMPONENT Runtime) +endforeach(bundled_library) + +# Copy the native assets provided by the build.dart from all packages. +set(NATIVE_ASSETS_DIR "${PROJECT_BUILD_DIR}native_assets/linux/") +install(DIRECTORY "${NATIVE_ASSETS_DIR}" + DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" + COMPONENT Runtime) + +# Fully re-copy the assets directory on each build to avoid having stale files +# from a previous install. +set(FLUTTER_ASSET_DIR_NAME "flutter_assets") +install(CODE " + file(REMOVE_RECURSE \"${INSTALL_BUNDLE_DATA_DIR}/${FLUTTER_ASSET_DIR_NAME}\") + " COMPONENT Runtime) +install(DIRECTORY "${PROJECT_BUILD_DIR}/${FLUTTER_ASSET_DIR_NAME}" + DESTINATION "${INSTALL_BUNDLE_DATA_DIR}" COMPONENT Runtime) + +# Install the AOT library on non-Debug builds only. +if(NOT CMAKE_BUILD_TYPE MATCHES "Debug") + install(FILES "${AOT_LIBRARY}" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" + COMPONENT Runtime) +endif() diff --git a/xp_overlay_app/linux/flutter/CMakeLists.txt b/xp_overlay_app/linux/flutter/CMakeLists.txt new file mode 100644 index 0000000..d5bd016 --- /dev/null +++ b/xp_overlay_app/linux/flutter/CMakeLists.txt @@ -0,0 +1,88 @@ +# This file controls Flutter-level build steps. It should not be edited. +cmake_minimum_required(VERSION 3.10) + +set(EPHEMERAL_DIR "${CMAKE_CURRENT_SOURCE_DIR}/ephemeral") + +# Configuration provided via flutter tool. +include(${EPHEMERAL_DIR}/generated_config.cmake) + +# TODO: Move the rest of this into files in ephemeral. See +# https://github.com/flutter/flutter/issues/57146. + +# Serves the same purpose as list(TRANSFORM ... PREPEND ...), +# which isn't available in 3.10. +function(list_prepend LIST_NAME PREFIX) + set(NEW_LIST "") + foreach(element ${${LIST_NAME}}) + list(APPEND NEW_LIST "${PREFIX}${element}") + endforeach(element) + set(${LIST_NAME} "${NEW_LIST}" PARENT_SCOPE) +endfunction() + +# === Flutter Library === +# System-level dependencies. +find_package(PkgConfig REQUIRED) +pkg_check_modules(GTK REQUIRED IMPORTED_TARGET gtk+-3.0) +pkg_check_modules(GLIB REQUIRED IMPORTED_TARGET glib-2.0) +pkg_check_modules(GIO REQUIRED IMPORTED_TARGET gio-2.0) + +set(FLUTTER_LIBRARY "${EPHEMERAL_DIR}/libflutter_linux_gtk.so") + +# Published to parent scope for install step. +set(FLUTTER_LIBRARY ${FLUTTER_LIBRARY} PARENT_SCOPE) +set(FLUTTER_ICU_DATA_FILE "${EPHEMERAL_DIR}/icudtl.dat" PARENT_SCOPE) +set(PROJECT_BUILD_DIR "${PROJECT_DIR}/build/" PARENT_SCOPE) +set(AOT_LIBRARY "${PROJECT_DIR}/build/lib/libapp.so" PARENT_SCOPE) + +list(APPEND FLUTTER_LIBRARY_HEADERS + "fl_basic_message_channel.h" + "fl_binary_codec.h" + "fl_binary_messenger.h" + "fl_dart_project.h" + "fl_engine.h" + "fl_json_message_codec.h" + "fl_json_method_codec.h" + "fl_message_codec.h" + "fl_method_call.h" + "fl_method_channel.h" + "fl_method_codec.h" + "fl_method_response.h" + "fl_plugin_registrar.h" + "fl_plugin_registry.h" + "fl_standard_message_codec.h" + "fl_standard_method_codec.h" + "fl_string_codec.h" + "fl_value.h" + "fl_view.h" + "flutter_linux.h" +) +list_prepend(FLUTTER_LIBRARY_HEADERS "${EPHEMERAL_DIR}/flutter_linux/") +add_library(flutter INTERFACE) +target_include_directories(flutter INTERFACE + "${EPHEMERAL_DIR}" +) +target_link_libraries(flutter INTERFACE "${FLUTTER_LIBRARY}") +target_link_libraries(flutter INTERFACE + PkgConfig::GTK + PkgConfig::GLIB + PkgConfig::GIO +) +add_dependencies(flutter flutter_assemble) + +# === Flutter tool backend === +# _phony_ is a non-existent file to force this command to run every time, +# since currently there's no way to get a full input/output list from the +# flutter tool. +add_custom_command( + OUTPUT ${FLUTTER_LIBRARY} ${FLUTTER_LIBRARY_HEADERS} + ${CMAKE_CURRENT_BINARY_DIR}/_phony_ + COMMAND ${CMAKE_COMMAND} -E env + ${FLUTTER_TOOL_ENVIRONMENT} + "${FLUTTER_ROOT}/packages/flutter_tools/bin/tool_backend.sh" + ${FLUTTER_TARGET_PLATFORM} ${CMAKE_BUILD_TYPE} + VERBATIM +) +add_custom_target(flutter_assemble DEPENDS + "${FLUTTER_LIBRARY}" + ${FLUTTER_LIBRARY_HEADERS} +) diff --git a/xp_overlay_app/linux/flutter/generated_plugin_registrant.cc b/xp_overlay_app/linux/flutter/generated_plugin_registrant.cc new file mode 100644 index 0000000..f8f238f --- /dev/null +++ b/xp_overlay_app/linux/flutter/generated_plugin_registrant.cc @@ -0,0 +1,15 @@ +// +// Generated file. Do not edit. +// + +// clang-format off + +#include "generated_plugin_registrant.h" + +#include + +void fl_register_plugins(FlPluginRegistry* registry) { + g_autoptr(FlPluginRegistrar) wayland_layer_shell_registrar = + fl_plugin_registry_get_registrar_for_plugin(registry, "WaylandLayerShellPlugin"); + wayland_layer_shell_plugin_register_with_registrar(wayland_layer_shell_registrar); +} diff --git a/xp_overlay_app/linux/flutter/generated_plugin_registrant.h b/xp_overlay_app/linux/flutter/generated_plugin_registrant.h new file mode 100644 index 0000000..e0f0a47 --- /dev/null +++ b/xp_overlay_app/linux/flutter/generated_plugin_registrant.h @@ -0,0 +1,15 @@ +// +// Generated file. Do not edit. +// + +// clang-format off + +#ifndef GENERATED_PLUGIN_REGISTRANT_ +#define GENERATED_PLUGIN_REGISTRANT_ + +#include + +// Registers Flutter plugins. +void fl_register_plugins(FlPluginRegistry* registry); + +#endif // GENERATED_PLUGIN_REGISTRANT_ diff --git a/xp_overlay_app/linux/flutter/generated_plugins.cmake b/xp_overlay_app/linux/flutter/generated_plugins.cmake new file mode 100644 index 0000000..5bc0876 --- /dev/null +++ b/xp_overlay_app/linux/flutter/generated_plugins.cmake @@ -0,0 +1,24 @@ +# +# Generated file, do not edit. +# + +list(APPEND FLUTTER_PLUGIN_LIST + wayland_layer_shell +) + +list(APPEND FLUTTER_FFI_PLUGIN_LIST +) + +set(PLUGIN_BUNDLED_LIBRARIES) + +foreach(plugin ${FLUTTER_PLUGIN_LIST}) + add_subdirectory(flutter/ephemeral/.plugin_symlinks/${plugin}/linux plugins/${plugin}) + target_link_libraries(${BINARY_NAME} PRIVATE ${plugin}_plugin) + list(APPEND PLUGIN_BUNDLED_LIBRARIES $) + list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${plugin}_bundled_libraries}) +endforeach(plugin) + +foreach(ffi_plugin ${FLUTTER_FFI_PLUGIN_LIST}) + add_subdirectory(flutter/ephemeral/.plugin_symlinks/${ffi_plugin}/linux plugins/${ffi_plugin}) + list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${ffi_plugin}_bundled_libraries}) +endforeach(ffi_plugin) diff --git a/xp_overlay_app/linux/runner/CMakeLists.txt b/xp_overlay_app/linux/runner/CMakeLists.txt new file mode 100644 index 0000000..e97dabc --- /dev/null +++ b/xp_overlay_app/linux/runner/CMakeLists.txt @@ -0,0 +1,26 @@ +cmake_minimum_required(VERSION 3.13) +project(runner LANGUAGES CXX) + +# Define the application target. To change its name, change BINARY_NAME in the +# top-level CMakeLists.txt, not the value here, or `flutter run` will no longer +# work. +# +# Any new source files that you add to the application should be added here. +add_executable(${BINARY_NAME} + "main.cc" + "my_application.cc" + "${FLUTTER_MANAGED_DIR}/generated_plugin_registrant.cc" +) + +# Apply the standard set of build settings. This can be removed for applications +# that need different build settings. +apply_standard_settings(${BINARY_NAME}) + +# Add preprocessor definitions for the application ID. +add_definitions(-DAPPLICATION_ID="${APPLICATION_ID}") + +# Add dependency libraries. Add any application-specific dependencies here. +target_link_libraries(${BINARY_NAME} PRIVATE flutter) +target_link_libraries(${BINARY_NAME} PRIVATE PkgConfig::GTK) + +target_include_directories(${BINARY_NAME} PRIVATE "${CMAKE_SOURCE_DIR}") diff --git a/xp_overlay_app/linux/runner/main.cc b/xp_overlay_app/linux/runner/main.cc new file mode 100644 index 0000000..e7c5c54 --- /dev/null +++ b/xp_overlay_app/linux/runner/main.cc @@ -0,0 +1,6 @@ +#include "my_application.h" + +int main(int argc, char** argv) { + g_autoptr(MyApplication) app = my_application_new(); + return g_application_run(G_APPLICATION(app), argc, argv); +} diff --git a/xp_overlay_app/linux/runner/my_application.cc b/xp_overlay_app/linux/runner/my_application.cc new file mode 100644 index 0000000..ad092f4 --- /dev/null +++ b/xp_overlay_app/linux/runner/my_application.cc @@ -0,0 +1,131 @@ +#include "my_application.h" + +#include +#ifdef GDK_WINDOWING_X11 +#include +#endif + +#include "flutter/generated_plugin_registrant.h" + +struct _MyApplication { + GtkApplication parent_instance; + char** dart_entrypoint_arguments; +}; + +G_DEFINE_TYPE(MyApplication, my_application, GTK_TYPE_APPLICATION) + +// Implements GApplication::activate. +static void my_application_activate(GApplication* application) { + MyApplication* self = MY_APPLICATION(application); + GtkWindow* window = + GTK_WINDOW(gtk_application_window_new(GTK_APPLICATION(application))); + + // Use a header bar when running in GNOME as this is the common style used + // by applications and is the setup most users will be using (e.g. Ubuntu + // desktop). + // If running on X and not using GNOME then just use a traditional title bar + // in case the window manager does more exotic layout, e.g. tiling. + // If running on Wayland assume the header bar will work (may need changing + // if future cases occur). + // Disable header bar for layer shell compatibility + gboolean use_header_bar = FALSE; +#ifdef GDK_WINDOWING_X11 + GdkScreen* screen = gtk_window_get_screen(window); + if (GDK_IS_X11_SCREEN(screen)) { + const gchar* wm_name = gdk_x11_screen_get_window_manager_name(screen); + if (g_strcmp0(wm_name, "GNOME Shell") != 0) { + use_header_bar = FALSE; + } + } +#endif + if (use_header_bar) { + GtkHeaderBar* header_bar = GTK_HEADER_BAR(gtk_header_bar_new()); + gtk_widget_show(GTK_WIDGET(header_bar)); + gtk_header_bar_set_title(header_bar, "xp_overlay_app"); + gtk_header_bar_set_show_close_button(header_bar, TRUE); + gtk_window_set_titlebar(window, GTK_WIDGET(header_bar)); + } else { + gtk_window_set_title(window, "xp_overlay_app"); + } + + gtk_window_set_default_size(window, 1280, 720); + gtk_widget_realize(GTK_WIDGET(window)); + + g_autoptr(FlDartProject) project = fl_dart_project_new(); + fl_dart_project_set_dart_entrypoint_arguments(project, self->dart_entrypoint_arguments); + + FlView* view = fl_view_new(project); + gtk_widget_show(GTK_WIDGET(view)); + gtk_container_add(GTK_CONTAINER(window), GTK_WIDGET(view)); + + fl_register_plugins(FL_PLUGIN_REGISTRY(view)); + + gtk_widget_grab_focus(GTK_WIDGET(view)); +} + +// Implements GApplication::local_command_line. +static gboolean my_application_local_command_line(GApplication* application, gchar*** arguments, int* exit_status) { + MyApplication* self = MY_APPLICATION(application); + // Strip out the first argument as it is the binary name. + self->dart_entrypoint_arguments = g_strdupv(*arguments + 1); + + g_autoptr(GError) error = nullptr; + if (!g_application_register(application, nullptr, &error)) { + g_warning("Failed to register: %s", error->message); + *exit_status = 1; + return TRUE; + } + + g_application_activate(application); + *exit_status = 0; + + return TRUE; +} + +// Implements GApplication::startup. +static void my_application_startup(GApplication* application) { + //MyApplication* self = MY_APPLICATION(object); + + // Perform any actions required at application startup. + + G_APPLICATION_CLASS(my_application_parent_class)->startup(application); +} + +// Implements GApplication::shutdown. +static void my_application_shutdown(GApplication* application) { + //MyApplication* self = MY_APPLICATION(object); + + // Perform any actions required at application shutdown. + + G_APPLICATION_CLASS(my_application_parent_class)->shutdown(application); +} + +// Implements GObject::dispose. +static void my_application_dispose(GObject* object) { + MyApplication* self = MY_APPLICATION(object); + g_clear_pointer(&self->dart_entrypoint_arguments, g_strfreev); + G_OBJECT_CLASS(my_application_parent_class)->dispose(object); +} + +static void my_application_class_init(MyApplicationClass* klass) { + G_APPLICATION_CLASS(klass)->activate = my_application_activate; + G_APPLICATION_CLASS(klass)->local_command_line = my_application_local_command_line; + G_APPLICATION_CLASS(klass)->startup = my_application_startup; + G_APPLICATION_CLASS(klass)->shutdown = my_application_shutdown; + G_OBJECT_CLASS(klass)->dispose = my_application_dispose; +} + +static void my_application_init(MyApplication* self) {} + +MyApplication* my_application_new() { + // Set the program name to the application ID, which helps various systems + // like GTK and desktop environments map this running application to its + // corresponding .desktop file. This ensures better integration by allowing + // the application to be recognized beyond its binary name. + g_set_prgname(APPLICATION_ID); + + return MY_APPLICATION(g_object_new(my_application_get_type(), + "application-id", APPLICATION_ID, + "flags", G_APPLICATION_NON_UNIQUE, + nullptr)); +} diff --git a/xp_overlay_app/linux/runner/my_application.h b/xp_overlay_app/linux/runner/my_application.h new file mode 100644 index 0000000..72271d5 --- /dev/null +++ b/xp_overlay_app/linux/runner/my_application.h @@ -0,0 +1,18 @@ +#ifndef FLUTTER_MY_APPLICATION_H_ +#define FLUTTER_MY_APPLICATION_H_ + +#include + +G_DECLARE_FINAL_TYPE(MyApplication, my_application, MY, APPLICATION, + GtkApplication) + +/** + * my_application_new: + * + * Creates a new Flutter-based application. + * + * Returns: a new #MyApplication. + */ +MyApplication* my_application_new(); + +#endif // FLUTTER_MY_APPLICATION_H_ diff --git a/xp_overlay_app/macos/.gitignore b/xp_overlay_app/macos/.gitignore new file mode 100644 index 0000000..746adbb --- /dev/null +++ b/xp_overlay_app/macos/.gitignore @@ -0,0 +1,7 @@ +# Flutter-related +**/Flutter/ephemeral/ +**/Pods/ + +# Xcode-related +**/dgph +**/xcuserdata/ diff --git a/xp_overlay_app/macos/Flutter/Flutter-Debug.xcconfig b/xp_overlay_app/macos/Flutter/Flutter-Debug.xcconfig new file mode 100644 index 0000000..c2efd0b --- /dev/null +++ b/xp_overlay_app/macos/Flutter/Flutter-Debug.xcconfig @@ -0,0 +1 @@ +#include "ephemeral/Flutter-Generated.xcconfig" diff --git a/xp_overlay_app/macos/Flutter/Flutter-Release.xcconfig b/xp_overlay_app/macos/Flutter/Flutter-Release.xcconfig new file mode 100644 index 0000000..c2efd0b --- /dev/null +++ b/xp_overlay_app/macos/Flutter/Flutter-Release.xcconfig @@ -0,0 +1 @@ +#include "ephemeral/Flutter-Generated.xcconfig" diff --git a/xp_overlay_app/macos/Flutter/GeneratedPluginRegistrant.swift b/xp_overlay_app/macos/Flutter/GeneratedPluginRegistrant.swift new file mode 100644 index 0000000..cccf817 --- /dev/null +++ b/xp_overlay_app/macos/Flutter/GeneratedPluginRegistrant.swift @@ -0,0 +1,10 @@ +// +// Generated file. Do not edit. +// + +import FlutterMacOS +import Foundation + + +func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { +} diff --git a/xp_overlay_app/macos/Runner.xcodeproj/project.pbxproj b/xp_overlay_app/macos/Runner.xcodeproj/project.pbxproj new file mode 100644 index 0000000..1e38bf0 --- /dev/null +++ b/xp_overlay_app/macos/Runner.xcodeproj/project.pbxproj @@ -0,0 +1,705 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 54; + objects = { + +/* Begin PBXAggregateTarget section */ + 33CC111A2044C6BA0003C045 /* Flutter Assemble */ = { + isa = PBXAggregateTarget; + buildConfigurationList = 33CC111B2044C6BA0003C045 /* Build configuration list for PBXAggregateTarget "Flutter Assemble" */; + buildPhases = ( + 33CC111E2044C6BF0003C045 /* ShellScript */, + ); + dependencies = ( + ); + name = "Flutter Assemble"; + productName = FLX; + }; +/* End PBXAggregateTarget section */ + +/* Begin PBXBuildFile section */ + 331C80D8294CF71000263BE5 /* RunnerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 331C80D7294CF71000263BE5 /* RunnerTests.swift */; }; + 335BBD1B22A9A15E00E9071D /* GeneratedPluginRegistrant.swift in Sources */ = {isa = PBXBuildFile; fileRef = 335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */; }; + 33CC10F12044A3C60003C045 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC10F02044A3C60003C045 /* AppDelegate.swift */; }; + 33CC10F32044A3C60003C045 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F22044A3C60003C045 /* Assets.xcassets */; }; + 33CC10F62044A3C60003C045 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F42044A3C60003C045 /* MainMenu.xib */; }; + 33CC11132044BFA00003C045 /* MainFlutterWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC11122044BFA00003C045 /* MainFlutterWindow.swift */; }; +/* End PBXBuildFile section */ + +/* Begin PBXContainerItemProxy section */ + 331C80D9294CF71000263BE5 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 33CC10E52044A3C60003C045 /* Project object */; + proxyType = 1; + remoteGlobalIDString = 33CC10EC2044A3C60003C045; + remoteInfo = Runner; + }; + 33CC111F2044C79F0003C045 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 33CC10E52044A3C60003C045 /* Project object */; + proxyType = 1; + remoteGlobalIDString = 33CC111A2044C6BA0003C045; + remoteInfo = FLX; + }; +/* End PBXContainerItemProxy section */ + +/* Begin PBXCopyFilesBuildPhase section */ + 33CC110E2044A8840003C045 /* Bundle Framework */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = ""; + dstSubfolderSpec = 10; + files = ( + ); + name = "Bundle Framework"; + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXCopyFilesBuildPhase section */ + +/* Begin PBXFileReference section */ + 331C80D5294CF71000263BE5 /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; + 331C80D7294CF71000263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = ""; }; + 333000ED22D3DE5D00554162 /* Warnings.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Warnings.xcconfig; sourceTree = ""; }; + 335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GeneratedPluginRegistrant.swift; sourceTree = ""; }; + 33CC10ED2044A3C60003C045 /* xp_overlay_app.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "xp_overlay_app.app"; sourceTree = BUILT_PRODUCTS_DIR; }; + 33CC10F02044A3C60003C045 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; + 33CC10F22044A3C60003C045 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Assets.xcassets; path = Runner/Assets.xcassets; sourceTree = ""; }; + 33CC10F52044A3C60003C045 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/MainMenu.xib; sourceTree = ""; }; + 33CC10F72044A3C60003C045 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = Info.plist; path = Runner/Info.plist; sourceTree = ""; }; + 33CC11122044BFA00003C045 /* MainFlutterWindow.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainFlutterWindow.swift; sourceTree = ""; }; + 33CEB47222A05771004F2AC0 /* Flutter-Debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Flutter-Debug.xcconfig"; sourceTree = ""; }; + 33CEB47422A05771004F2AC0 /* Flutter-Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Flutter-Release.xcconfig"; sourceTree = ""; }; + 33CEB47722A0578A004F2AC0 /* Flutter-Generated.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = "Flutter-Generated.xcconfig"; path = "ephemeral/Flutter-Generated.xcconfig"; sourceTree = ""; }; + 33E51913231747F40026EE4D /* DebugProfile.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = DebugProfile.entitlements; sourceTree = ""; }; + 33E51914231749380026EE4D /* Release.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; path = Release.entitlements; sourceTree = ""; }; + 33E5194F232828860026EE4D /* AppInfo.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = AppInfo.xcconfig; sourceTree = ""; }; + 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Release.xcconfig; sourceTree = ""; }; + 9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Debug.xcconfig; sourceTree = ""; }; +/* End PBXFileReference section */ + +/* Begin PBXFrameworksBuildPhase section */ + 331C80D2294CF70F00263BE5 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 33CC10EA2044A3C60003C045 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ + 331C80D6294CF71000263BE5 /* RunnerTests */ = { + isa = PBXGroup; + children = ( + 331C80D7294CF71000263BE5 /* RunnerTests.swift */, + ); + path = RunnerTests; + sourceTree = ""; + }; + 33BA886A226E78AF003329D5 /* Configs */ = { + isa = PBXGroup; + children = ( + 33E5194F232828860026EE4D /* AppInfo.xcconfig */, + 9740EEB21CF90195004384FC /* Debug.xcconfig */, + 7AFA3C8E1D35360C0083082E /* Release.xcconfig */, + 333000ED22D3DE5D00554162 /* Warnings.xcconfig */, + ); + path = Configs; + sourceTree = ""; + }; + 33CC10E42044A3C60003C045 = { + isa = PBXGroup; + children = ( + 33FAB671232836740065AC1E /* Runner */, + 33CEB47122A05771004F2AC0 /* Flutter */, + 331C80D6294CF71000263BE5 /* RunnerTests */, + 33CC10EE2044A3C60003C045 /* Products */, + D73912EC22F37F3D000D13A0 /* Frameworks */, + ); + sourceTree = ""; + }; + 33CC10EE2044A3C60003C045 /* Products */ = { + isa = PBXGroup; + children = ( + 33CC10ED2044A3C60003C045 /* xp_overlay_app.app */, + 331C80D5294CF71000263BE5 /* RunnerTests.xctest */, + ); + name = Products; + sourceTree = ""; + }; + 33CC11242044D66E0003C045 /* Resources */ = { + isa = PBXGroup; + children = ( + 33CC10F22044A3C60003C045 /* Assets.xcassets */, + 33CC10F42044A3C60003C045 /* MainMenu.xib */, + 33CC10F72044A3C60003C045 /* Info.plist */, + ); + name = Resources; + path = ..; + sourceTree = ""; + }; + 33CEB47122A05771004F2AC0 /* Flutter */ = { + isa = PBXGroup; + children = ( + 335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */, + 33CEB47222A05771004F2AC0 /* Flutter-Debug.xcconfig */, + 33CEB47422A05771004F2AC0 /* Flutter-Release.xcconfig */, + 33CEB47722A0578A004F2AC0 /* Flutter-Generated.xcconfig */, + ); + path = Flutter; + sourceTree = ""; + }; + 33FAB671232836740065AC1E /* Runner */ = { + isa = PBXGroup; + children = ( + 33CC10F02044A3C60003C045 /* AppDelegate.swift */, + 33CC11122044BFA00003C045 /* MainFlutterWindow.swift */, + 33E51913231747F40026EE4D /* DebugProfile.entitlements */, + 33E51914231749380026EE4D /* Release.entitlements */, + 33CC11242044D66E0003C045 /* Resources */, + 33BA886A226E78AF003329D5 /* Configs */, + ); + path = Runner; + sourceTree = ""; + }; + D73912EC22F37F3D000D13A0 /* Frameworks */ = { + isa = PBXGroup; + children = ( + ); + name = Frameworks; + sourceTree = ""; + }; +/* End PBXGroup section */ + +/* Begin PBXNativeTarget section */ + 331C80D4294CF70F00263BE5 /* RunnerTests */ = { + isa = PBXNativeTarget; + buildConfigurationList = 331C80DE294CF71000263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */; + buildPhases = ( + 331C80D1294CF70F00263BE5 /* Sources */, + 331C80D2294CF70F00263BE5 /* Frameworks */, + 331C80D3294CF70F00263BE5 /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + 331C80DA294CF71000263BE5 /* PBXTargetDependency */, + ); + name = RunnerTests; + productName = RunnerTests; + productReference = 331C80D5294CF71000263BE5 /* RunnerTests.xctest */; + productType = "com.apple.product-type.bundle.unit-test"; + }; + 33CC10EC2044A3C60003C045 /* Runner */ = { + isa = PBXNativeTarget; + buildConfigurationList = 33CC10FB2044A3C60003C045 /* Build configuration list for PBXNativeTarget "Runner" */; + buildPhases = ( + 33CC10E92044A3C60003C045 /* Sources */, + 33CC10EA2044A3C60003C045 /* Frameworks */, + 33CC10EB2044A3C60003C045 /* Resources */, + 33CC110E2044A8840003C045 /* Bundle Framework */, + 3399D490228B24CF009A79C7 /* ShellScript */, + ); + buildRules = ( + ); + dependencies = ( + 33CC11202044C79F0003C045 /* PBXTargetDependency */, + ); + name = Runner; + productName = Runner; + productReference = 33CC10ED2044A3C60003C045 /* xp_overlay_app.app */; + productType = "com.apple.product-type.application"; + }; +/* End PBXNativeTarget section */ + +/* Begin PBXProject section */ + 33CC10E52044A3C60003C045 /* Project object */ = { + isa = PBXProject; + attributes = { + BuildIndependentTargetsInParallel = YES; + LastSwiftUpdateCheck = 0920; + LastUpgradeCheck = 1510; + ORGANIZATIONNAME = ""; + TargetAttributes = { + 331C80D4294CF70F00263BE5 = { + CreatedOnToolsVersion = 14.0; + TestTargetID = 33CC10EC2044A3C60003C045; + }; + 33CC10EC2044A3C60003C045 = { + CreatedOnToolsVersion = 9.2; + LastSwiftMigration = 1100; + ProvisioningStyle = Automatic; + SystemCapabilities = { + com.apple.Sandbox = { + enabled = 1; + }; + }; + }; + 33CC111A2044C6BA0003C045 = { + CreatedOnToolsVersion = 9.2; + ProvisioningStyle = Manual; + }; + }; + }; + buildConfigurationList = 33CC10E82044A3C60003C045 /* Build configuration list for PBXProject "Runner" */; + compatibilityVersion = "Xcode 9.3"; + developmentRegion = en; + hasScannedForEncodings = 0; + knownRegions = ( + en, + Base, + ); + mainGroup = 33CC10E42044A3C60003C045; + productRefGroup = 33CC10EE2044A3C60003C045 /* Products */; + projectDirPath = ""; + projectRoot = ""; + targets = ( + 33CC10EC2044A3C60003C045 /* Runner */, + 331C80D4294CF70F00263BE5 /* RunnerTests */, + 33CC111A2044C6BA0003C045 /* Flutter Assemble */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXResourcesBuildPhase section */ + 331C80D3294CF70F00263BE5 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 33CC10EB2044A3C60003C045 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 33CC10F32044A3C60003C045 /* Assets.xcassets in Resources */, + 33CC10F62044A3C60003C045 /* MainMenu.xib in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXResourcesBuildPhase section */ + +/* Begin PBXShellScriptBuildPhase section */ + 3399D490228B24CF009A79C7 /* ShellScript */ = { + isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + ); + outputFileListPaths = ( + ); + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "echo \"$PRODUCT_NAME.app\" > \"$PROJECT_DIR\"/Flutter/ephemeral/.app_filename && \"$FLUTTER_ROOT\"/packages/flutter_tools/bin/macos_assemble.sh embed\n"; + }; + 33CC111E2044C6BF0003C045 /* ShellScript */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + Flutter/ephemeral/FlutterInputs.xcfilelist, + ); + inputPaths = ( + Flutter/ephemeral/tripwire, + ); + outputFileListPaths = ( + Flutter/ephemeral/FlutterOutputs.xcfilelist, + ); + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"$FLUTTER_ROOT\"/packages/flutter_tools/bin/macos_assemble.sh && touch Flutter/ephemeral/tripwire"; + }; +/* End PBXShellScriptBuildPhase section */ + +/* Begin PBXSourcesBuildPhase section */ + 331C80D1294CF70F00263BE5 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 331C80D8294CF71000263BE5 /* RunnerTests.swift in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 33CC10E92044A3C60003C045 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 33CC11132044BFA00003C045 /* MainFlutterWindow.swift in Sources */, + 33CC10F12044A3C60003C045 /* AppDelegate.swift in Sources */, + 335BBD1B22A9A15E00E9071D /* GeneratedPluginRegistrant.swift in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ + +/* Begin PBXTargetDependency section */ + 331C80DA294CF71000263BE5 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 33CC10EC2044A3C60003C045 /* Runner */; + targetProxy = 331C80D9294CF71000263BE5 /* PBXContainerItemProxy */; + }; + 33CC11202044C79F0003C045 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 33CC111A2044C6BA0003C045 /* Flutter Assemble */; + targetProxy = 33CC111F2044C79F0003C045 /* PBXContainerItemProxy */; + }; +/* End PBXTargetDependency section */ + +/* Begin PBXVariantGroup section */ + 33CC10F42044A3C60003C045 /* MainMenu.xib */ = { + isa = PBXVariantGroup; + children = ( + 33CC10F52044A3C60003C045 /* Base */, + ); + name = MainMenu.xib; + path = Runner; + sourceTree = ""; + }; +/* End PBXVariantGroup section */ + +/* Begin XCBuildConfiguration section */ + 331C80DB294CF71000263BE5 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + BUNDLE_LOADER = "$(TEST_HOST)"; + CURRENT_PROJECT_VERSION = 1; + GENERATE_INFOPLIST_FILE = YES; + MARKETING_VERSION = 1.0; + PRODUCT_BUNDLE_IDENTIFIER = com.xpnix.xpOverlayApp.RunnerTests; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 5.0; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/xp_overlay_app.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/xp_overlay_app"; + }; + name = Debug; + }; + 331C80DC294CF71000263BE5 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + BUNDLE_LOADER = "$(TEST_HOST)"; + CURRENT_PROJECT_VERSION = 1; + GENERATE_INFOPLIST_FILE = YES; + MARKETING_VERSION = 1.0; + PRODUCT_BUNDLE_IDENTIFIER = com.xpnix.xpOverlayApp.RunnerTests; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 5.0; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/xp_overlay_app.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/xp_overlay_app"; + }; + name = Release; + }; + 331C80DD294CF71000263BE5 /* Profile */ = { + isa = XCBuildConfiguration; + buildSettings = { + BUNDLE_LOADER = "$(TEST_HOST)"; + CURRENT_PROJECT_VERSION = 1; + GENERATE_INFOPLIST_FILE = YES; + MARKETING_VERSION = 1.0; + PRODUCT_BUNDLE_IDENTIFIER = com.xpnix.xpOverlayApp.RunnerTests; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 5.0; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/xp_overlay_app.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/xp_overlay_app"; + }; + name = Profile; + }; + 338D0CE9231458BD00FA5F75 /* Profile */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CODE_SIGN_IDENTITY = "-"; + COPY_PHASE_STRIP = NO; + DEAD_CODE_STRIPPING = YES; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_USER_SCRIPT_SANDBOXING = NO; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + MACOSX_DEPLOYMENT_TARGET = 10.14; + MTL_ENABLE_DEBUG_INFO = NO; + SDKROOT = macosx; + SWIFT_COMPILATION_MODE = wholemodule; + SWIFT_OPTIMIZATION_LEVEL = "-O"; + }; + name = Profile; + }; + 338D0CEA231458BD00FA5F75 /* Profile */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 33E5194F232828860026EE4D /* AppInfo.xcconfig */; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ENABLE_MODULES = YES; + CODE_SIGN_ENTITLEMENTS = Runner/DebugProfile.entitlements; + CODE_SIGN_STYLE = Automatic; + COMBINE_HIDPI_IMAGES = YES; + INFOPLIST_FILE = Runner/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/../Frameworks", + ); + PROVISIONING_PROFILE_SPECIFIER = ""; + SWIFT_VERSION = 5.0; + }; + name = Profile; + }; + 338D0CEB231458BD00FA5F75 /* Profile */ = { + isa = XCBuildConfiguration; + buildSettings = { + CODE_SIGN_STYLE = Manual; + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Profile; + }; + 33CC10F92044A3C60003C045 /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CODE_SIGN_IDENTITY = "-"; + COPY_PHASE_STRIP = NO; + DEAD_CODE_STRIPPING = YES; + DEBUG_INFORMATION_FORMAT = dwarf; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; + ENABLE_USER_SCRIPT_SANDBOXING = NO; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_DYNAMIC_NO_PIC = NO; + GCC_NO_COMMON_BLOCKS = YES; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + MACOSX_DEPLOYMENT_TARGET = 10.14; + MTL_ENABLE_DEBUG_INFO = YES; + ONLY_ACTIVE_ARCH = YES; + SDKROOT = macosx; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + }; + name = Debug; + }; + 33CC10FA2044A3C60003C045 /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CODE_SIGN_IDENTITY = "-"; + COPY_PHASE_STRIP = NO; + DEAD_CODE_STRIPPING = YES; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_USER_SCRIPT_SANDBOXING = NO; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + MACOSX_DEPLOYMENT_TARGET = 10.14; + MTL_ENABLE_DEBUG_INFO = NO; + SDKROOT = macosx; + SWIFT_COMPILATION_MODE = wholemodule; + SWIFT_OPTIMIZATION_LEVEL = "-O"; + }; + name = Release; + }; + 33CC10FC2044A3C60003C045 /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 33E5194F232828860026EE4D /* AppInfo.xcconfig */; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ENABLE_MODULES = YES; + CODE_SIGN_ENTITLEMENTS = Runner/DebugProfile.entitlements; + CODE_SIGN_STYLE = Automatic; + COMBINE_HIDPI_IMAGES = YES; + INFOPLIST_FILE = Runner/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/../Frameworks", + ); + PROVISIONING_PROFILE_SPECIFIER = ""; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 5.0; + }; + name = Debug; + }; + 33CC10FD2044A3C60003C045 /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 33E5194F232828860026EE4D /* AppInfo.xcconfig */; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ENABLE_MODULES = YES; + CODE_SIGN_ENTITLEMENTS = Runner/Release.entitlements; + CODE_SIGN_STYLE = Automatic; + COMBINE_HIDPI_IMAGES = YES; + INFOPLIST_FILE = Runner/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/../Frameworks", + ); + PROVISIONING_PROFILE_SPECIFIER = ""; + SWIFT_VERSION = 5.0; + }; + name = Release; + }; + 33CC111C2044C6BA0003C045 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + CODE_SIGN_STYLE = Manual; + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Debug; + }; + 33CC111D2044C6BA0003C045 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + CODE_SIGN_STYLE = Automatic; + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Release; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + 331C80DE294CF71000263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 331C80DB294CF71000263BE5 /* Debug */, + 331C80DC294CF71000263BE5 /* Release */, + 331C80DD294CF71000263BE5 /* Profile */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 33CC10E82044A3C60003C045 /* Build configuration list for PBXProject "Runner" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 33CC10F92044A3C60003C045 /* Debug */, + 33CC10FA2044A3C60003C045 /* Release */, + 338D0CE9231458BD00FA5F75 /* Profile */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 33CC10FB2044A3C60003C045 /* Build configuration list for PBXNativeTarget "Runner" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 33CC10FC2044A3C60003C045 /* Debug */, + 33CC10FD2044A3C60003C045 /* Release */, + 338D0CEA231458BD00FA5F75 /* Profile */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 33CC111B2044C6BA0003C045 /* Build configuration list for PBXAggregateTarget "Flutter Assemble" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 33CC111C2044C6BA0003C045 /* Debug */, + 33CC111D2044C6BA0003C045 /* Release */, + 338D0CEB231458BD00FA5F75 /* Profile */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; +/* End XCConfigurationList section */ + }; + rootObject = 33CC10E52044A3C60003C045 /* Project object */; +} diff --git a/xp_overlay_app/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/xp_overlay_app/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/xp_overlay_app/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/xp_overlay_app/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/xp_overlay_app/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme new file mode 100644 index 0000000..80790ee --- /dev/null +++ b/xp_overlay_app/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -0,0 +1,99 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/xp_overlay_app/macos/Runner.xcworkspace/contents.xcworkspacedata b/xp_overlay_app/macos/Runner.xcworkspace/contents.xcworkspacedata new file mode 100644 index 0000000..1d526a1 --- /dev/null +++ b/xp_overlay_app/macos/Runner.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ + + + + + diff --git a/xp_overlay_app/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/xp_overlay_app/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/xp_overlay_app/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/xp_overlay_app/macos/Runner/AppDelegate.swift b/xp_overlay_app/macos/Runner/AppDelegate.swift new file mode 100644 index 0000000..b3c1761 --- /dev/null +++ b/xp_overlay_app/macos/Runner/AppDelegate.swift @@ -0,0 +1,13 @@ +import Cocoa +import FlutterMacOS + +@main +class AppDelegate: FlutterAppDelegate { + override func applicationShouldTerminateAfterLastWindowClosed(_ sender: NSApplication) -> Bool { + return true + } + + override func applicationSupportsSecureRestorableState(_ app: NSApplication) -> Bool { + return true + } +} diff --git a/xp_overlay_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/xp_overlay_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json new file mode 100644 index 0000000..a2ec33f --- /dev/null +++ b/xp_overlay_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -0,0 +1,68 @@ +{ + "images" : [ + { + "size" : "16x16", + "idiom" : "mac", + "filename" : "app_icon_16.png", + "scale" : "1x" + }, + { + "size" : "16x16", + "idiom" : "mac", + "filename" : "app_icon_32.png", + "scale" : "2x" + }, + { + "size" : "32x32", + "idiom" : "mac", + "filename" : "app_icon_32.png", + "scale" : "1x" + }, + { + "size" : "32x32", + "idiom" : "mac", + "filename" : "app_icon_64.png", + "scale" : "2x" + }, + { + "size" : "128x128", + "idiom" : "mac", + "filename" : "app_icon_128.png", + "scale" : "1x" + }, + { + "size" : "128x128", + "idiom" : "mac", + "filename" : "app_icon_256.png", + "scale" : "2x" + }, + { + "size" : "256x256", + "idiom" : "mac", + "filename" : "app_icon_256.png", + "scale" : "1x" + }, + { + "size" : "256x256", + "idiom" : "mac", + "filename" : "app_icon_512.png", + "scale" : "2x" + }, + { + "size" : "512x512", + "idiom" : "mac", + "filename" : "app_icon_512.png", + "scale" : "1x" + }, + { + "size" : "512x512", + "idiom" : "mac", + "filename" : "app_icon_1024.png", + "scale" : "2x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} diff --git a/xp_overlay_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png b/xp_overlay_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png new file mode 100644 index 0000000..82b6f9d Binary files /dev/null and b/xp_overlay_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png differ diff --git a/xp_overlay_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png b/xp_overlay_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png new file mode 100644 index 0000000..13b35eb Binary files /dev/null and b/xp_overlay_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png differ diff --git a/xp_overlay_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png b/xp_overlay_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png new file mode 100644 index 0000000..0a3f5fa Binary files /dev/null and b/xp_overlay_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png differ diff --git a/xp_overlay_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png b/xp_overlay_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png new file mode 100644 index 0000000..bdb5722 Binary files /dev/null and b/xp_overlay_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png differ diff --git a/xp_overlay_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png b/xp_overlay_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png new file mode 100644 index 0000000..f083318 Binary files /dev/null and b/xp_overlay_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png differ diff --git a/xp_overlay_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png b/xp_overlay_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png new file mode 100644 index 0000000..326c0e7 Binary files /dev/null and b/xp_overlay_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png differ diff --git a/xp_overlay_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png b/xp_overlay_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png new file mode 100644 index 0000000..2f1632c Binary files /dev/null and b/xp_overlay_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png differ diff --git a/xp_overlay_app/macos/Runner/Base.lproj/MainMenu.xib b/xp_overlay_app/macos/Runner/Base.lproj/MainMenu.xib new file mode 100644 index 0000000..80e867a --- /dev/null +++ b/xp_overlay_app/macos/Runner/Base.lproj/MainMenu.xib @@ -0,0 +1,343 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/xp_overlay_app/macos/Runner/Configs/AppInfo.xcconfig b/xp_overlay_app/macos/Runner/Configs/AppInfo.xcconfig new file mode 100644 index 0000000..8466504 --- /dev/null +++ b/xp_overlay_app/macos/Runner/Configs/AppInfo.xcconfig @@ -0,0 +1,14 @@ +// Application-level settings for the Runner target. +// +// This may be replaced with something auto-generated from metadata (e.g., pubspec.yaml) in the +// future. If not, the values below would default to using the project name when this becomes a +// 'flutter create' template. + +// The application's name. By default this is also the title of the Flutter window. +PRODUCT_NAME = xp_overlay_app + +// The application's bundle identifier +PRODUCT_BUNDLE_IDENTIFIER = com.xpnix.xpOverlayApp + +// The copyright displayed in application information +PRODUCT_COPYRIGHT = Copyright © 2025 com.xpnix. All rights reserved. diff --git a/xp_overlay_app/macos/Runner/Configs/Debug.xcconfig b/xp_overlay_app/macos/Runner/Configs/Debug.xcconfig new file mode 100644 index 0000000..36b0fd9 --- /dev/null +++ b/xp_overlay_app/macos/Runner/Configs/Debug.xcconfig @@ -0,0 +1,2 @@ +#include "../../Flutter/Flutter-Debug.xcconfig" +#include "Warnings.xcconfig" diff --git a/xp_overlay_app/macos/Runner/Configs/Release.xcconfig b/xp_overlay_app/macos/Runner/Configs/Release.xcconfig new file mode 100644 index 0000000..dff4f49 --- /dev/null +++ b/xp_overlay_app/macos/Runner/Configs/Release.xcconfig @@ -0,0 +1,2 @@ +#include "../../Flutter/Flutter-Release.xcconfig" +#include "Warnings.xcconfig" diff --git a/xp_overlay_app/macos/Runner/Configs/Warnings.xcconfig b/xp_overlay_app/macos/Runner/Configs/Warnings.xcconfig new file mode 100644 index 0000000..42bcbf4 --- /dev/null +++ b/xp_overlay_app/macos/Runner/Configs/Warnings.xcconfig @@ -0,0 +1,13 @@ +WARNING_CFLAGS = -Wall -Wconditional-uninitialized -Wnullable-to-nonnull-conversion -Wmissing-method-return-type -Woverlength-strings +GCC_WARN_UNDECLARED_SELECTOR = YES +CLANG_UNDEFINED_BEHAVIOR_SANITIZER_NULLABILITY = YES +CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE +CLANG_WARN__DUPLICATE_METHOD_MATCH = YES +CLANG_WARN_PRAGMA_PACK = YES +CLANG_WARN_STRICT_PROTOTYPES = YES +CLANG_WARN_COMMA = YES +GCC_WARN_STRICT_SELECTOR_MATCH = YES +CLANG_WARN_OBJC_REPEATED_USE_OF_WEAK = YES +CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES +GCC_WARN_SHADOW = YES +CLANG_WARN_UNREACHABLE_CODE = YES diff --git a/xp_overlay_app/macos/Runner/DebugProfile.entitlements b/xp_overlay_app/macos/Runner/DebugProfile.entitlements new file mode 100644 index 0000000..dddb8a3 --- /dev/null +++ b/xp_overlay_app/macos/Runner/DebugProfile.entitlements @@ -0,0 +1,12 @@ + + + + + com.apple.security.app-sandbox + + com.apple.security.cs.allow-jit + + com.apple.security.network.server + + + diff --git a/xp_overlay_app/macos/Runner/Info.plist b/xp_overlay_app/macos/Runner/Info.plist new file mode 100644 index 0000000..4789daa --- /dev/null +++ b/xp_overlay_app/macos/Runner/Info.plist @@ -0,0 +1,32 @@ + + + + + CFBundleDevelopmentRegion + $(DEVELOPMENT_LANGUAGE) + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIconFile + + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + $(PRODUCT_NAME) + CFBundlePackageType + APPL + CFBundleShortVersionString + $(FLUTTER_BUILD_NAME) + CFBundleVersion + $(FLUTTER_BUILD_NUMBER) + LSMinimumSystemVersion + $(MACOSX_DEPLOYMENT_TARGET) + NSHumanReadableCopyright + $(PRODUCT_COPYRIGHT) + NSMainNibFile + MainMenu + NSPrincipalClass + NSApplication + + diff --git a/xp_overlay_app/macos/Runner/MainFlutterWindow.swift b/xp_overlay_app/macos/Runner/MainFlutterWindow.swift new file mode 100644 index 0000000..3cc05eb --- /dev/null +++ b/xp_overlay_app/macos/Runner/MainFlutterWindow.swift @@ -0,0 +1,15 @@ +import Cocoa +import FlutterMacOS + +class MainFlutterWindow: NSWindow { + override func awakeFromNib() { + let flutterViewController = FlutterViewController() + let windowFrame = self.frame + self.contentViewController = flutterViewController + self.setFrame(windowFrame, display: true) + + RegisterGeneratedPlugins(registry: flutterViewController) + + super.awakeFromNib() + } +} diff --git a/xp_overlay_app/macos/Runner/Release.entitlements b/xp_overlay_app/macos/Runner/Release.entitlements new file mode 100644 index 0000000..852fa1a --- /dev/null +++ b/xp_overlay_app/macos/Runner/Release.entitlements @@ -0,0 +1,8 @@ + + + + + com.apple.security.app-sandbox + + + diff --git a/xp_overlay_app/macos/RunnerTests/RunnerTests.swift b/xp_overlay_app/macos/RunnerTests/RunnerTests.swift new file mode 100644 index 0000000..61f3bd1 --- /dev/null +++ b/xp_overlay_app/macos/RunnerTests/RunnerTests.swift @@ -0,0 +1,12 @@ +import Cocoa +import FlutterMacOS +import XCTest + +class RunnerTests: XCTestCase { + + func testExample() { + // If you add code to the Runner application, consider adding tests here. + // See https://developer.apple.com/documentation/xctest for more information about using XCTest. + } + +} diff --git a/xp_overlay_app/pubspec.lock b/xp_overlay_app/pubspec.lock new file mode 100644 index 0000000..1d81a26 --- /dev/null +++ b/xp_overlay_app/pubspec.lock @@ -0,0 +1,229 @@ +# Generated by pub +# See https://dart.dev/tools/pub/glossary#lockfile +packages: + async: + dependency: transitive + description: + name: async + sha256: "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb" + url: "https://pub.dev" + source: hosted + version: "2.13.0" + boolean_selector: + dependency: transitive + description: + name: boolean_selector + sha256: "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea" + url: "https://pub.dev" + source: hosted + version: "2.1.2" + characters: + dependency: transitive + description: + name: characters + sha256: f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803 + url: "https://pub.dev" + source: hosted + version: "1.4.0" + clock: + dependency: transitive + description: + name: clock + sha256: fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b + url: "https://pub.dev" + source: hosted + version: "1.1.2" + collection: + dependency: transitive + description: + name: collection + sha256: "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76" + url: "https://pub.dev" + source: hosted + version: "1.19.1" + cupertino_icons: + dependency: "direct main" + description: + name: cupertino_icons + sha256: ba631d1c7f7bef6b729a622b7b752645a2d076dba9976925b8f25725a30e1ee6 + url: "https://pub.dev" + source: hosted + version: "1.0.8" + fake_async: + dependency: transitive + description: + name: fake_async + sha256: "5368f224a74523e8d2e7399ea1638b37aecfca824a3cc4dfdf77bf1fa905ac44" + url: "https://pub.dev" + source: hosted + version: "1.3.3" + flutter: + dependency: "direct main" + description: flutter + source: sdk + version: "0.0.0" + flutter_lints: + dependency: "direct dev" + description: + name: flutter_lints + sha256: "5398f14efa795ffb7a33e9b6a08798b26a180edac4ad7db3f231e40f82ce11e1" + url: "https://pub.dev" + source: hosted + version: "5.0.0" + flutter_test: + dependency: "direct dev" + description: flutter + source: sdk + version: "0.0.0" + leak_tracker: + dependency: transitive + description: + name: leak_tracker + sha256: "6bb818ecbdffe216e81182c2f0714a2e62b593f4a4f13098713ff1685dfb6ab0" + url: "https://pub.dev" + source: hosted + version: "10.0.9" + leak_tracker_flutter_testing: + dependency: transitive + description: + name: leak_tracker_flutter_testing + sha256: f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573 + url: "https://pub.dev" + source: hosted + version: "3.0.9" + leak_tracker_testing: + dependency: transitive + description: + name: leak_tracker_testing + sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3" + url: "https://pub.dev" + source: hosted + version: "3.0.1" + lints: + dependency: transitive + description: + name: lints + sha256: c35bb79562d980e9a453fc715854e1ed39e24e7d0297a880ef54e17f9874a9d7 + url: "https://pub.dev" + source: hosted + version: "5.1.1" + matcher: + dependency: transitive + description: + name: matcher + sha256: dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2 + url: "https://pub.dev" + source: hosted + version: "0.12.17" + material_color_utilities: + dependency: transitive + description: + name: material_color_utilities + sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec + url: "https://pub.dev" + source: hosted + version: "0.11.1" + meta: + dependency: transitive + description: + name: meta + sha256: e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c + url: "https://pub.dev" + source: hosted + version: "1.16.0" + path: + dependency: transitive + description: + name: path + sha256: "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5" + url: "https://pub.dev" + source: hosted + version: "1.9.1" + plugin_platform_interface: + dependency: transitive + description: + name: plugin_platform_interface + sha256: "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02" + url: "https://pub.dev" + source: hosted + version: "2.1.8" + sky_engine: + dependency: transitive + description: flutter + source: sdk + version: "0.0.0" + source_span: + dependency: transitive + description: + name: source_span + sha256: "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c" + url: "https://pub.dev" + source: hosted + version: "1.10.1" + stack_trace: + dependency: transitive + description: + name: stack_trace + sha256: "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1" + url: "https://pub.dev" + source: hosted + version: "1.12.1" + stream_channel: + dependency: transitive + description: + name: stream_channel + sha256: "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d" + url: "https://pub.dev" + source: hosted + version: "2.1.4" + string_scanner: + dependency: transitive + description: + name: string_scanner + sha256: "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43" + url: "https://pub.dev" + source: hosted + version: "1.4.1" + term_glyph: + dependency: transitive + description: + name: term_glyph + sha256: "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e" + url: "https://pub.dev" + source: hosted + version: "1.2.2" + test_api: + dependency: transitive + description: + name: test_api + sha256: fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd + url: "https://pub.dev" + source: hosted + version: "0.7.4" + vector_math: + dependency: transitive + description: + name: vector_math + sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803" + url: "https://pub.dev" + source: hosted + version: "2.1.4" + vm_service: + dependency: transitive + description: + name: vm_service + sha256: ddfa8d30d89985b96407efce8acbdd124701f96741f2d981ca860662f1c0dc02 + url: "https://pub.dev" + source: hosted + version: "15.0.0" + wayland_layer_shell: + dependency: "direct main" + description: + name: wayland_layer_shell + sha256: fa71ae0e4b63c91ae1a882c52850f366a3c241f900773cea845761e589ce14fc + url: "https://pub.dev" + source: hosted + version: "1.0.1" +sdks: + dart: ">=3.8.0 <4.0.0" + flutter: ">=3.18.0-18.0.pre.54" diff --git a/xp_overlay_app/pubspec.yaml b/xp_overlay_app/pubspec.yaml new file mode 100644 index 0000000..9c2f7d1 --- /dev/null +++ b/xp_overlay_app/pubspec.yaml @@ -0,0 +1,92 @@ +name: xp_overlay_app +description: "A new Flutter project." +# The following line prevents the package from being accidentally published to +# pub.dev using `flutter pub publish`. This is preferred for private packages. +publish_to: 'none' # Remove this line if you wish to publish to pub.dev + +# The following defines the version and build number for your application. +# A version number is three numbers separated by dots, like 1.2.43 +# followed by an optional build number separated by a +. +# Both the version and the builder number may be overridden in flutter +# build by specifying --build-name and --build-number, respectively. +# In Android, build-name is used as versionName while build-number used as versionCode. +# Read more about Android versioning at https://developer.android.com/studio/publish/versioning +# In iOS, build-name is used as CFBundleShortVersionString while build-number is used as CFBundleVersion. +# Read more about iOS versioning at +# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html +# In Windows, build-name is used as the major, minor, and patch parts +# of the product and file versions while build-number is used as the build suffix. +version: 1.0.0+1 + +environment: + sdk: ^3.8.0 + +# Dependencies specify other packages that your package needs in order to work. +# To automatically upgrade your package dependencies to the latest versions +# consider running `flutter pub upgrade --major-versions`. Alternatively, +# dependencies can be manually updated by changing the version numbers below to +# the latest version available on pub.dev. To see which dependencies have newer +# versions available, run `flutter pub outdated`. +dependencies: + flutter: + sdk: flutter + + # The following adds the Cupertino Icons font to your application. + # Use with the CupertinoIcons class for iOS style icons. + cupertino_icons: ^1.0.8 + + # Wayland layer shell for transparent overlay windows + wayland_layer_shell: ^1.0.1 + +dev_dependencies: + flutter_test: + sdk: flutter + + # The "flutter_lints" package below contains a set of recommended lints to + # encourage good coding practices. The lint set provided by the package is + # activated in the `analysis_options.yaml` file located at the root of your + # package. See that file for information about deactivating specific lint + # rules and activating additional ones. + flutter_lints: ^5.0.0 + +# For information on the generic Dart part of this file, see the +# following page: https://dart.dev/tools/pub/pubspec + +# The following section is specific to Flutter packages. +flutter: + + # The following line ensures that the Material Icons font is + # included with your application, so that you can use the icons in + # the material Icons class. + uses-material-design: true + + # To add assets to your application, add an assets section, like this: + # assets: + # - images/a_dot_burr.jpeg + # - images/a_dot_ham.jpeg + + # An image asset can refer to one or more resolution-specific "variants", see + # https://flutter.dev/to/resolution-aware-images + + # For details regarding adding assets from package dependencies, see + # https://flutter.dev/to/asset-from-package + + # To add custom fonts to your application, add a fonts section here, + # in this "flutter" section. Each entry in this list should have a + # "family" key with the font family name, and a "fonts" key with a + # list giving the asset and other descriptors for the font. For + # example: + # fonts: + # - family: Schyler + # fonts: + # - asset: fonts/Schyler-Regular.ttf + # - asset: fonts/Schyler-Italic.ttf + # style: italic + # - family: Trajan Pro + # fonts: + # - asset: fonts/TrajanPro.ttf + # - asset: fonts/TrajanPro_Bold.ttf + # weight: 700 + # + # For details regarding fonts from package dependencies, + # see https://flutter.dev/to/font-from-package diff --git a/xp_overlay_app/test/widget_test.dart b/xp_overlay_app/test/widget_test.dart new file mode 100644 index 0000000..cbf521a --- /dev/null +++ b/xp_overlay_app/test/widget_test.dart @@ -0,0 +1,30 @@ +// This is a basic Flutter widget test. +// +// To perform an interaction with a widget in your test, use the WidgetTester +// utility in the flutter_test package. For example, you can send tap and scroll +// gestures. You can also use WidgetTester to find child widgets in the widget +// tree, read text, and verify that the values of widget properties are correct. + +import 'package:flutter/material.dart'; +import 'package:flutter_test/flutter_test.dart'; + +import 'package:xp_overlay_app/main.dart'; + +void main() { + testWidgets('Counter increments smoke test', (WidgetTester tester) async { + // Build our app and trigger a frame. + await tester.pumpWidget(const MyApp()); + + // Verify that our counter starts at 0. + expect(find.text('0'), findsOneWidget); + expect(find.text('1'), findsNothing); + + // Tap the '+' icon and trigger a frame. + await tester.tap(find.byIcon(Icons.add)); + await tester.pump(); + + // Verify that our counter has incremented. + expect(find.text('0'), findsNothing); + expect(find.text('1'), findsOneWidget); + }); +} diff --git a/xp_overlay_app/web/favicon.png b/xp_overlay_app/web/favicon.png new file mode 100644 index 0000000..8aaa46a Binary files /dev/null and b/xp_overlay_app/web/favicon.png differ diff --git a/xp_overlay_app/web/icons/Icon-192.png b/xp_overlay_app/web/icons/Icon-192.png new file mode 100644 index 0000000..b749bfe Binary files /dev/null and b/xp_overlay_app/web/icons/Icon-192.png differ diff --git a/xp_overlay_app/web/icons/Icon-512.png b/xp_overlay_app/web/icons/Icon-512.png new file mode 100644 index 0000000..88cfd48 Binary files /dev/null and b/xp_overlay_app/web/icons/Icon-512.png differ diff --git a/xp_overlay_app/web/icons/Icon-maskable-192.png b/xp_overlay_app/web/icons/Icon-maskable-192.png new file mode 100644 index 0000000..eb9b4d7 Binary files /dev/null and b/xp_overlay_app/web/icons/Icon-maskable-192.png differ diff --git a/xp_overlay_app/web/icons/Icon-maskable-512.png b/xp_overlay_app/web/icons/Icon-maskable-512.png new file mode 100644 index 0000000..d69c566 Binary files /dev/null and b/xp_overlay_app/web/icons/Icon-maskable-512.png differ diff --git a/xp_overlay_app/web/index.html b/xp_overlay_app/web/index.html new file mode 100644 index 0000000..cea98b3 --- /dev/null +++ b/xp_overlay_app/web/index.html @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + xp_overlay_app + + + + + + diff --git a/xp_overlay_app/web/manifest.json b/xp_overlay_app/web/manifest.json new file mode 100644 index 0000000..2ea2834 --- /dev/null +++ b/xp_overlay_app/web/manifest.json @@ -0,0 +1,35 @@ +{ + "name": "xp_overlay_app", + "short_name": "xp_overlay_app", + "start_url": ".", + "display": "standalone", + "background_color": "#0175C2", + "theme_color": "#0175C2", + "description": "A new Flutter project.", + "orientation": "portrait-primary", + "prefer_related_applications": false, + "icons": [ + { + "src": "icons/Icon-192.png", + "sizes": "192x192", + "type": "image/png" + }, + { + "src": "icons/Icon-512.png", + "sizes": "512x512", + "type": "image/png" + }, + { + "src": "icons/Icon-maskable-192.png", + "sizes": "192x192", + "type": "image/png", + "purpose": "maskable" + }, + { + "src": "icons/Icon-maskable-512.png", + "sizes": "512x512", + "type": "image/png", + "purpose": "maskable" + } + ] +} diff --git a/xp_overlay_app/windows/.gitignore b/xp_overlay_app/windows/.gitignore new file mode 100644 index 0000000..d492d0d --- /dev/null +++ b/xp_overlay_app/windows/.gitignore @@ -0,0 +1,17 @@ +flutter/ephemeral/ + +# Visual Studio user-specific files. +*.suo +*.user +*.userosscache +*.sln.docstates + +# Visual Studio build-related files. +x64/ +x86/ + +# Visual Studio cache files +# files ending in .cache can be ignored +*.[Cc]ache +# but keep track of directories ending in .cache +!*.[Cc]ache/ diff --git a/xp_overlay_app/windows/CMakeLists.txt b/xp_overlay_app/windows/CMakeLists.txt new file mode 100644 index 0000000..4075c96 --- /dev/null +++ b/xp_overlay_app/windows/CMakeLists.txt @@ -0,0 +1,108 @@ +# Project-level configuration. +cmake_minimum_required(VERSION 3.14) +project(xp_overlay_app LANGUAGES CXX) + +# The name of the executable created for the application. Change this to change +# the on-disk name of your application. +set(BINARY_NAME "xp_overlay_app") + +# Explicitly opt in to modern CMake behaviors to avoid warnings with recent +# versions of CMake. +cmake_policy(VERSION 3.14...3.25) + +# Define build configuration option. +get_property(IS_MULTICONFIG GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG) +if(IS_MULTICONFIG) + set(CMAKE_CONFIGURATION_TYPES "Debug;Profile;Release" + CACHE STRING "" FORCE) +else() + if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES) + set(CMAKE_BUILD_TYPE "Debug" CACHE + STRING "Flutter build mode" FORCE) + set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS + "Debug" "Profile" "Release") + endif() +endif() +# Define settings for the Profile build mode. +set(CMAKE_EXE_LINKER_FLAGS_PROFILE "${CMAKE_EXE_LINKER_FLAGS_RELEASE}") +set(CMAKE_SHARED_LINKER_FLAGS_PROFILE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE}") +set(CMAKE_C_FLAGS_PROFILE "${CMAKE_C_FLAGS_RELEASE}") +set(CMAKE_CXX_FLAGS_PROFILE "${CMAKE_CXX_FLAGS_RELEASE}") + +# Use Unicode for all projects. +add_definitions(-DUNICODE -D_UNICODE) + +# Compilation settings that should be applied to most targets. +# +# Be cautious about adding new options here, as plugins use this function by +# default. In most cases, you should add new options to specific targets instead +# of modifying this function. +function(APPLY_STANDARD_SETTINGS TARGET) + target_compile_features(${TARGET} PUBLIC cxx_std_17) + target_compile_options(${TARGET} PRIVATE /W4 /WX /wd"4100") + target_compile_options(${TARGET} PRIVATE /EHsc) + target_compile_definitions(${TARGET} PRIVATE "_HAS_EXCEPTIONS=0") + target_compile_definitions(${TARGET} PRIVATE "$<$:_DEBUG>") +endfunction() + +# Flutter library and tool build rules. +set(FLUTTER_MANAGED_DIR "${CMAKE_CURRENT_SOURCE_DIR}/flutter") +add_subdirectory(${FLUTTER_MANAGED_DIR}) + +# Application build; see runner/CMakeLists.txt. +add_subdirectory("runner") + + +# Generated plugin build rules, which manage building the plugins and adding +# them to the application. +include(flutter/generated_plugins.cmake) + + +# === Installation === +# Support files are copied into place next to the executable, so that it can +# run in place. This is done instead of making a separate bundle (as on Linux) +# so that building and running from within Visual Studio will work. +set(BUILD_BUNDLE_DIR "$") +# Make the "install" step default, as it's required to run. +set(CMAKE_VS_INCLUDE_INSTALL_TO_DEFAULT_BUILD 1) +if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) + set(CMAKE_INSTALL_PREFIX "${BUILD_BUNDLE_DIR}" CACHE PATH "..." FORCE) +endif() + +set(INSTALL_BUNDLE_DATA_DIR "${CMAKE_INSTALL_PREFIX}/data") +set(INSTALL_BUNDLE_LIB_DIR "${CMAKE_INSTALL_PREFIX}") + +install(TARGETS ${BINARY_NAME} RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}" + COMPONENT Runtime) + +install(FILES "${FLUTTER_ICU_DATA_FILE}" DESTINATION "${INSTALL_BUNDLE_DATA_DIR}" + COMPONENT Runtime) + +install(FILES "${FLUTTER_LIBRARY}" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" + COMPONENT Runtime) + +if(PLUGIN_BUNDLED_LIBRARIES) + install(FILES "${PLUGIN_BUNDLED_LIBRARIES}" + DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" + COMPONENT Runtime) +endif() + +# Copy the native assets provided by the build.dart from all packages. +set(NATIVE_ASSETS_DIR "${PROJECT_BUILD_DIR}native_assets/windows/") +install(DIRECTORY "${NATIVE_ASSETS_DIR}" + DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" + COMPONENT Runtime) + +# Fully re-copy the assets directory on each build to avoid having stale files +# from a previous install. +set(FLUTTER_ASSET_DIR_NAME "flutter_assets") +install(CODE " + file(REMOVE_RECURSE \"${INSTALL_BUNDLE_DATA_DIR}/${FLUTTER_ASSET_DIR_NAME}\") + " COMPONENT Runtime) +install(DIRECTORY "${PROJECT_BUILD_DIR}/${FLUTTER_ASSET_DIR_NAME}" + DESTINATION "${INSTALL_BUNDLE_DATA_DIR}" COMPONENT Runtime) + +# Install the AOT library on non-Debug builds only. +install(FILES "${AOT_LIBRARY}" DESTINATION "${INSTALL_BUNDLE_DATA_DIR}" + CONFIGURATIONS Profile;Release + COMPONENT Runtime) diff --git a/xp_overlay_app/windows/flutter/CMakeLists.txt b/xp_overlay_app/windows/flutter/CMakeLists.txt new file mode 100644 index 0000000..903f489 --- /dev/null +++ b/xp_overlay_app/windows/flutter/CMakeLists.txt @@ -0,0 +1,109 @@ +# This file controls Flutter-level build steps. It should not be edited. +cmake_minimum_required(VERSION 3.14) + +set(EPHEMERAL_DIR "${CMAKE_CURRENT_SOURCE_DIR}/ephemeral") + +# Configuration provided via flutter tool. +include(${EPHEMERAL_DIR}/generated_config.cmake) + +# TODO: Move the rest of this into files in ephemeral. See +# https://github.com/flutter/flutter/issues/57146. +set(WRAPPER_ROOT "${EPHEMERAL_DIR}/cpp_client_wrapper") + +# Set fallback configurations for older versions of the flutter tool. +if (NOT DEFINED FLUTTER_TARGET_PLATFORM) + set(FLUTTER_TARGET_PLATFORM "windows-x64") +endif() + +# === Flutter Library === +set(FLUTTER_LIBRARY "${EPHEMERAL_DIR}/flutter_windows.dll") + +# Published to parent scope for install step. +set(FLUTTER_LIBRARY ${FLUTTER_LIBRARY} PARENT_SCOPE) +set(FLUTTER_ICU_DATA_FILE "${EPHEMERAL_DIR}/icudtl.dat" PARENT_SCOPE) +set(PROJECT_BUILD_DIR "${PROJECT_DIR}/build/" PARENT_SCOPE) +set(AOT_LIBRARY "${PROJECT_DIR}/build/windows/app.so" PARENT_SCOPE) + +list(APPEND FLUTTER_LIBRARY_HEADERS + "flutter_export.h" + "flutter_windows.h" + "flutter_messenger.h" + "flutter_plugin_registrar.h" + "flutter_texture_registrar.h" +) +list(TRANSFORM FLUTTER_LIBRARY_HEADERS PREPEND "${EPHEMERAL_DIR}/") +add_library(flutter INTERFACE) +target_include_directories(flutter INTERFACE + "${EPHEMERAL_DIR}" +) +target_link_libraries(flutter INTERFACE "${FLUTTER_LIBRARY}.lib") +add_dependencies(flutter flutter_assemble) + +# === Wrapper === +list(APPEND CPP_WRAPPER_SOURCES_CORE + "core_implementations.cc" + "standard_codec.cc" +) +list(TRANSFORM CPP_WRAPPER_SOURCES_CORE PREPEND "${WRAPPER_ROOT}/") +list(APPEND CPP_WRAPPER_SOURCES_PLUGIN + "plugin_registrar.cc" +) +list(TRANSFORM CPP_WRAPPER_SOURCES_PLUGIN PREPEND "${WRAPPER_ROOT}/") +list(APPEND CPP_WRAPPER_SOURCES_APP + "flutter_engine.cc" + "flutter_view_controller.cc" +) +list(TRANSFORM CPP_WRAPPER_SOURCES_APP PREPEND "${WRAPPER_ROOT}/") + +# Wrapper sources needed for a plugin. +add_library(flutter_wrapper_plugin STATIC + ${CPP_WRAPPER_SOURCES_CORE} + ${CPP_WRAPPER_SOURCES_PLUGIN} +) +apply_standard_settings(flutter_wrapper_plugin) +set_target_properties(flutter_wrapper_plugin PROPERTIES + POSITION_INDEPENDENT_CODE ON) +set_target_properties(flutter_wrapper_plugin PROPERTIES + CXX_VISIBILITY_PRESET hidden) +target_link_libraries(flutter_wrapper_plugin PUBLIC flutter) +target_include_directories(flutter_wrapper_plugin PUBLIC + "${WRAPPER_ROOT}/include" +) +add_dependencies(flutter_wrapper_plugin flutter_assemble) + +# Wrapper sources needed for the runner. +add_library(flutter_wrapper_app STATIC + ${CPP_WRAPPER_SOURCES_CORE} + ${CPP_WRAPPER_SOURCES_APP} +) +apply_standard_settings(flutter_wrapper_app) +target_link_libraries(flutter_wrapper_app PUBLIC flutter) +target_include_directories(flutter_wrapper_app PUBLIC + "${WRAPPER_ROOT}/include" +) +add_dependencies(flutter_wrapper_app flutter_assemble) + +# === Flutter tool backend === +# _phony_ is a non-existent file to force this command to run every time, +# since currently there's no way to get a full input/output list from the +# flutter tool. +set(PHONY_OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/_phony_") +set_source_files_properties("${PHONY_OUTPUT}" PROPERTIES SYMBOLIC TRUE) +add_custom_command( + OUTPUT ${FLUTTER_LIBRARY} ${FLUTTER_LIBRARY_HEADERS} + ${CPP_WRAPPER_SOURCES_CORE} ${CPP_WRAPPER_SOURCES_PLUGIN} + ${CPP_WRAPPER_SOURCES_APP} + ${PHONY_OUTPUT} + COMMAND ${CMAKE_COMMAND} -E env + ${FLUTTER_TOOL_ENVIRONMENT} + "${FLUTTER_ROOT}/packages/flutter_tools/bin/tool_backend.bat" + ${FLUTTER_TARGET_PLATFORM} $ + VERBATIM +) +add_custom_target(flutter_assemble DEPENDS + "${FLUTTER_LIBRARY}" + ${FLUTTER_LIBRARY_HEADERS} + ${CPP_WRAPPER_SOURCES_CORE} + ${CPP_WRAPPER_SOURCES_PLUGIN} + ${CPP_WRAPPER_SOURCES_APP} +) diff --git a/xp_overlay_app/windows/flutter/generated_plugin_registrant.cc b/xp_overlay_app/windows/flutter/generated_plugin_registrant.cc new file mode 100644 index 0000000..8b6d468 --- /dev/null +++ b/xp_overlay_app/windows/flutter/generated_plugin_registrant.cc @@ -0,0 +1,11 @@ +// +// Generated file. Do not edit. +// + +// clang-format off + +#include "generated_plugin_registrant.h" + + +void RegisterPlugins(flutter::PluginRegistry* registry) { +} diff --git a/xp_overlay_app/windows/flutter/generated_plugin_registrant.h b/xp_overlay_app/windows/flutter/generated_plugin_registrant.h new file mode 100644 index 0000000..dc139d8 --- /dev/null +++ b/xp_overlay_app/windows/flutter/generated_plugin_registrant.h @@ -0,0 +1,15 @@ +// +// Generated file. Do not edit. +// + +// clang-format off + +#ifndef GENERATED_PLUGIN_REGISTRANT_ +#define GENERATED_PLUGIN_REGISTRANT_ + +#include + +// Registers Flutter plugins. +void RegisterPlugins(flutter::PluginRegistry* registry); + +#endif // GENERATED_PLUGIN_REGISTRANT_ diff --git a/xp_overlay_app/windows/flutter/generated_plugins.cmake b/xp_overlay_app/windows/flutter/generated_plugins.cmake new file mode 100644 index 0000000..b93c4c3 --- /dev/null +++ b/xp_overlay_app/windows/flutter/generated_plugins.cmake @@ -0,0 +1,23 @@ +# +# Generated file, do not edit. +# + +list(APPEND FLUTTER_PLUGIN_LIST +) + +list(APPEND FLUTTER_FFI_PLUGIN_LIST +) + +set(PLUGIN_BUNDLED_LIBRARIES) + +foreach(plugin ${FLUTTER_PLUGIN_LIST}) + add_subdirectory(flutter/ephemeral/.plugin_symlinks/${plugin}/windows plugins/${plugin}) + target_link_libraries(${BINARY_NAME} PRIVATE ${plugin}_plugin) + list(APPEND PLUGIN_BUNDLED_LIBRARIES $) + list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${plugin}_bundled_libraries}) +endforeach(plugin) + +foreach(ffi_plugin ${FLUTTER_FFI_PLUGIN_LIST}) + add_subdirectory(flutter/ephemeral/.plugin_symlinks/${ffi_plugin}/windows plugins/${ffi_plugin}) + list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${ffi_plugin}_bundled_libraries}) +endforeach(ffi_plugin) diff --git a/xp_overlay_app/windows/runner/CMakeLists.txt b/xp_overlay_app/windows/runner/CMakeLists.txt new file mode 100644 index 0000000..394917c --- /dev/null +++ b/xp_overlay_app/windows/runner/CMakeLists.txt @@ -0,0 +1,40 @@ +cmake_minimum_required(VERSION 3.14) +project(runner LANGUAGES CXX) + +# Define the application target. To change its name, change BINARY_NAME in the +# top-level CMakeLists.txt, not the value here, or `flutter run` will no longer +# work. +# +# Any new source files that you add to the application should be added here. +add_executable(${BINARY_NAME} WIN32 + "flutter_window.cpp" + "main.cpp" + "utils.cpp" + "win32_window.cpp" + "${FLUTTER_MANAGED_DIR}/generated_plugin_registrant.cc" + "Runner.rc" + "runner.exe.manifest" +) + +# Apply the standard set of build settings. This can be removed for applications +# that need different build settings. +apply_standard_settings(${BINARY_NAME}) + +# Add preprocessor definitions for the build version. +target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION=\"${FLUTTER_VERSION}\"") +target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_MAJOR=${FLUTTER_VERSION_MAJOR}") +target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_MINOR=${FLUTTER_VERSION_MINOR}") +target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_PATCH=${FLUTTER_VERSION_PATCH}") +target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_BUILD=${FLUTTER_VERSION_BUILD}") + +# Disable Windows macros that collide with C++ standard library functions. +target_compile_definitions(${BINARY_NAME} PRIVATE "NOMINMAX") + +# Add dependency libraries and include directories. Add any application-specific +# dependencies here. +target_link_libraries(${BINARY_NAME} PRIVATE flutter flutter_wrapper_app) +target_link_libraries(${BINARY_NAME} PRIVATE "dwmapi.lib") +target_include_directories(${BINARY_NAME} PRIVATE "${CMAKE_SOURCE_DIR}") + +# Run the Flutter tool portions of the build. This must not be removed. +add_dependencies(${BINARY_NAME} flutter_assemble) diff --git a/xp_overlay_app/windows/runner/Runner.rc b/xp_overlay_app/windows/runner/Runner.rc new file mode 100644 index 0000000..f013072 --- /dev/null +++ b/xp_overlay_app/windows/runner/Runner.rc @@ -0,0 +1,121 @@ +// Microsoft Visual C++ generated resource script. +// +#pragma code_page(65001) +#include "resource.h" + +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#include "winres.h" + +///////////////////////////////////////////////////////////////////////////// +#undef APSTUDIO_READONLY_SYMBOLS + +///////////////////////////////////////////////////////////////////////////// +// English (United States) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE +BEGIN + "resource.h\0" +END + +2 TEXTINCLUDE +BEGIN + "#include ""winres.h""\r\n" + "\0" +END + +3 TEXTINCLUDE +BEGIN + "\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + + +///////////////////////////////////////////////////////////////////////////// +// +// Icon +// + +// Icon with lowest ID value placed first to ensure application icon +// remains consistent on all systems. +IDI_APP_ICON ICON "resources\\app_icon.ico" + + +///////////////////////////////////////////////////////////////////////////// +// +// Version +// + +#if defined(FLUTTER_VERSION_MAJOR) && defined(FLUTTER_VERSION_MINOR) && defined(FLUTTER_VERSION_PATCH) && defined(FLUTTER_VERSION_BUILD) +#define VERSION_AS_NUMBER FLUTTER_VERSION_MAJOR,FLUTTER_VERSION_MINOR,FLUTTER_VERSION_PATCH,FLUTTER_VERSION_BUILD +#else +#define VERSION_AS_NUMBER 1,0,0,0 +#endif + +#if defined(FLUTTER_VERSION) +#define VERSION_AS_STRING FLUTTER_VERSION +#else +#define VERSION_AS_STRING "1.0.0" +#endif + +VS_VERSION_INFO VERSIONINFO + FILEVERSION VERSION_AS_NUMBER + PRODUCTVERSION VERSION_AS_NUMBER + FILEFLAGSMASK VS_FFI_FILEFLAGSMASK +#ifdef _DEBUG + FILEFLAGS VS_FF_DEBUG +#else + FILEFLAGS 0x0L +#endif + FILEOS VOS__WINDOWS32 + FILETYPE VFT_APP + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904e4" + BEGIN + VALUE "CompanyName", "com.xpnix" "\0" + VALUE "FileDescription", "xp_overlay_app" "\0" + VALUE "FileVersion", VERSION_AS_STRING "\0" + VALUE "InternalName", "xp_overlay_app" "\0" + VALUE "LegalCopyright", "Copyright (C) 2025 com.xpnix. All rights reserved." "\0" + VALUE "OriginalFilename", "xp_overlay_app.exe" "\0" + VALUE "ProductName", "xp_overlay_app" "\0" + VALUE "ProductVersion", VERSION_AS_STRING "\0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1252 + END +END + +#endif // English (United States) resources +///////////////////////////////////////////////////////////////////////////// + + + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + + +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED diff --git a/xp_overlay_app/windows/runner/flutter_window.cpp b/xp_overlay_app/windows/runner/flutter_window.cpp new file mode 100644 index 0000000..955ee30 --- /dev/null +++ b/xp_overlay_app/windows/runner/flutter_window.cpp @@ -0,0 +1,71 @@ +#include "flutter_window.h" + +#include + +#include "flutter/generated_plugin_registrant.h" + +FlutterWindow::FlutterWindow(const flutter::DartProject& project) + : project_(project) {} + +FlutterWindow::~FlutterWindow() {} + +bool FlutterWindow::OnCreate() { + if (!Win32Window::OnCreate()) { + return false; + } + + RECT frame = GetClientArea(); + + // The size here must match the window dimensions to avoid unnecessary surface + // creation / destruction in the startup path. + flutter_controller_ = std::make_unique( + frame.right - frame.left, frame.bottom - frame.top, project_); + // Ensure that basic setup of the controller was successful. + if (!flutter_controller_->engine() || !flutter_controller_->view()) { + return false; + } + RegisterPlugins(flutter_controller_->engine()); + SetChildContent(flutter_controller_->view()->GetNativeWindow()); + + flutter_controller_->engine()->SetNextFrameCallback([&]() { + this->Show(); + }); + + // Flutter can complete the first frame before the "show window" callback is + // registered. The following call ensures a frame is pending to ensure the + // window is shown. It is a no-op if the first frame hasn't completed yet. + flutter_controller_->ForceRedraw(); + + return true; +} + +void FlutterWindow::OnDestroy() { + if (flutter_controller_) { + flutter_controller_ = nullptr; + } + + Win32Window::OnDestroy(); +} + +LRESULT +FlutterWindow::MessageHandler(HWND hwnd, UINT const message, + WPARAM const wparam, + LPARAM const lparam) noexcept { + // Give Flutter, including plugins, an opportunity to handle window messages. + if (flutter_controller_) { + std::optional result = + flutter_controller_->HandleTopLevelWindowProc(hwnd, message, wparam, + lparam); + if (result) { + return *result; + } + } + + switch (message) { + case WM_FONTCHANGE: + flutter_controller_->engine()->ReloadSystemFonts(); + break; + } + + return Win32Window::MessageHandler(hwnd, message, wparam, lparam); +} diff --git a/xp_overlay_app/windows/runner/flutter_window.h b/xp_overlay_app/windows/runner/flutter_window.h new file mode 100644 index 0000000..6da0652 --- /dev/null +++ b/xp_overlay_app/windows/runner/flutter_window.h @@ -0,0 +1,33 @@ +#ifndef RUNNER_FLUTTER_WINDOW_H_ +#define RUNNER_FLUTTER_WINDOW_H_ + +#include +#include + +#include + +#include "win32_window.h" + +// A window that does nothing but host a Flutter view. +class FlutterWindow : public Win32Window { + public: + // Creates a new FlutterWindow hosting a Flutter view running |project|. + explicit FlutterWindow(const flutter::DartProject& project); + virtual ~FlutterWindow(); + + protected: + // Win32Window: + bool OnCreate() override; + void OnDestroy() override; + LRESULT MessageHandler(HWND window, UINT const message, WPARAM const wparam, + LPARAM const lparam) noexcept override; + + private: + // The project to run. + flutter::DartProject project_; + + // The Flutter instance hosted by this window. + std::unique_ptr flutter_controller_; +}; + +#endif // RUNNER_FLUTTER_WINDOW_H_ diff --git a/xp_overlay_app/windows/runner/main.cpp b/xp_overlay_app/windows/runner/main.cpp new file mode 100644 index 0000000..d366db6 --- /dev/null +++ b/xp_overlay_app/windows/runner/main.cpp @@ -0,0 +1,43 @@ +#include +#include +#include + +#include "flutter_window.h" +#include "utils.h" + +int APIENTRY wWinMain(_In_ HINSTANCE instance, _In_opt_ HINSTANCE prev, + _In_ wchar_t *command_line, _In_ int show_command) { + // Attach to console when present (e.g., 'flutter run') or create a + // new console when running with a debugger. + if (!::AttachConsole(ATTACH_PARENT_PROCESS) && ::IsDebuggerPresent()) { + CreateAndAttachConsole(); + } + + // Initialize COM, so that it is available for use in the library and/or + // plugins. + ::CoInitializeEx(nullptr, COINIT_APARTMENTTHREADED); + + flutter::DartProject project(L"data"); + + std::vector command_line_arguments = + GetCommandLineArguments(); + + project.set_dart_entrypoint_arguments(std::move(command_line_arguments)); + + FlutterWindow window(project); + Win32Window::Point origin(10, 10); + Win32Window::Size size(1280, 720); + if (!window.Create(L"xp_overlay_app", origin, size)) { + return EXIT_FAILURE; + } + window.SetQuitOnClose(true); + + ::MSG msg; + while (::GetMessage(&msg, nullptr, 0, 0)) { + ::TranslateMessage(&msg); + ::DispatchMessage(&msg); + } + + ::CoUninitialize(); + return EXIT_SUCCESS; +} diff --git a/xp_overlay_app/windows/runner/resource.h b/xp_overlay_app/windows/runner/resource.h new file mode 100644 index 0000000..66a65d1 --- /dev/null +++ b/xp_overlay_app/windows/runner/resource.h @@ -0,0 +1,16 @@ +//{{NO_DEPENDENCIES}} +// Microsoft Visual C++ generated include file. +// Used by Runner.rc +// +#define IDI_APP_ICON 101 + +// Next default values for new objects +// +#ifdef APSTUDIO_INVOKED +#ifndef APSTUDIO_READONLY_SYMBOLS +#define _APS_NEXT_RESOURCE_VALUE 102 +#define _APS_NEXT_COMMAND_VALUE 40001 +#define _APS_NEXT_CONTROL_VALUE 1001 +#define _APS_NEXT_SYMED_VALUE 101 +#endif +#endif diff --git a/xp_overlay_app/windows/runner/resources/app_icon.ico b/xp_overlay_app/windows/runner/resources/app_icon.ico new file mode 100644 index 0000000..c04e20c Binary files /dev/null and b/xp_overlay_app/windows/runner/resources/app_icon.ico differ diff --git a/xp_overlay_app/windows/runner/runner.exe.manifest b/xp_overlay_app/windows/runner/runner.exe.manifest new file mode 100644 index 0000000..153653e --- /dev/null +++ b/xp_overlay_app/windows/runner/runner.exe.manifest @@ -0,0 +1,14 @@ + + + + + PerMonitorV2 + + + + + + + + + diff --git a/xp_overlay_app/windows/runner/utils.cpp b/xp_overlay_app/windows/runner/utils.cpp new file mode 100644 index 0000000..3a0b465 --- /dev/null +++ b/xp_overlay_app/windows/runner/utils.cpp @@ -0,0 +1,65 @@ +#include "utils.h" + +#include +#include +#include +#include + +#include + +void CreateAndAttachConsole() { + if (::AllocConsole()) { + FILE *unused; + if (freopen_s(&unused, "CONOUT$", "w", stdout)) { + _dup2(_fileno(stdout), 1); + } + if (freopen_s(&unused, "CONOUT$", "w", stderr)) { + _dup2(_fileno(stdout), 2); + } + std::ios::sync_with_stdio(); + FlutterDesktopResyncOutputStreams(); + } +} + +std::vector GetCommandLineArguments() { + // Convert the UTF-16 command line arguments to UTF-8 for the Engine to use. + int argc; + wchar_t** argv = ::CommandLineToArgvW(::GetCommandLineW(), &argc); + if (argv == nullptr) { + return std::vector(); + } + + std::vector command_line_arguments; + + // Skip the first argument as it's the binary name. + for (int i = 1; i < argc; i++) { + command_line_arguments.push_back(Utf8FromUtf16(argv[i])); + } + + ::LocalFree(argv); + + return command_line_arguments; +} + +std::string Utf8FromUtf16(const wchar_t* utf16_string) { + if (utf16_string == nullptr) { + return std::string(); + } + unsigned int target_length = ::WideCharToMultiByte( + CP_UTF8, WC_ERR_INVALID_CHARS, utf16_string, + -1, nullptr, 0, nullptr, nullptr) + -1; // remove the trailing null character + int input_length = (int)wcslen(utf16_string); + std::string utf8_string; + if (target_length == 0 || target_length > utf8_string.max_size()) { + return utf8_string; + } + utf8_string.resize(target_length); + int converted_length = ::WideCharToMultiByte( + CP_UTF8, WC_ERR_INVALID_CHARS, utf16_string, + input_length, utf8_string.data(), target_length, nullptr, nullptr); + if (converted_length == 0) { + return std::string(); + } + return utf8_string; +} diff --git a/xp_overlay_app/windows/runner/utils.h b/xp_overlay_app/windows/runner/utils.h new file mode 100644 index 0000000..3879d54 --- /dev/null +++ b/xp_overlay_app/windows/runner/utils.h @@ -0,0 +1,19 @@ +#ifndef RUNNER_UTILS_H_ +#define RUNNER_UTILS_H_ + +#include +#include + +// Creates a console for the process, and redirects stdout and stderr to +// it for both the runner and the Flutter library. +void CreateAndAttachConsole(); + +// Takes a null-terminated wchar_t* encoded in UTF-16 and returns a std::string +// encoded in UTF-8. Returns an empty std::string on failure. +std::string Utf8FromUtf16(const wchar_t* utf16_string); + +// Gets the command line arguments passed in as a std::vector, +// encoded in UTF-8. Returns an empty std::vector on failure. +std::vector GetCommandLineArguments(); + +#endif // RUNNER_UTILS_H_ diff --git a/xp_overlay_app/windows/runner/win32_window.cpp b/xp_overlay_app/windows/runner/win32_window.cpp new file mode 100644 index 0000000..60608d0 --- /dev/null +++ b/xp_overlay_app/windows/runner/win32_window.cpp @@ -0,0 +1,288 @@ +#include "win32_window.h" + +#include +#include + +#include "resource.h" + +namespace { + +/// Window attribute that enables dark mode window decorations. +/// +/// Redefined in case the developer's machine has a Windows SDK older than +/// version 10.0.22000.0. +/// See: https://docs.microsoft.com/windows/win32/api/dwmapi/ne-dwmapi-dwmwindowattribute +#ifndef DWMWA_USE_IMMERSIVE_DARK_MODE +#define DWMWA_USE_IMMERSIVE_DARK_MODE 20 +#endif + +constexpr const wchar_t kWindowClassName[] = L"FLUTTER_RUNNER_WIN32_WINDOW"; + +/// Registry key for app theme preference. +/// +/// A value of 0 indicates apps should use dark mode. A non-zero or missing +/// value indicates apps should use light mode. +constexpr const wchar_t kGetPreferredBrightnessRegKey[] = + L"Software\\Microsoft\\Windows\\CurrentVersion\\Themes\\Personalize"; +constexpr const wchar_t kGetPreferredBrightnessRegValue[] = L"AppsUseLightTheme"; + +// The number of Win32Window objects that currently exist. +static int g_active_window_count = 0; + +using EnableNonClientDpiScaling = BOOL __stdcall(HWND hwnd); + +// Scale helper to convert logical scaler values to physical using passed in +// scale factor +int Scale(int source, double scale_factor) { + return static_cast(source * scale_factor); +} + +// Dynamically loads the |EnableNonClientDpiScaling| from the User32 module. +// This API is only needed for PerMonitor V1 awareness mode. +void EnableFullDpiSupportIfAvailable(HWND hwnd) { + HMODULE user32_module = LoadLibraryA("User32.dll"); + if (!user32_module) { + return; + } + auto enable_non_client_dpi_scaling = + reinterpret_cast( + GetProcAddress(user32_module, "EnableNonClientDpiScaling")); + if (enable_non_client_dpi_scaling != nullptr) { + enable_non_client_dpi_scaling(hwnd); + } + FreeLibrary(user32_module); +} + +} // namespace + +// Manages the Win32Window's window class registration. +class WindowClassRegistrar { + public: + ~WindowClassRegistrar() = default; + + // Returns the singleton registrar instance. + static WindowClassRegistrar* GetInstance() { + if (!instance_) { + instance_ = new WindowClassRegistrar(); + } + return instance_; + } + + // Returns the name of the window class, registering the class if it hasn't + // previously been registered. + const wchar_t* GetWindowClass(); + + // Unregisters the window class. Should only be called if there are no + // instances of the window. + void UnregisterWindowClass(); + + private: + WindowClassRegistrar() = default; + + static WindowClassRegistrar* instance_; + + bool class_registered_ = false; +}; + +WindowClassRegistrar* WindowClassRegistrar::instance_ = nullptr; + +const wchar_t* WindowClassRegistrar::GetWindowClass() { + if (!class_registered_) { + WNDCLASS window_class{}; + window_class.hCursor = LoadCursor(nullptr, IDC_ARROW); + window_class.lpszClassName = kWindowClassName; + window_class.style = CS_HREDRAW | CS_VREDRAW; + window_class.cbClsExtra = 0; + window_class.cbWndExtra = 0; + window_class.hInstance = GetModuleHandle(nullptr); + window_class.hIcon = + LoadIcon(window_class.hInstance, MAKEINTRESOURCE(IDI_APP_ICON)); + window_class.hbrBackground = 0; + window_class.lpszMenuName = nullptr; + window_class.lpfnWndProc = Win32Window::WndProc; + RegisterClass(&window_class); + class_registered_ = true; + } + return kWindowClassName; +} + +void WindowClassRegistrar::UnregisterWindowClass() { + UnregisterClass(kWindowClassName, nullptr); + class_registered_ = false; +} + +Win32Window::Win32Window() { + ++g_active_window_count; +} + +Win32Window::~Win32Window() { + --g_active_window_count; + Destroy(); +} + +bool Win32Window::Create(const std::wstring& title, + const Point& origin, + const Size& size) { + Destroy(); + + const wchar_t* window_class = + WindowClassRegistrar::GetInstance()->GetWindowClass(); + + const POINT target_point = {static_cast(origin.x), + static_cast(origin.y)}; + HMONITOR monitor = MonitorFromPoint(target_point, MONITOR_DEFAULTTONEAREST); + UINT dpi = FlutterDesktopGetDpiForMonitor(monitor); + double scale_factor = dpi / 96.0; + + HWND window = CreateWindow( + window_class, title.c_str(), WS_OVERLAPPEDWINDOW, + Scale(origin.x, scale_factor), Scale(origin.y, scale_factor), + Scale(size.width, scale_factor), Scale(size.height, scale_factor), + nullptr, nullptr, GetModuleHandle(nullptr), this); + + if (!window) { + return false; + } + + UpdateTheme(window); + + return OnCreate(); +} + +bool Win32Window::Show() { + return ShowWindow(window_handle_, SW_SHOWNORMAL); +} + +// static +LRESULT CALLBACK Win32Window::WndProc(HWND const window, + UINT const message, + WPARAM const wparam, + LPARAM const lparam) noexcept { + if (message == WM_NCCREATE) { + auto window_struct = reinterpret_cast(lparam); + SetWindowLongPtr(window, GWLP_USERDATA, + reinterpret_cast(window_struct->lpCreateParams)); + + auto that = static_cast(window_struct->lpCreateParams); + EnableFullDpiSupportIfAvailable(window); + that->window_handle_ = window; + } else if (Win32Window* that = GetThisFromHandle(window)) { + return that->MessageHandler(window, message, wparam, lparam); + } + + return DefWindowProc(window, message, wparam, lparam); +} + +LRESULT +Win32Window::MessageHandler(HWND hwnd, + UINT const message, + WPARAM const wparam, + LPARAM const lparam) noexcept { + switch (message) { + case WM_DESTROY: + window_handle_ = nullptr; + Destroy(); + if (quit_on_close_) { + PostQuitMessage(0); + } + return 0; + + case WM_DPICHANGED: { + auto newRectSize = reinterpret_cast(lparam); + LONG newWidth = newRectSize->right - newRectSize->left; + LONG newHeight = newRectSize->bottom - newRectSize->top; + + SetWindowPos(hwnd, nullptr, newRectSize->left, newRectSize->top, newWidth, + newHeight, SWP_NOZORDER | SWP_NOACTIVATE); + + return 0; + } + case WM_SIZE: { + RECT rect = GetClientArea(); + if (child_content_ != nullptr) { + // Size and position the child window. + MoveWindow(child_content_, rect.left, rect.top, rect.right - rect.left, + rect.bottom - rect.top, TRUE); + } + return 0; + } + + case WM_ACTIVATE: + if (child_content_ != nullptr) { + SetFocus(child_content_); + } + return 0; + + case WM_DWMCOLORIZATIONCOLORCHANGED: + UpdateTheme(hwnd); + return 0; + } + + return DefWindowProc(window_handle_, message, wparam, lparam); +} + +void Win32Window::Destroy() { + OnDestroy(); + + if (window_handle_) { + DestroyWindow(window_handle_); + window_handle_ = nullptr; + } + if (g_active_window_count == 0) { + WindowClassRegistrar::GetInstance()->UnregisterWindowClass(); + } +} + +Win32Window* Win32Window::GetThisFromHandle(HWND const window) noexcept { + return reinterpret_cast( + GetWindowLongPtr(window, GWLP_USERDATA)); +} + +void Win32Window::SetChildContent(HWND content) { + child_content_ = content; + SetParent(content, window_handle_); + RECT frame = GetClientArea(); + + MoveWindow(content, frame.left, frame.top, frame.right - frame.left, + frame.bottom - frame.top, true); + + SetFocus(child_content_); +} + +RECT Win32Window::GetClientArea() { + RECT frame; + GetClientRect(window_handle_, &frame); + return frame; +} + +HWND Win32Window::GetHandle() { + return window_handle_; +} + +void Win32Window::SetQuitOnClose(bool quit_on_close) { + quit_on_close_ = quit_on_close; +} + +bool Win32Window::OnCreate() { + // No-op; provided for subclasses. + return true; +} + +void Win32Window::OnDestroy() { + // No-op; provided for subclasses. +} + +void Win32Window::UpdateTheme(HWND const window) { + DWORD light_mode; + DWORD light_mode_size = sizeof(light_mode); + LSTATUS result = RegGetValue(HKEY_CURRENT_USER, kGetPreferredBrightnessRegKey, + kGetPreferredBrightnessRegValue, + RRF_RT_REG_DWORD, nullptr, &light_mode, + &light_mode_size); + + if (result == ERROR_SUCCESS) { + BOOL enable_dark_mode = light_mode == 0; + DwmSetWindowAttribute(window, DWMWA_USE_IMMERSIVE_DARK_MODE, + &enable_dark_mode, sizeof(enable_dark_mode)); + } +} diff --git a/xp_overlay_app/windows/runner/win32_window.h b/xp_overlay_app/windows/runner/win32_window.h new file mode 100644 index 0000000..e901dde --- /dev/null +++ b/xp_overlay_app/windows/runner/win32_window.h @@ -0,0 +1,102 @@ +#ifndef RUNNER_WIN32_WINDOW_H_ +#define RUNNER_WIN32_WINDOW_H_ + +#include + +#include +#include +#include + +// A class abstraction for a high DPI-aware Win32 Window. Intended to be +// inherited from by classes that wish to specialize with custom +// rendering and input handling +class Win32Window { + public: + struct Point { + unsigned int x; + unsigned int y; + Point(unsigned int x, unsigned int y) : x(x), y(y) {} + }; + + struct Size { + unsigned int width; + unsigned int height; + Size(unsigned int width, unsigned int height) + : width(width), height(height) {} + }; + + Win32Window(); + virtual ~Win32Window(); + + // Creates a win32 window with |title| that is positioned and sized using + // |origin| and |size|. New windows are created on the default monitor. Window + // sizes are specified to the OS in physical pixels, hence to ensure a + // consistent size this function will scale the inputted width and height as + // as appropriate for the default monitor. The window is invisible until + // |Show| is called. Returns true if the window was created successfully. + bool Create(const std::wstring& title, const Point& origin, const Size& size); + + // Show the current window. Returns true if the window was successfully shown. + bool Show(); + + // Release OS resources associated with window. + void Destroy(); + + // Inserts |content| into the window tree. + void SetChildContent(HWND content); + + // Returns the backing Window handle to enable clients to set icon and other + // window properties. Returns nullptr if the window has been destroyed. + HWND GetHandle(); + + // If true, closing this window will quit the application. + void SetQuitOnClose(bool quit_on_close); + + // Return a RECT representing the bounds of the current client area. + RECT GetClientArea(); + + protected: + // Processes and route salient window messages for mouse handling, + // size change and DPI. Delegates handling of these to member overloads that + // inheriting classes can handle. + virtual LRESULT MessageHandler(HWND window, + UINT const message, + WPARAM const wparam, + LPARAM const lparam) noexcept; + + // Called when CreateAndShow is called, allowing subclass window-related + // setup. Subclasses should return false if setup fails. + virtual bool OnCreate(); + + // Called when Destroy is called. + virtual void OnDestroy(); + + private: + friend class WindowClassRegistrar; + + // OS callback called by message pump. Handles the WM_NCCREATE message which + // is passed when the non-client area is being created and enables automatic + // non-client DPI scaling so that the non-client area automatically + // responds to changes in DPI. All other messages are handled by + // MessageHandler. + static LRESULT CALLBACK WndProc(HWND const window, + UINT const message, + WPARAM const wparam, + LPARAM const lparam) noexcept; + + // Retrieves a class instance pointer for |window| + static Win32Window* GetThisFromHandle(HWND const window) noexcept; + + // Update the window frame's theme to match the system theme. + static void UpdateTheme(HWND const window); + + bool quit_on_close_ = false; + + // window handle for top level window. + HWND window_handle_ = nullptr; + + // window handle for hosted content. + HWND child_content_ = nullptr; +}; + +#endif // RUNNER_WIN32_WINDOW_H_ diff --git a/xp_server/.claude/settings.json b/xp_server/.claude/settings.json new file mode 100644 index 0000000..e7b381b --- /dev/null +++ b/xp_server/.claude/settings.json @@ -0,0 +1,9 @@ +{ + "permissions": { + "allow": [ + "dart", + "flutter" + ], + "deny": [] + } +} \ No newline at end of file diff --git a/xp_server/CLAUDE.md b/xp_server/CLAUDE.md index 13c48cd..feeee38 100644 --- a/xp_server/CLAUDE.md +++ b/xp_server/CLAUDE.md @@ -2,75 +2,277 @@ This file provides guidance to Claude Code (claude.ai/code) when working with code in this repository. +## Project Overview + +XP Nix is a productivity tracking and gamification system designed for Linux desktop environments, supporting both +Hyprland and Sway window managers. It transforms daily computer usage into a gamified experience by monitoring +activity patterns and providing real-time feedback through an XP (experience points) system. + +### Window Manager Support + +**Hyprland**: Full feature support including visual desktop enhancements, idle monitoring, and activity detection +**Sway**: Core functionality with idle monitoring and activity detection (visual enhancements disabled by design) +**Detection**: Automatic runtime detection via environment variables (`HYPRLAND_INSTANCE_SIGNATURE`, `SWAYSOCK`) + ## Commands ### Development -- `dart run bin/xp_nix.dart` - Run the main application -- `dart test` - Run all tests +- `dart run bin/xp_nix.dart` - Run the main application server +- `dart run bin/xp_nix.dart --help` - Show command line options +- `dart run bin/xp_nix.dart --db custom.db --port 8081` - Run with custom database and port +- `dart test` - Run all tests - `dart test test/specific_test.dart` - Run a specific test file -- `dart analyze` - Run static analysis +- `dart analyze` - Run static analysis and linting - `dart pub get` - Install dependencies -- `nix develop` - Enter development environment with Dart and SQLite + +### Interactive Commands (while running) +Once the server is running, these commands are available in the terminal: +- `stats` - Show current productivity stats +- `test [level]` - Test theme for specific level +- `restore` - Restore desktop backup +- `refresh` - Refresh base config from current system config +- `build` - Build Flutter dashboard and copy to static files +- `help` - Show available commands ### Nix Environment -This project uses Nix flakes for development environment management. The flake provides Dart SDK and SQLite with proper library paths configured. +This project uses Nix flakes for development environment management. The flake provides Dart SDK and SQLite with proper library paths configured: +- `nix develop` - Enter development environment with Dart and SQLite ## Architecture Overview -### Dependency Injection & Testing -The codebase uses dependency injection through interfaces to enable both production and testing modes: - -- **Interfaces** (`lib/src/interfaces/`): Define contracts for core components - - `IActivityDetector` - Window/application activity detection - - `IIdleMonitor` - User idle state monitoring - - `IDesktopEnhancer` - Desktop theme/visual enhancements - - `ITimeProvider` - Time operations (for testing time manipulation) - -- **Production Implementations**: Real system integrations (Hyprland, system time) -- **Test Mocks** (`lib/src/testing/`): Controllable implementations for testing - ### Core Components -**ProductivityMonitor** - Central orchestrator that: +**ProductivityMonitor** (`lib/src/monitors/productivity_monitor.dart`) - Central orchestrator that: - Coordinates activity detection, idle monitoring, and desktop enhancement - Calculates XP rewards based on activity types and time multipliers - Manages level progression and achievement system -- Handles both event-driven (via IActivityDetector) and polling modes +- Supports both event-driven (via IActivityDetector) and legacy polling modes +- Broadcasts updates via WebSocket for real-time dashboard updates -**Activity Classification System**: -- Uses `ActivityEventType` enum for categorizing activities (coding, meetings, etc.) -- Supports user-defined application classifications stored in database -- Fallback categorization based on application names and window titles +**DashboardServer** (`lib/src/web/dashboard_server.dart`) - Web server providing: +- RESTful API endpoints for stats, achievements, activities, and configuration +- Real-time WebSocket connections for live updates +- Serves Flutter-built dashboard from static files +- Configurable port (default: 8080) -**XP & Gamification**: -- Time-based multipliers for deep work hours vs late night penalty -- Focus session bonuses with milestone rewards (60min, 120min, 180min) -- Level-based visual themes applied via desktop enhancer -- Achievement system with level, focus, and session-based rewards - -### Database Schema -SQLite database with tables for: -- Daily stats (XP, focus time, meeting time, level) +**DatabaseManager** (`lib/src/database/database_manager.dart`) - SQLite database operations for: +- Daily stats tracking (XP, focus time, meeting time, level) - Activity events with duration and metadata - Application classifications (user-defined) - Achievements and focus sessions - Theme change history and streak tracking -### Configuration -JSON-based configuration (`config/xp_config.json`) defines: -- XP multipliers by activity type and time of day -- Achievement definitions and rewards -- Focus session bonus structure -- Monitoring intervals and thresholds +### Dependency Injection & Testing -### Web Dashboard -Built-in web server (`lib/src/web/`) provides real-time dashboard at http://localhost:8080 showing stats, recent activities, and progress visualization. +The codebase uses dependency injection through interfaces to enable both production and testing modes: + +**Interfaces** (`lib/src/interfaces/`): +- `IActivityDetector` - Window/application activity detection +- `IIdleMonitor` - User idle state monitoring +- `IDesktopEnhancer` - Desktop theme/visual enhancements +- `ITimeProvider` - Time operations (for testing time manipulation) +- `IWindowManager` - Window manager operations abstraction + +**Hyprland Implementations**: +- `HyprlandActivityDetector` - Uses `hyprctl activewindow` for activity detection +- `IdleMonitor` - Uses `hypridle` for idle state monitoring +- `HyprlandEnhancer` - Full desktop theming and visual enhancements +- `HyprlandManager` - Window manager operations via `hyprctl` + +**Sway Implementations**: +- `SwayActivityDetector` - Uses `swaymsg -t get_tree` for activity detection +- `SwayIdleMonitor` - Uses `swayidle` for idle state monitoring +- `SwayEnhancer` - Notifications-only enhancer (no visual changes) +- `SwayManager` - Window manager operations via `swaymsg` + +**Factory Classes** (`lib/src/factories/`): +- `IdleMonitorFactory` - Creates appropriate idle monitor for detected window manager +- `ActivityDetectorFactory` - Creates appropriate activity detector for detected window manager +- `DesktopEnhancerFactory` - Creates appropriate enhancer for detected window manager +- `WindowManagerFactory` - Creates appropriate window manager interface + +**Test Mocks** (`lib/src/testing/`): +- `MockActivityDetector` - Controllable activity simulation +- `MockIdleMonitor` - Controllable idle state simulation +- `MockDesktopEnhancer` - No-op desktop enhancement for testing +- `MockTimeProvider` - Controllable time for testing +- `MockWindowManagerDetector` - Test scenarios for different window managers + +### Activity Classification System + +**ActivityEventType** enum categorizes activities: +- `coding` - Development work (10 XP/min base) +- `focusedBrowsing` - Research and documentation (6 XP/min base) +- `collaboration` - Team communication (7 XP/min base) +- `meetings` - Video conferences and calls (3 XP/min base) +- `misc` - General productivity (2 XP/min base) +- `uncategorized` - Unknown activities (1 XP/min base) + +**Classification Logic**: +- Uses user-defined application classifications stored in database +- Fallback categorization based on application names and window titles +- Tracks unclassified applications for manual categorization + +### XP & Gamification System + +**XP Calculation**: +- Base XP per minute varies by activity type +- Time-based multipliers from configuration: + - Deep work hours (1.5x): 09:00-11:00, 14:00-16:00 + - Late night penalty (0.8x): 22:00-06:00 +- Focus session bonuses: 60min (+100 XP), 120min (+200 XP), 180min (+500 XP) + +**Level System**: +- 100 XP per level progression +- Visual desktop themes applied at different levels +- Achievement system with level, focus, and session-based rewards + +**Achievements**: +- Level-based: Rising Star (L5), Productivity Warrior (L10), Focus Master (L15), Legendary Achiever (L25) +- Focus-based: Deep Focus (4h), Focus Titan (8h) +- Session-based: Session Master (5+ sessions) +- Meeting-based: Communication Pro (3h meetings) + +### Configuration Management + +**ConfigManager** (`lib/src/config/config_manager.dart`): +- Loads from `config/xp_config.json` +- Manages XP multipliers, achievement definitions, focus bonuses +- Supports runtime configuration updates via web API + +**Key Configuration Sections**: +- `xp_rewards` - Base multipliers and time-based modifiers +- `achievements` - Achievement definitions and rewards +- `level_system` - XP per level and max level +- `monitoring` - Polling intervals and thresholds +- `logging` - Log levels and file management + +### Web Dashboard & API + +**Dashboard Features**: +- Real-time stats display with WebSocket updates +- Activity timeline and XP breakdown charts +- Achievement gallery and progress tracking +- Application classification management +- Configuration editor +- Log viewer with filtering + +**API Endpoints**: +- `GET /api/stats` - Current day statistics +- `GET /api/stats/history?days=7` - Historical stats +- `GET /api/achievements` - All achievements +- `GET /api/activities?limit=100` - Recent activities +- `GET /api/focus-sessions` - Focus session history +- `GET /api/xp-breakdown` - XP breakdown by activity type +- `GET /api/classifications` - Application classifications +- `POST /api/classifications` - Save application classification +- `GET /api/config` - Current configuration +- `POST /api/config` - Update configuration + +**WebSocket Events**: +- `level_up` - Level progression notifications +- `achievement_unlocked` - Achievement notifications +- `stats_update` - Real-time stats updates +- `xp_breakdown_update` - XP distribution updates +- `focus_session_complete` - Focus session completions + +### Flutter Dashboard Build System + +**DashboardBuilder** (`lib/src/build/dashboard_builder.dart`): +- Builds Flutter dashboard from `../xp_dashboard` directory +- Copies built web files to `lib/src/web/static/` +- Accessible via `build` command while server is running +- Requires Flutter to be available in system PATH ## Testing Strategy -The architecture supports comprehensive testing through: -- Interface-based dependency injection -- Time manipulation via `ITimeProvider` -- Mock implementations that simulate user behavior -- Simulation tests that model complete work days -- Integration tests for idle detection and activity consolidation \ No newline at end of file +### Test Structure +- **Unit Tests**: Individual component testing with mocks +- **Integration Tests**: WebSocket and database integration +- **Simulation Tests**: Complete work day scenarios +- **Configuration Tests**: Hyprland config parsing + +### Key Test Files +- `test/xp_nix_test.dart` - Main productivity monitor tests +- `test/websocket_integration_test.dart` - WebSocket functionality +- `test/simulation/` - Work day simulation scenarios +- `test/deep_idle_test.dart` - Idle detection edge cases +- `test/hyprland_config_parser_test.dart` - Configuration parsing +- `test/sway_integration_test.dart` - Sway window manager integration tests + +### Testing Utilities +- `test/create_golden_db.dart` - Creates test database with sample data +- Time manipulation via `MockTimeProvider` for deterministic testing +- Activity simulation via `MockActivityDetector` for scenario testing + +## System Requirements & Compatibility + +### Window Manager Requirements + +**Hyprland Environment**: +- `hyprctl` - Window management and querying +- `hypridle` - Idle detection and monitoring +- Environment: `$HYPRLAND_INSTANCE_SIGNATURE` must be set + +**Sway Environment**: +- `swaymsg` - Window management and querying +- `swayidle` - Idle detection and monitoring +- Environment: `$SWAYSOCK` must be set + +**Optional Dependencies**: +- `notify-send` - Desktop notifications (both window managers) +- `mako` or `dunst` - Enhanced notification daemons (Sway) + +### Feature Comparison + +| Feature | Hyprland | Sway | Notes | +|---------|----------|------|-------| +| Activity Detection | ✅ | ✅ | Uses `hyprctl` vs `swaymsg` | +| Idle Monitoring | ✅ | ✅ | Uses `hypridle` vs `swayidle` | +| Visual Enhancements | ✅ | ❌ | Disabled by design for Sway | +| Desktop Theming | ✅ | ❌ | Config modifications disabled | +| Notifications | ✅ | ✅ | Level-up and achievement alerts | +| WebSocket API | ✅ | ✅ | Full dashboard functionality | +| Database Tracking | ✅ | ✅ | Identical functionality | + +### Runtime Detection + +The system automatically detects your window manager at startup: + +1. **Environment Variables**: Checks `$HYPRLAND_INSTANCE_SIGNATURE` and `$SWAYSOCK` +2. **Process Detection**: Falls back to checking available commands +3. **Graceful Degradation**: Uses appropriate implementations or fallbacks + +## Development Workflow + +### Initial Setup +1. `dart pub get` - Install dependencies +2. `dart run bin/xp_nix.dart` - Start server (auto-detects window manager) +3. Visit `http://localhost:8080` for dashboard + +### Making Changes +1. Run tests: `dart test` +2. Check analysis: `dart analyze` +3. Test with custom database: `dart run bin/xp_nix.dart --db test.db` +4. Build dashboard: Use `build` command at runtime command `flutter build web` in `../xp_dashboard` + +### Configuration Changes +- Edit `config/xp_config.json` for XP rules and achievements +- Use `refresh` command to reload configuration +- Test theme changes with `test [level]` command +- Use `restore` command if desktop theme issues occur + +## Roadmap Integration + +The project roadmap includes ambitious enhancements: +- **Cursor-following XP numbers** - RPG-style floating damage numbers +- **Dual currency shop system** - XP points and real-world reward tokens +- **Enhanced celebrations** - Full-screen level-up animations +- **Environmental feedback** - Focus-based ambient changes +- **Real-world purchase integration** - Automated reward fulfillment + +Current architecture supports these extensions through: +- Modular desktop enhancement system +- Extensible notification framework +- Configurable reward and achievement system +- Database schema designed for expansion diff --git a/xp_server/bin/xp_nix.dart b/xp_server/bin/xp_nix.dart index 1ee0dcf..fbc0d3b 100644 --- a/xp_server/bin/xp_nix.dart +++ b/xp_server/bin/xp_nix.dart @@ -7,15 +7,23 @@ import 'package:xp_nix/src/config/config_manager.dart'; import 'package:xp_nix/src/logging/logger.dart'; import 'package:xp_nix/src/web/dashboard_server.dart'; import 'package:xp_nix/src/database/database_manager.dart'; -import 'package:xp_nix/src/detectors/idle_monitor.dart'; import 'package:xp_nix/src/providers/system_time_provider.dart'; -import 'package:xp_nix/src/enhancers/hyprland_enhancer.dart'; import 'package:xp_nix/src/build/dashboard_builder.dart'; +// Window manager detection and factories +import 'package:xp_nix/src/detectors/window_manager_detector.dart'; +import 'package:xp_nix/src/factories/idle_monitor_factory.dart'; +import 'package:xp_nix/src/factories/activity_detector_factory.dart'; +import 'package:xp_nix/src/factories/desktop_enhancer_factory.dart'; +// Interfaces +import 'package:xp_nix/src/interfaces/i_idle_monitor.dart'; +import 'package:xp_nix/src/interfaces/i_activity_detector.dart'; +import 'package:xp_nix/src/interfaces/i_desktop_enhancer.dart'; late final Database _db; -late final IdleMonitor _idleMonitor; +late final IIdleMonitor _idleMonitor; late final SystemTimeProvider _timeProvider; -late final HyprlandEnhancer _desktopEnhancer; +late final IDesktopEnhancer _desktopEnhancer; +late final IActivityDetector? _activityDetector; late final ProductivityMonitor _monitor; late final DashboardServer _dashboardServer; @@ -48,7 +56,10 @@ void main(List args) async { case '--help': case '-h': print(''' -XP Nix Server +XP Nix Server - Productivity Tracking with Gamification + +A productivity tracking system that works with both Hyprland and Sway window managers. +Automatically detects your environment and adapts functionality accordingly. Usage: dart xp_nix.dart [options] @@ -57,9 +68,18 @@ Options: --port PORT Server port (default: 8080) --help, -h Show this help message +Supported Window Managers: + • Hyprland: Full visual effects, idle monitoring, activity detection + • Sway: Activity detection, idle monitoring (no visual effects) + • Detection: Automatic via environment variables + Examples: dart xp_nix.dart dart xp_nix.dart --db test_data.db --port 8081 + +Requirements: + • Hyprland: hypridle, hyprctl + • Sway: swayidle, swaymsg '''); exit(0); } @@ -74,12 +94,54 @@ Examples: // Initialize configuration manager await ConfigManager.instance.initialize(); + // Detect window manager and display information + final windowManager = WindowManagerDetector.instance.detect(); + final detectionInfo = WindowManagerDetector.instance.getDetectionInfo(); + + print('🖼️ Detected window manager: ${windowManager.toString()}'); + print(' Detection method: ${detectionInfo['detection_method']}'); + + // Log additional environment info + Logger.info('Window manager detection: $detectionInfo'); + _db = sqlite3.open(dbPath); - // Create production dependencies - _idleMonitor = IdleMonitor(); - _timeProvider = SystemTimeProvider(); - _desktopEnhancer = HyprlandEnhancer(); + // Create window manager-specific dependencies using factories + try { + _idleMonitor = IdleMonitorFactory.create(windowManager); + _desktopEnhancer = DesktopEnhancerFactory.create(windowManager); + _activityDetector = ActivityDetectorFactory.create(windowManager); + _timeProvider = SystemTimeProvider(); + + // Validate requirements for the detected window manager + final idleSupported = await IdleMonitorFactory.validateRequirements(windowManager); + final activitySupported = await ActivityDetectorFactory.validateRequirements(windowManager); + final enhancerSupported = await DesktopEnhancerFactory.validateRequirements(windowManager); + + print('💡 Component availability:'); + print(' Idle monitoring: ${idleSupported ? '✅' : '❌'}'); + print(' Activity detection: ${activitySupported ? '✅' : '❌'}'); + print(' Visual enhancements: ${enhancerSupported ? '✅' : '❌'}'); + + if (!idleSupported) { + print(' ⚠️ Idle monitoring may not work properly'); + } + if (!activitySupported) { + print(' ⚠️ Activity detection will fall back to legacy polling'); + } + if (!enhancerSupported) { + print(' ⚠️ Visual enhancements may be limited'); + } + + } catch (e) { + print('❌ Error creating window manager components: $e'); + print(' Falling back to legacy mode...'); + + // Fallback to original Hyprland implementations (import at top of file) + // Note: This requires adding imports back if needed + Logger.error('Component creation failed, falling back to legacy mode: $e'); + exit(1); // For now, exit on component creation failure + } // Create monitor with dependency injection _monitor = ProductivityMonitor( @@ -87,7 +149,7 @@ Examples: idleMonitor: _idleMonitor, timeProvider: _timeProvider, desktopEnhancer: _desktopEnhancer, - // No activity detector provided - will use legacy polling mode + activityDetector: _activityDetector, // May be null for fallback to legacy polling ); _dashboardServer = DashboardServer.withDatabase(DatabaseManager(_db)); diff --git a/xp_server/lib/src/detectors/sway_activity_detector.dart b/xp_server/lib/src/detectors/sway_activity_detector.dart new file mode 100644 index 0000000..385001a --- /dev/null +++ b/xp_server/lib/src/detectors/sway_activity_detector.dart @@ -0,0 +1,223 @@ +import 'dart:async'; +import 'dart:convert'; +import 'dart:io'; +import '../interfaces/i_activity_detector.dart'; +import '../models/activity_event.dart'; + +/// Sway-specific activity detector that polls the focused window +class SwayActivityDetector implements IActivityDetector { + final StreamController _activityController = StreamController.broadcast(); + Timer? _pollTimer; + String? _lastActiveWindow; + String? _lastActiveWindowTitle; + DateTime? _lastActivityTime; + bool _isRunning = false; + + @override + Stream get activityStream => _activityController.stream; + + @override + Future start() async { + if (_isRunning) return; + + _isRunning = true; + _pollTimer = Timer.periodic(Duration(seconds: 5), (_) => _pollActivity()); + print('🔍 Started Sway activity detection...'); + } + + @override + void stop() { + _isRunning = false; + _pollTimer?.cancel(); + _pollTimer = null; + + // Flush any remaining activity + if (_lastActiveWindow != null && _lastActivityTime != null) { + final duration = DateTime.now().difference(_lastActivityTime!).inSeconds; + if (duration >= 10) { + _emitActivityEvent(_lastActiveWindow!, _lastActiveWindowTitle ?? '', duration); + } + } + + _activityController.close(); + print('🛑 Stopped Sway activity detection'); + } + + Future _pollActivity() async { + try { + final result = await Process.run('swaymsg', ['-t', 'get_tree']); + if (result.exitCode != 0) { + print('Warning: swaymsg get_tree failed with exit code ${result.exitCode}'); + return; + } + + final treeData = jsonDecode(result.stdout); + final focusedNode = _findFocusedNode(treeData); + + if (focusedNode == null) { + // No focused window found + return; + } + + final currentApp = _extractAppId(focusedNode); + final currentWindowTitle = _extractWindowTitle(focusedNode); + final now = DateTime.now(); + + // If this is a different activity from the last one, emit the previous activity + if (_lastActiveWindow != null && + (_lastActiveWindow != currentApp || _lastActiveWindowTitle != currentWindowTitle)) { + final duration = now.difference(_lastActivityTime ?? now).inSeconds; + if (duration >= 10) { + _emitActivityEvent(_lastActiveWindow!, _lastActiveWindowTitle ?? '', duration); + } + } + + // Update current activity + _lastActiveWindow = currentApp; + _lastActiveWindowTitle = currentWindowTitle; + _lastActivityTime = now; + } catch (e) { + print('Error polling Sway activity: $e'); + } + } + + /// Recursively find the focused node in the Sway tree + Map? _findFocusedNode(Map node) { + // Check if this node is focused + if (node['focused'] == true) { + return node; + } + + // Check child nodes + final nodes = node['nodes'] as List? ?? []; + for (final childNode in nodes) { + if (childNode is Map) { + final focused = _findFocusedNode(childNode); + if (focused != null) { + return focused; + } + } + } + + // Check floating nodes + final floatingNodes = node['floating_nodes'] as List? ?? []; + for (final floatingNode in floatingNodes) { + if (floatingNode is Map) { + final focused = _findFocusedNode(floatingNode); + if (focused != null) { + return focused; + } + } + } + + return null; + } + + /// Extract application ID from a Sway node + String _extractAppId(Map node) { + // In Sway, the application identifier can be in different fields depending on the application type + + // For Wayland applications, use app_id + final appId = node['app_id'] as String?; + if (appId != null && appId.isNotEmpty) { + return appId; + } + + // For X11 applications, use window_properties.class + final windowProperties = node['window_properties'] as Map?; + if (windowProperties != null) { + final windowClass = windowProperties['class'] as String?; + if (windowClass != null && windowClass.isNotEmpty) { + return windowClass; + } + } + + // Fallback to window type or node type + final type = node['type'] as String?; + if (type != null && type != 'con') { + return type; + } + + // Last resort fallback + return 'unknown'; + } + + /// Extract window title from a Sway node + String _extractWindowTitle(Map node) { + // Try the name field first + final name = node['name'] as String?; + if (name != null && name.isNotEmpty) { + return name; + } + + // For X11 applications, try window_properties.title + final windowProperties = node['window_properties'] as Map?; + if (windowProperties != null) { + final title = windowProperties['title'] as String?; + if (title != null && title.isNotEmpty) { + return title; + } + } + + // Fallback to app_id if name is empty + final appId = node['app_id'] as String?; + if (appId != null && appId.isNotEmpty) { + return appId; + } + + return ''; + } + + void _emitActivityEvent(String application, String title, int durationSeconds) { + final event = ActivityEvent( + type: ActivityEventType.categorize(applicationId: application, applicationTitle: title), + application: application, + metadata: title, + timestamp: DateTime.now(), + ); + + _activityController.add(event); + } + + @override + Future getCurrentActivity() { + return _activityController.stream.single; + } + + /// Check if swaymsg is available on the system + static Future isAvailable() async { + try { + final result = await Process.run('which', ['swaymsg']); + return result.exitCode == 0; + } catch (e) { + return false; + } + } + + /// Get Sway version information + static Future getVersion() async { + try { + final result = await Process.run('swaymsg', ['-t', 'get_version']); + if (result.exitCode == 0) { + final versionData = jsonDecode(result.stdout); + return versionData['human_readable'] as String? ?? 'Sway (version unknown)'; + } + return null; + } catch (e) { + return null; + } + } + + /// Test the Sway connection and get basic info + static Future?> getSwayInfo() async { + try { + final result = await Process.run('swaymsg', ['-t', 'get_version']); + if (result.exitCode == 0) { + return jsonDecode(result.stdout) as Map; + } + return null; + } catch (e) { + return null; + } + } +} \ No newline at end of file diff --git a/xp_server/lib/src/detectors/sway_idle_monitor.dart b/xp_server/lib/src/detectors/sway_idle_monitor.dart new file mode 100644 index 0000000..65278e6 --- /dev/null +++ b/xp_server/lib/src/detectors/sway_idle_monitor.dart @@ -0,0 +1,128 @@ +import 'dart:async'; +import 'dart:convert'; +import 'dart:io'; +import '../interfaces/i_idle_monitor.dart'; + +/// Sway-specific idle monitor using swayidle +class SwayIdleMonitor implements IIdleMonitor { + static const String _idleLightStartKey = 'SWAY_IDLE_LIGHT_START'; + static const String _idleDeepStartKey = 'SWAY_IDLE_DEEP_START'; + static const String _idleEndKey = 'SWAY_IDLE_END'; + + Process? _swayidleProcess; + final StreamController _idleStateController = StreamController.broadcast(); + IdleStatus _currentIdleStatus = IdleStatus.active; + + @override + Stream get idleStateStream => _idleStateController.stream; + + @override + IdleStatus get status => _currentIdleStatus; + + @override + Future start() async { + // Start in active state + _currentIdleStatus = IdleStatus.active; + _idleStateController.add(IdleStatus.active); + + // Build swayidle command arguments + final swayidleArgs = [ + '-w', // Wait for command to finish before continuing + 'timeout', '20', 'echo "$_idleLightStartKey"', + 'resume', 'echo "$_idleEndKey"', + 'timeout', '120', 'echo "$_idleDeepStartKey"', + 'resume', 'echo "$_idleEndKey"', + ]; + + try { + // Start swayidle with our configuration + _swayidleProcess = await Process.start('swayidle', swayidleArgs); + + // Listen to swayidle output + _swayidleProcess!.stdout + .transform(utf8.decoder) + .transform(LineSplitter()) + .listen(_handleSwayidleOutput); + + _swayidleProcess!.stderr + .transform(utf8.decoder) + .transform(LineSplitter()) + .listen((line) { + if (line.isNotEmpty) { + print('SwayIdle stderr: $line'); + } + }); + + print('🔄 Started Sway idle monitoring with swayidle'); + } catch (e) { + print('❌ Failed to start swayidle: $e'); + print(' Make sure swayidle is installed and available in PATH'); + rethrow; + } + } + + void _handleSwayidleOutput(String line) { + if (line.isEmpty) return; + + switch (line) { + case String s when s.contains(_idleLightStartKey): + _idleStateController.add(IdleStatus.lightIdle); + _currentIdleStatus = IdleStatus.lightIdle; + print('🌙 User went light idle (Sway)'); + case String s when s.contains(_idleDeepStartKey): + _idleStateController.add(IdleStatus.deepIdle); + _currentIdleStatus = IdleStatus.deepIdle; + print('😴 User went deep idle (Sway)'); + case String s when s.contains(_idleEndKey): + _idleStateController.add(IdleStatus.active); + _currentIdleStatus = IdleStatus.active; + print('⚡ User went active (Sway)'); + default: + // Handle other swayidle output if needed + if (line.trim().isNotEmpty) { + print('SwayIdle output: $line'); + } + } + } + + @override + void stop() { + try { + _swayidleProcess?.kill(); + _swayidleProcess = null; + print('🛑 Stopped Sway idle monitoring'); + } catch (e) { + print('Warning: Error stopping swayidle process: $e'); + } + + try { + _idleStateController.close(); + } catch (e) { + print('Warning: Error closing idle state controller: $e'); + } + } + + /// Check if swayidle is available on the system + static Future isAvailable() async { + try { + final result = await Process.run('which', ['swayidle']); + return result.exitCode == 0; + } catch (e) { + return false; + } + } + + /// Get swayidle version information + static Future getVersion() async { + try { + final result = await Process.run('swayidle', ['-h']); + if (result.exitCode == 0) { + // swayidle doesn't have a version flag, but -h should work + return 'swayidle (available)'; + } + return null; + } catch (e) { + return null; + } + } +} \ No newline at end of file diff --git a/xp_server/lib/src/detectors/window_manager_detector.dart b/xp_server/lib/src/detectors/window_manager_detector.dart new file mode 100644 index 0000000..f35d7ca --- /dev/null +++ b/xp_server/lib/src/detectors/window_manager_detector.dart @@ -0,0 +1,143 @@ +import 'dart:io'; + +/// Supported window managers +enum WindowManager { + hyprland, + sway, + unknown; + + @override + String toString() { + return switch (this) { + WindowManager.hyprland => 'Hyprland', + WindowManager.sway => 'Sway', + WindowManager.unknown => 'Unknown', + }; + } +} + +/// Singleton class for detecting the current window manager at runtime +class WindowManagerDetector { + static WindowManagerDetector? _instance; + static WindowManagerDetector get instance => _instance ??= WindowManagerDetector._(); + + WindowManagerDetector._(); + + WindowManager? _detectedWindowManager; + + /// Detect the current window manager based on environment variables + WindowManager detect() { + if (_detectedWindowManager != null) { + return _detectedWindowManager!; + } + + final env = Platform.environment; + + // Check for Hyprland signature + if (env.containsKey('HYPRLAND_INSTANCE_SIGNATURE') && env['HYPRLAND_INSTANCE_SIGNATURE']!.isNotEmpty) { + _detectedWindowManager = WindowManager.hyprland; + return _detectedWindowManager!; + } + + // Check for Sway socket + if (env.containsKey('SWAYSOCK') && env['SWAYSOCK']!.isNotEmpty) { + _detectedWindowManager = WindowManager.sway; + return _detectedWindowManager!; + } + + // Fallback: Try to detect by checking running processes + _detectedWindowManager = _detectByProcess(); + return _detectedWindowManager!; + } + + /// Fallback detection by checking running processes + WindowManager _detectByProcess() { + try { + // Check if hyprctl is available and working + final hyprResult = Process.runSync('which', ['hyprctl']); + if (hyprResult.exitCode == 0) { + final hyprTest = Process.runSync('hyprctl', ['version']); + if (hyprTest.exitCode == 0) { + return WindowManager.hyprland; + } + } + + // Check if swaymsg is available and working + final swayResult = Process.runSync('which', ['swaymsg']); + if (swayResult.exitCode == 0) { + final swayTest = Process.runSync('swaymsg', ['-t', 'get_version']); + if (swayTest.exitCode == 0) { + return WindowManager.sway; + } + } + } catch (e) { + // Ignore errors in fallback detection + } + + return WindowManager.unknown; + } + + /// Get information about the detected window manager + Map getDetectionInfo() { + final windowManager = detect(); + final env = Platform.environment; + + return { + 'detected_window_manager': windowManager.toString(), + 'detection_method': _getDetectionMethod(), + 'environment_variables': { + 'HYPRLAND_INSTANCE_SIGNATURE': env['HYPRLAND_INSTANCE_SIGNATURE'], + 'SWAYSOCK': env['SWAYSOCK'], + 'WAYLAND_DISPLAY': env['WAYLAND_DISPLAY'], + 'XDG_CURRENT_DESKTOP': env['XDG_CURRENT_DESKTOP'], + 'XDG_SESSION_TYPE': env['XDG_SESSION_TYPE'], + }, + }; + } + + String _getDetectionMethod() { + final env = Platform.environment; + + if (env.containsKey('HYPRLAND_INSTANCE_SIGNATURE') && env['HYPRLAND_INSTANCE_SIGNATURE']!.isNotEmpty) { + return 'HYPRLAND_INSTANCE_SIGNATURE environment variable'; + } + + if (env.containsKey('SWAYSOCK') && env['SWAYSOCK']!.isNotEmpty) { + return 'SWAYSOCK environment variable'; + } + + return 'Process detection fallback'; + } + + /// Reset detection (useful for testing) + void reset() { + _detectedWindowManager = null; + } + + /// Check if the window manager supports visual enhancements + bool supportsVisualEnhancements(WindowManager windowManager) { + return switch (windowManager) { + WindowManager.hyprland => true, + WindowManager.sway => false, // As requested: no visual enhancements for Sway + WindowManager.unknown => false, + }; + } + + /// Check if the window manager supports idle monitoring + bool supportsIdleMonitoring(WindowManager windowManager) { + return switch (windowManager) { + WindowManager.hyprland => true, + WindowManager.sway => true, + WindowManager.unknown => false, + }; + } + + /// Check if the window manager supports activity detection + bool supportsActivityDetection(WindowManager windowManager) { + return switch (windowManager) { + WindowManager.hyprland => true, + WindowManager.sway => true, + WindowManager.unknown => false, + }; + } +} \ No newline at end of file diff --git a/xp_server/lib/src/enhancers/sway_enhancer.dart b/xp_server/lib/src/enhancers/sway_enhancer.dart new file mode 100644 index 0000000..9b5f41f --- /dev/null +++ b/xp_server/lib/src/enhancers/sway_enhancer.dart @@ -0,0 +1,148 @@ +import 'dart:io'; +import '../interfaces/i_desktop_enhancer.dart'; + +/// Sway desktop enhancer with minimal visual changes +/// +/// As requested, this implementation does not perform aesthetic desktop config changes +/// for Sway systems. It maintains API compatibility while providing basic notifications. +class SwayEnhancer implements IDesktopEnhancer { + String _currentTheme = 'default'; + + @override + Future celebrateLevelUp(int level) async { + print('🎉 Celebrating level up to $level! (Sway)'); + + // Update internal theme tracking for API compatibility + _updateThemeForLevel(level); + + // Send celebration notification via notify-send + try { + await Process.run('notify-send', [ + '🎉 LEVEL UP!', + 'Welcome to Level $level!\nKeep up the great productivity!', + '--urgency=normal', + '--expire-time=5000', + '--app-name=XP Nix', + ]); + } catch (e) { + print('Could not send level up notification: $e'); + } + + // Optional: Try to send via Sway notification daemon if available + await _trySwayNotification(level); + } + + @override + Future applyThemeForLevel(int level) async { + // Update internal theme tracking only + _updateThemeForLevel(level); + + print('🎨 Theme updated to $_currentTheme for level $level (Sway - visual changes disabled)'); + + // No actual visual changes are applied for Sway as requested + // This maintains compatibility with the API while respecting the no-visual-changes requirement + } + + void _updateThemeForLevel(int level) { + if (level >= 25) { + _currentTheme = 'legendary'; + } else if (level >= 15) { + _currentTheme = 'master'; + } else if (level >= 10) { + _currentTheme = 'advanced'; + } else if (level >= 5) { + _currentTheme = 'intermediate'; + } else { + _currentTheme = 'default'; + } + } + + /// Try to send notification via Sway-specific methods if available + Future _trySwayNotification(int level) async { + try { + // Check if mako (Sway notification daemon) is running + final makoCheck = await Process.run('pgrep', ['mako']); + if (makoCheck.exitCode == 0) { + // Use makoctl if available for enhanced notifications + final makoctl = await Process.run('which', ['makoctl']); + if (makoctl.exitCode == 0) { + // Could add mako-specific notification features here if desired + print('📱 Mako notification daemon detected'); + } + } + } catch (e) { + // Silently ignore errors in optional notification enhancements + } + } + + @override + String getCurrentThemeInfo() { + return 'Theme: $_currentTheme (Sway - visual effects disabled)'; + } + + @override + Future refreshBaseConfig() async { + print('🔄 Refresh base config requested (Sway - no config changes applied)'); + // No-op for Sway as we don't modify configs + } + + @override + Future restoreBackup() async { + print('🔧 Restore backup requested (Sway - no backups to restore)'); + // No-op for Sway as we don't create backups + } + + /// Get information about Sway enhancer capabilities + Map getCapabilityInfo() { + return { + 'window_manager': 'Sway', + 'visual_enhancements': false, + 'notifications': true, + 'config_backup': false, + 'theme_tracking': true, + 'current_theme': _currentTheme, + 'supported_features': [ + 'Level-up notifications', + 'Theme name tracking', + 'API compatibility', + ], + 'disabled_features': [ + 'Visual effects', + 'Config modifications', + 'Backup/restore', + 'Desktop theming', + ], + }; + } + + /// Check if notification systems are available + static Future> checkNotificationAvailability() async { + final availability = {}; + + try { + // Check for notify-send (libnotify) + final notifySend = await Process.run('which', ['notify-send']); + availability['notify-send'] = notifySend.exitCode == 0; + } catch (e) { + availability['notify-send'] = false; + } + + try { + // Check for mako (Sway notification daemon) + final mako = await Process.run('pgrep', ['mako']); + availability['mako'] = mako.exitCode == 0; + } catch (e) { + availability['mako'] = false; + } + + try { + // Check for dunst (alternative notification daemon) + final dunst = await Process.run('pgrep', ['dunst']); + availability['dunst'] = dunst.exitCode == 0; + } catch (e) { + availability['dunst'] = false; + } + + return availability; + } +} \ No newline at end of file diff --git a/xp_server/lib/src/factories/activity_detector_factory.dart b/xp_server/lib/src/factories/activity_detector_factory.dart new file mode 100644 index 0000000..b4da128 --- /dev/null +++ b/xp_server/lib/src/factories/activity_detector_factory.dart @@ -0,0 +1,143 @@ +import '../interfaces/i_activity_detector.dart'; +import '../detectors/hyprland_activity_detector.dart'; +import '../detectors/sway_activity_detector.dart'; +import '../detectors/window_manager_detector.dart'; +import '../testing/mock_activity_detector.dart'; +import 'dart:io'; + +/// Factory for creating appropriate activity detector implementations based on the window manager +class ActivityDetectorFactory { + /// Create an activity detector based on the detected window manager + static IActivityDetector? create([WindowManager? windowManager]) { + windowManager ??= WindowManagerDetector.instance.detect(); + + return switch (windowManager) { + WindowManager.hyprland => HyprlandActivityDetector(), // Existing Hyprland implementation + WindowManager.sway => SwayActivityDetector(), // New Sway implementation + WindowManager.unknown => _createFallbackDetector(), + }; + } + + /// Create a mock activity detector for testing + static IActivityDetector createMock() { + return MockActivityDetector(); + } + + /// Create an activity detector for a specific window manager (useful for testing) + static IActivityDetector? createForWindowManager(WindowManager windowManager) { + return create(windowManager); + } + + /// Create a fallback activity detector when window manager is unknown + static IActivityDetector? _createFallbackDetector() { + print('⚠️ Unknown window manager detected for activity detection'); + print(' Activity detection will be disabled - only legacy polling mode will be available'); + + // Return null to indicate activity detection is not available + // This will cause the ProductivityMonitor to fall back to legacy polling mode + return null; + } + + /// Get information about available activity detector implementations + static Map getAvailableImplementations() { + return { + 'hyprland': { + 'class': 'HyprlandActivityDetector', + 'description': 'Uses hyprctl activewindow for activity detection', + 'requirements': ['hyprctl'], + 'polling_interval': '5 seconds', + }, + 'sway': { + 'class': 'SwayActivityDetector', + 'description': 'Uses swaymsg get_tree for activity detection', + 'requirements': ['swaymsg'], + 'polling_interval': '5 seconds', + }, + 'mock': { + 'class': 'MockActivityDetector', + 'description': 'Controllable mock for testing', + 'requirements': [], + 'polling_interval': 'configurable', + }, + }; + } + + /// Check if activity detection is supported for the given window manager + static bool isSupported(WindowManager windowManager) { + return WindowManagerDetector.instance.supportsActivityDetection(windowManager); + } + + /// Validate that required tools are available for the window manager + static Future validateRequirements(WindowManager windowManager) async { + return switch (windowManager) { + WindowManager.hyprland => await _validateHyprlandRequirements(), + WindowManager.sway => await SwayActivityDetector.isAvailable(), + WindowManager.unknown => false, + }; + } + + static Future _validateHyprlandRequirements() async { + try { + final result = await Process.run('which', ['hyprctl']); + if (result.exitCode != 0) return false; + + // Test that hyprctl actually works + final testResult = await Process.run('hyprctl', ['version']); + return testResult.exitCode == 0; + } catch (e) { + return false; + } + } + + /// Get version information for activity detection tools + static Future> getToolVersions() async { + final versions = {}; + + // Check Hyprland version + try { + final hyprResult = await Process.run('hyprctl', ['version']); + if (hyprResult.exitCode == 0) { + final output = hyprResult.stdout as String; + final lines = output.split('\n'); + if (lines.isNotEmpty) { + versions['hyprland'] = lines.first.trim(); + } + } + } catch (e) { + versions['hyprland'] = null; + } + + // Check Sway version + try { + final swayVersion = await SwayActivityDetector.getVersion(); + versions['sway'] = swayVersion; + } catch (e) { + versions['sway'] = null; + } + + return versions; + } + + /// Test connectivity to window manager APIs + static Future> testConnectivity() async { + final connectivity = {}; + + // Test Hyprland connectivity + try { + final hyprResult = await Process.run('hyprctl', ['activewindow', '-j']); + connectivity['hyprland'] = hyprResult.exitCode == 0; + } catch (e) { + connectivity['hyprland'] = false; + } + + // Test Sway connectivity + try { + final swayResult = await Process.run('swaymsg', ['-t', 'get_tree']); + connectivity['sway'] = swayResult.exitCode == 0; + } catch (e) { + connectivity['sway'] = false; + } + + return connectivity; + } +} \ No newline at end of file diff --git a/xp_server/lib/src/factories/desktop_enhancer_factory.dart b/xp_server/lib/src/factories/desktop_enhancer_factory.dart new file mode 100644 index 0000000..74cff10 --- /dev/null +++ b/xp_server/lib/src/factories/desktop_enhancer_factory.dart @@ -0,0 +1,147 @@ +import 'dart:io'; + +import '../interfaces/i_desktop_enhancer.dart'; +import '../enhancers/hyprland_enhancer.dart'; +import '../enhancers/sway_enhancer.dart'; +import '../detectors/window_manager_detector.dart'; +import '../testing/mock_desktop_enhancer.dart'; + +/// Factory for creating appropriate desktop enhancer implementations based on the window manager +class DesktopEnhancerFactory { + /// Create a desktop enhancer based on the detected window manager + static IDesktopEnhancer create([WindowManager? windowManager]) { + windowManager ??= WindowManagerDetector.instance.detect(); + + return switch (windowManager) { + WindowManager.hyprland => HyprlandEnhancer(), // Existing Hyprland implementation with full visual effects + WindowManager.sway => SwayEnhancer(), // New Sway implementation with no visual effects + WindowManager.unknown => _createFallbackEnhancer(), + }; + } + + /// Create a mock desktop enhancer for testing + static IDesktopEnhancer createMock() { + return MockDesktopEnhancer(); + } + + /// Create a desktop enhancer for a specific window manager (useful for testing) + static IDesktopEnhancer createForWindowManager(WindowManager windowManager) { + return create(windowManager); + } + + /// Create a fallback desktop enhancer when window manager is unknown + static IDesktopEnhancer _createFallbackEnhancer() { + print('⚠️ Unknown window manager detected, using no-op desktop enhancer'); + print(' Visual enhancements will be disabled'); + + // Use Sway enhancer as fallback since it's no-op + return SwayEnhancer(); + } + + /// Get information about available desktop enhancer implementations + static Map getAvailableImplementations() { + return { + 'hyprland': { + 'class': 'HyprlandEnhancer', + 'description': 'Full visual enhancements for Hyprland', + 'features': [ + 'Dynamic blur effects', + 'Progressive shadows', + 'Animated borders', + 'Level-based themes', + 'Config backup/restore', + 'Real-time visual updates', + ], + 'requirements': ['hyprctl'], + 'visual_enhancements': true, + }, + 'sway': { + 'class': 'SwayEnhancer', + 'description': 'Minimal enhancer for Sway (notifications only)', + 'features': ['Level-up notifications', 'Theme name tracking', 'API compatibility'], + 'requirements': ['notify-send (optional)'], + 'visual_enhancements': false, + }, + 'mock': { + 'class': 'MockDesktopEnhancer', + 'description': 'No-op mock for testing', + 'features': ['API compatibility'], + 'requirements': [], + 'visual_enhancements': false, + }, + }; + } + + /// Check if visual enhancements are supported for the given window manager + static bool supportsVisualEnhancements(WindowManager windowManager) { + return WindowManagerDetector.instance.supportsVisualEnhancements(windowManager); + } + + /// Get the feature set available for a window manager + static List getAvailableFeatures(WindowManager windowManager) { + final implementations = getAvailableImplementations(); + + return switch (windowManager) { + WindowManager.hyprland => List.from(implementations['hyprland']['features']), + WindowManager.sway => List.from(implementations['sway']['features']), + WindowManager.unknown => ['Basic notifications'], + }; + } + + /// Validate that required tools are available for the window manager + static Future validateRequirements(WindowManager windowManager) async { + return switch (windowManager) { + WindowManager.hyprland => await _validateHyprlandRequirements(), + WindowManager.sway => await _validateSwayRequirements(), + WindowManager.unknown => true, // Fallback always works + }; + } + + static Future _validateHyprlandRequirements() async { + try { + final result = await Process.run('which', ['hyprctl']); + if (result.exitCode != 0) return false; + + // Test that hyprctl actually works + final testResult = await Process.run('hyprctl', ['version']); + return testResult.exitCode == 0; + } catch (e) { + return false; + } + } + + static Future _validateSwayRequirements() async { + // Sway enhancer has no hard requirements, but check for optional notify-send + try { + final result = await Process.run('which', ['notify-send']); + // Even if notify-send is not available, Sway enhancer still works + return true; + } catch (e) { + return true; + } + } + + /// Get capability information for the current window manager + static Future> getCapabilityInfo([WindowManager? windowManager]) async { + windowManager ??= WindowManagerDetector.instance.detect(); + + final enhancer = create(windowManager); + final implementations = getAvailableImplementations(); + + final info = { + 'window_manager': windowManager.toString(), + 'enhancer_class': enhancer.runtimeType.toString(), + 'visual_enhancements': supportsVisualEnhancements(windowManager), + 'available_features': getAvailableFeatures(windowManager), + 'requirements_met': await validateRequirements(windowManager), + }; + + // Add window manager specific info + if (windowManager == WindowManager.sway && enhancer is SwayEnhancer) { + info['sway_capabilities'] = enhancer.getCapabilityInfo(); + info['notification_availability'] = await SwayEnhancer.checkNotificationAvailability(); + } + + return info; + } +} diff --git a/xp_server/lib/src/factories/idle_monitor_factory.dart b/xp_server/lib/src/factories/idle_monitor_factory.dart new file mode 100644 index 0000000..9eecb5a --- /dev/null +++ b/xp_server/lib/src/factories/idle_monitor_factory.dart @@ -0,0 +1,80 @@ +import 'dart:io'; + +import '../interfaces/i_idle_monitor.dart'; +import '../detectors/idle_monitor.dart'; +import '../detectors/sway_idle_monitor.dart'; +import '../detectors/window_manager_detector.dart'; +import '../testing/mock_idle_monitor.dart'; + +/// Factory for creating appropriate idle monitor implementations based on the window manager +class IdleMonitorFactory { + /// Create an idle monitor based on the detected window manager + static IIdleMonitor create([WindowManager? windowManager]) { + windowManager ??= WindowManagerDetector.instance.detect(); + + return switch (windowManager) { + WindowManager.hyprland => IdleMonitor(), // Existing Hyprland implementation + WindowManager.sway => SwayIdleMonitor(), // New Sway implementation + WindowManager.unknown => _createFallbackMonitor(), + }; + } + + /// Create a mock idle monitor for testing + static IIdleMonitor createMock() { + return MockIdleMonitor(); + } + + /// Create an idle monitor for a specific window manager (useful for testing) + static IIdleMonitor createForWindowManager(WindowManager windowManager) { + return create(windowManager); + } + + /// Create a fallback idle monitor when window manager is unknown + static IIdleMonitor _createFallbackMonitor() { + print('⚠️ Unknown window manager detected, attempting Hyprland idle monitor as fallback'); + print(' If this fails, consider running in a supported environment (Hyprland or Sway)'); + + // Try Hyprland first as fallback + return IdleMonitor(); + } + + /// Get information about available idle monitor implementations + static Map getAvailableImplementations() { + return { + 'hyprland': { + 'class': 'IdleMonitor', + 'description': 'Uses hypridle for idle detection', + 'requirements': ['hypridle'], + }, + 'sway': { + 'class': 'SwayIdleMonitor', + 'description': 'Uses swayidle for idle detection', + 'requirements': ['swayidle'], + }, + 'mock': {'class': 'MockIdleMonitor', 'description': 'Controllable mock for testing', 'requirements': []}, + }; + } + + /// Check if idle monitoring is supported for the given window manager + static bool isSupported(WindowManager windowManager) { + return WindowManagerDetector.instance.supportsIdleMonitoring(windowManager); + } + + /// Validate that required tools are available for the window manager + static Future validateRequirements(WindowManager windowManager) async { + return switch (windowManager) { + WindowManager.hyprland => await _validateHyprlandRequirements(), + WindowManager.sway => await SwayIdleMonitor.isAvailable(), + WindowManager.unknown => false, + }; + } + + static Future _validateHyprlandRequirements() async { + try { + final result = await Process.run('which', ['hypridle']); + return result.exitCode == 0; + } catch (e) { + return false; + } + } +} diff --git a/xp_server/lib/src/factories/window_manager_factory.dart b/xp_server/lib/src/factories/window_manager_factory.dart new file mode 100644 index 0000000..16a2bb6 --- /dev/null +++ b/xp_server/lib/src/factories/window_manager_factory.dart @@ -0,0 +1,94 @@ +import '../interfaces/i_window_manager.dart'; +import '../window_managers/hyprland_manager.dart'; +import '../window_managers/sway_manager.dart'; +import '../detectors/window_manager_detector.dart'; + +/// Factory for creating appropriate window manager implementations +class WindowManagerFactory { + /// Create a window manager based on the detected window manager + static IWindowManager? create([WindowManager? windowManager]) { + windowManager ??= WindowManagerDetector.instance.detect(); + + return switch (windowManager) { + WindowManager.hyprland => HyprlandManager(), + WindowManager.sway => SwayManager(), + WindowManager.unknown => null, // No window manager available + }; + } + + /// Create a window manager for a specific type (useful for testing) + static IWindowManager? createForWindowManager(WindowManager windowManager) { + return create(windowManager); + } + + /// Get information about available window manager implementations + static Map getAvailableImplementations() { + return { + 'hyprland': { + 'class': 'HyprlandManager', + 'description': 'Uses hyprctl commands for window management', + 'commands': ['hyprctl activewindow', 'hyprctl workspaces', 'hyprctl clients'], + 'requirements': ['hyprctl'], + }, + 'sway': { + 'class': 'SwayManager', + 'description': 'Uses swaymsg commands for window management', + 'commands': ['swaymsg -t get_tree', 'swaymsg -t get_workspaces'], + 'requirements': ['swaymsg'], + }, + }; + } + + /// Check if window management is supported for the given window manager + static bool isSupported(WindowManager windowManager) { + return windowManager != WindowManager.unknown; + } + + /// Validate that required tools are available for the window manager + static Future validateRequirements(WindowManager windowManager) async { + return switch (windowManager) { + WindowManager.hyprland => await _validateHyprlandRequirements(), + WindowManager.sway => await _validateSwayRequirements(), + WindowManager.unknown => false, + }; + } + + static Future _validateHyprlandRequirements() async { + try { + final manager = HyprlandManager(); + return await manager.isAvailable(); + } catch (e) { + return false; + } + } + + static Future _validateSwayRequirements() async { + try { + final manager = SwayManager(); + return await manager.isAvailable(); + } catch (e) { + return false; + } + } + + /// Get version information for available window managers + static Future> getVersions() async { + final versions = {}; + + try { + final hyprland = HyprlandManager(); + versions['hyprland'] = await hyprland.getVersion(); + } catch (e) { + versions['hyprland'] = null; + } + + try { + final sway = SwayManager(); + versions['sway'] = await sway.getVersion(); + } catch (e) { + versions['sway'] = null; + } + + return versions; + } +} \ No newline at end of file diff --git a/xp_server/lib/src/interfaces/i_window_manager.dart b/xp_server/lib/src/interfaces/i_window_manager.dart new file mode 100644 index 0000000..8c1dff2 --- /dev/null +++ b/xp_server/lib/src/interfaces/i_window_manager.dart @@ -0,0 +1,50 @@ +/// Interface for window manager operations +/// +/// This interface abstracts window manager-specific operations to provide +/// a consistent API for querying window information across different +/// window managers (Hyprland, Sway, etc.) +abstract interface class IWindowManager { + /// Get information about the currently active/focused window + /// + /// Returns a map containing: + /// - 'application': Application identifier (class/app_id) + /// - 'title': Window title + /// - 'pid': Process ID (if available) + /// - 'workspace': Current workspace (if available) + /// + /// Returns null if no active window or on error + Future?> getCurrentWindow(); + + /// Get the application identifier of the active window + /// + /// Returns the application class/app_id, or 'unknown' if unavailable + Future getActiveApplication(); + + /// Get the title of the active window + /// + /// Returns the window title, or empty string if unavailable + Future getWindowTitle(); + + /// Get the current workspace information + /// + /// Returns a map containing workspace details, or null if unavailable + Future?> getCurrentWorkspace(); + + /// Check if the window manager is available and responding + Future isAvailable(); + + /// Get version information about the window manager + Future getVersion(); + + /// Get current cursor position in global coordinates + /// + /// Returns a map containing: + /// - 'x': X coordinate in pixels + /// - 'y': Y coordinate in pixels + /// + /// Returns null if cursor position is unavailable or on error + Future?> getCursorPosition(); + + /// Get the window manager type identifier + String get managerType; +} \ No newline at end of file diff --git a/xp_server/lib/src/monitors/productivity_monitor.dart b/xp_server/lib/src/monitors/productivity_monitor.dart index 0aa153d..5751618 100644 --- a/xp_server/lib/src/monitors/productivity_monitor.dart +++ b/xp_server/lib/src/monitors/productivity_monitor.dart @@ -8,12 +8,16 @@ import '../interfaces/i_idle_monitor.dart'; import '../interfaces/i_activity_detector.dart'; import '../interfaces/i_time_provider.dart'; import '../interfaces/i_desktop_enhancer.dart'; +import '../interfaces/i_window_manager.dart'; import '../detectors/zoom_detector.dart'; import '../database/database_manager.dart'; import '../config/config_manager.dart'; import '../logging/logger.dart'; import '../notifications/xp_notification_manager.dart'; import '../web/websocket_manager.dart'; +import '../factories/window_manager_factory.dart'; +import '../detectors/window_manager_detector.dart'; +import '../overlays/cursor_overlay_manager.dart'; /// Unified ProductivityMonitor with dependency injection for both production and testing class ProductivityMonitor { @@ -25,6 +29,8 @@ class ProductivityMonitor { late final IDesktopEnhancer _desktopEnhancer; late final XPNotificationManager _xpNotificationManager; late final ZoomDetector? _zoomDetector; + late final IWindowManager? _windowManager; + late final CursorOverlayManager? _cursorOverlayManager; Timer? _pollTimer; String? _lastActiveWindow; @@ -55,6 +61,20 @@ class ProductivityMonitor { _desktopEnhancer = desktopEnhancer; _xpNotificationManager = XPNotificationManager(_dbManager); + // Initialize window manager for legacy polling mode + _windowManager = WindowManagerFactory.create(); + + // Initialize cursor overlay manager + if (_windowManager != null) { + final overlayAppPath = '/home/nate/source/xp_nix/xp_overlay_app/build/linux/x64/release/bundle/xp_overlay_app'; + _cursorOverlayManager = CursorOverlayManager( + windowManager: _windowManager!, + overlayAppPath: overlayAppPath, + ); + } else { + _cursorOverlayManager = null; + } + // Initialize zoom detector (only if not in test mode) if (_activityDetector == null) { _zoomDetector = ZoomDetector(); @@ -326,6 +346,9 @@ class ProductivityMonitor { // Add bonus XP _dbManager.updateDailyStats(achievement['xp_reward'] as int, 0, 0); + // Show cursor overlay for achievement bonus XP + _cursorOverlayManager?.showXPNumber(achievement['xp_reward'] as int); + print('🏆 ACHIEVEMENT UNLOCKED: ${achievement['name']}'); print(' ${achievement['description']}'); print(' Bonus: +${achievement['xp_reward']} XP'); @@ -405,6 +428,9 @@ class ProductivityMonitor { _dbManager.saveFocusSession(today, focusMinutes, bonusXP, _timeProvider.now().millisecondsSinceEpoch); _dbManager.updateDailyStats(bonusXP, 0, 0); + // Show cursor overlay for focus session bonus XP + _cursorOverlayManager?.showXPNumber(bonusXP); + String message = '🎯 Focus session complete: +$bonusXP XP for $focusMinutes min!'; if (focusMinutes >= 180) { message = '🔥 LEGENDARY FOCUS! +$bonusXP XP for $focusMinutes min! 🔥'; @@ -499,6 +525,49 @@ class ProductivityMonitor { try { if (_idleMonitor.status != IdleStatus.active) return; + // Use window manager abstraction if available + if (_windowManager != null) { + final windowInfo = await _windowManager!.getCurrentWindow(); + if (windowInfo == null) return; + + final currentApp = windowInfo['application'] as String? ?? 'unknown'; + final currentWindowTitle = windowInfo['title'] as String? ?? ''; + final now = _timeProvider.now(); + + await _checkZoomActivity(now); + + if (_lastActiveWindow != currentApp || _lastActiveWindowTitle != currentWindowTitle) { + if (_lastActiveWindow != null && _lastActivityTime != null) { + _saveActivityEvent( + _lastActiveWindow!, + now.difference(_lastActivityTime!).inSeconds, + _lastActiveWindowTitle ?? '', + ); + } + + _lastActiveWindow = currentApp; + _lastActiveWindowTitle = currentWindowTitle; + _lastActivityTime = now; + final windowManager = WindowManagerDetector.instance.detect(); + print('Switched to: $currentApp (via ${windowManager.toString()})'); + } + } else { + // Fallback to Hyprland-specific approach if window manager is not available + print('Warning: No window manager available, attempting Hyprland fallback'); + await _pollActivityHyprlandFallback(); + } + } catch (e) { + print('Error polling activity: $e'); + // Try fallback on error + if (_windowManager != null) { + print('Attempting fallback polling method...'); + await _pollActivityHyprlandFallback(); + } + } + } + + Future _pollActivityHyprlandFallback() async { + try { final result = await Process.run('hyprctl', ['activewindow', '-j']); if (result.exitCode != 0) return; @@ -521,10 +590,10 @@ class ProductivityMonitor { _lastActiveWindow = currentApp; _lastActiveWindowTitle = currentWindowTitle; _lastActivityTime = now; - print('Switched to: $currentApp'); + print('Switched to: $currentApp (Hyprland fallback)'); } } catch (e) { - print('Error polling activity: $e'); + print('Error in Hyprland fallback polling: $e'); } } @@ -639,6 +708,9 @@ class ProductivityMonitor { _dbManager.updateDailyStats(xp, focusTime, meetingTime); print('Logged: ${event.type} for ${durationSeconds}s (+$xp XP)'); + // Show cursor overlay for XP gain + _cursorOverlayManager?.showXPNumber(xp); + // Send activity XP notification _xpNotificationManager.showXPGain( source: 'activity', diff --git a/xp_server/lib/src/overlays/cursor_overlay_manager.dart b/xp_server/lib/src/overlays/cursor_overlay_manager.dart new file mode 100644 index 0000000..f469626 --- /dev/null +++ b/xp_server/lib/src/overlays/cursor_overlay_manager.dart @@ -0,0 +1,129 @@ +import 'dart:io'; +import '../interfaces/i_window_manager.dart'; +import '../logging/logger.dart'; + +/// Manages cursor-positioned XP overlays by coordinating cursor tracking +/// and spawning Flutter overlay processes +class CursorOverlayManager { + final IWindowManager _windowManager; + final String _overlayAppPath; + + CursorOverlayManager({ + required IWindowManager windowManager, + required String overlayAppPath, + }) : _windowManager = windowManager, + _overlayAppPath = overlayAppPath; + + /// Show XP number at current cursor position + /// + /// [xpValue] - XP amount to display + /// [duration] - How long to show the overlay (default 3 seconds) + Future showXPNumber(int xpValue, {Duration duration = const Duration(seconds: 3)}) async { + try { + // Get current cursor position + final cursorPos = await _windowManager.getCursorPosition(); + if (cursorPos == null) { + Logger.warn('Could not get cursor position, skipping XP overlay'); + return; + } + + final x = cursorPos['x']!; + final y = cursorPos['y']!; + + Logger.info('Showing XP overlay: +$xpValue at position ($x, $y)'); + + // Spawn Flutter overlay process + await _spawnOverlayProcess(x, y, xpValue, duration); + } catch (e) { + Logger.error('Failed to show XP overlay', e); + } + } + + /// Show XP number at specific position + /// + /// [x] - X coordinate in pixels + /// [y] - Y coordinate in pixels + /// [xpValue] - XP amount to display + /// [duration] - How long to show the overlay + Future showXPNumberAt(int x, int y, int xpValue, {Duration duration = const Duration(seconds: 3)}) async { + try { + Logger.info('Showing XP overlay: +$xpValue at position ($x, $y)'); + await _spawnOverlayProcess(x, y, xpValue, duration); + } catch (e) { + Logger.error('Failed to show XP overlay at position', e); + } + } + + /// Test cursor position tracking + /// + /// Returns current cursor coordinates or null if unavailable + Future?> getCurrentCursorPosition() async { + try { + return await _windowManager.getCursorPosition(); + } catch (e) { + Logger.error('Failed to get cursor position', e); + return null; + } + } + + /// Spawn the Flutter overlay process + Future _spawnOverlayProcess(int x, int y, int xpValue, Duration duration) async { + final durationSeconds = duration.inSeconds; + + // Check if overlay app exists + if (!await File(_overlayAppPath).exists()) { + Logger.error('Overlay app not found at: $_overlayAppPath'); + return; + } + + try { + // Spawn overlay process with arguments: x y xp_value duration_seconds + final process = await Process.start( + _overlayAppPath, + [x.toString(), y.toString(), xpValue.toString(), durationSeconds.toString()], + mode: ProcessStartMode.detached, + ); + + Logger.debug('Spawned overlay process with PID: ${process.pid}'); + + // Don't wait for the process to complete - let it run independently + process.exitCode.then((exitCode) { + if (exitCode != 0) { + Logger.warn('Overlay process exited with code: $exitCode'); + } else { + Logger.debug('Overlay process completed successfully'); + } + }).catchError((error) { + Logger.error('Overlay process error', error); + }); + + } catch (e) { + Logger.error('Failed to spawn overlay process', e); + } + } + + /// Test the overlay system by showing a test XP number + Future testOverlay({int testXP = 42}) async { + Logger.info('Testing overlay system with XP value: $testXP'); + await showXPNumber(testXP, duration: const Duration(seconds: 5)); + } + + /// Check if the overlay system is available + Future isAvailable() async { + try { + // Check if window manager supports cursor position + final cursorPos = await _windowManager.getCursorPosition(); + final windowManagerAvailable = cursorPos != null; + + // Check if overlay app exists + final overlayAppAvailable = await File(_overlayAppPath).exists(); + + Logger.debug('Overlay system availability: windowManager=$windowManagerAvailable, overlayApp=$overlayAppAvailable'); + + return windowManagerAvailable && overlayAppAvailable; + } catch (e) { + Logger.error('Error checking overlay availability', e); + return false; + } + } +} \ No newline at end of file diff --git a/xp_server/lib/src/testing/mock_window_manager_detector.dart b/xp_server/lib/src/testing/mock_window_manager_detector.dart new file mode 100644 index 0000000..569c92d --- /dev/null +++ b/xp_server/lib/src/testing/mock_window_manager_detector.dart @@ -0,0 +1,79 @@ +import '../detectors/window_manager_detector.dart'; + +/// Mock window manager detector for testing +/// +/// Allows tests to override window manager detection behavior +class MockWindowManagerDetector { + static WindowManager? _mockedWindowManager; + static Map? _mockedEnvironment; + + /// Set the window manager that should be detected in tests + static void mockDetection(WindowManager windowManager) { + _mockedWindowManager = windowManager; + } + + /// Set mock environment variables for testing detection logic + static void mockEnvironment(Map environment) { + _mockedEnvironment = environment; + } + + /// Clear all mocks + static void clearMocks() { + _mockedWindowManager = null; + _mockedEnvironment = null; + // Reset the detector singleton + WindowManagerDetector.instance.reset(); + } + + /// Get the currently mocked window manager + static WindowManager? get mockedWindowManager => _mockedWindowManager; + + /// Get the currently mocked environment + static Map? get mockedEnvironment => _mockedEnvironment; + + /// Create a test scenario for Hyprland + static void setupHyprlandTest() { + mockEnvironment({ + 'HYPRLAND_INSTANCE_SIGNATURE': 'test_signature_12345', + 'WAYLAND_DISPLAY': 'wayland-1', + 'XDG_CURRENT_DESKTOP': 'Hyprland', + 'XDG_SESSION_TYPE': 'wayland', + }); + mockDetection(WindowManager.hyprland); + } + + /// Create a test scenario for Sway + static void setupSwayTest() { + mockEnvironment({ + 'SWAYSOCK': '/run/user/1000/sway-ipc.sock', + 'WAYLAND_DISPLAY': 'wayland-1', + 'XDG_CURRENT_DESKTOP': 'sway', + 'XDG_SESSION_TYPE': 'wayland', + }); + mockDetection(WindowManager.sway); + } + + /// Create a test scenario for unknown window manager + static void setupUnknownTest() { + mockEnvironment({ + 'XDG_SESSION_TYPE': 'x11', + 'XDG_CURRENT_DESKTOP': 'GNOME', + }); + mockDetection(WindowManager.unknown); + } + + /// Verify detection results match expectations + static bool verifyDetection(WindowManager expected) { + return WindowManagerDetector.instance.detect() == expected; + } + + /// Get detailed detection info for debugging tests + static Map getTestDetectionInfo() { + return { + 'mocked_window_manager': _mockedWindowManager?.toString(), + 'mocked_environment': _mockedEnvironment, + 'actual_detection': WindowManagerDetector.instance.detect().toString(), + 'actual_detection_info': WindowManagerDetector.instance.getDetectionInfo(), + }; + } +} \ No newline at end of file diff --git a/xp_server/lib/src/window_managers/hyprland_manager.dart b/xp_server/lib/src/window_managers/hyprland_manager.dart new file mode 100644 index 0000000..9319b2f --- /dev/null +++ b/xp_server/lib/src/window_managers/hyprland_manager.dart @@ -0,0 +1,203 @@ +import 'dart:convert'; +import 'dart:io'; +import '../interfaces/i_window_manager.dart'; + +/// Hyprland window manager implementation +class HyprlandManager implements IWindowManager { + @override + String get managerType => 'Hyprland'; + + @override + Future?> getCurrentWindow() async { + try { + final result = await Process.run('hyprctl', ['activewindow', '-j']); + if (result.exitCode != 0) { + return null; + } + + final windowData = jsonDecode(result.stdout) as Map; + + return { + 'application': windowData['class'] as String? ?? 'unknown', + 'title': windowData['title'] as String? ?? '', + 'pid': windowData['pid'] as int? ?? -1, + 'workspace': windowData['workspace'] != null + ? (windowData['workspace'] as Map)['id'] as int? ?? -1 + : -1, + 'address': windowData['address'] as String? ?? '', + 'floating': windowData['floating'] as bool? ?? false, + 'fullscreen': windowData['fullscreen'] as bool? ?? false, + 'size': windowData['size'] != null + ? [ + (windowData['size'] as List)[0] as int, + (windowData['size'] as List)[1] as int, + ] + : [0, 0], + 'position': windowData['at'] != null + ? [ + (windowData['at'] as List)[0] as int, + (windowData['at'] as List)[1] as int, + ] + : [0, 0], + }; + } catch (e) { + print('Error getting current window from Hyprland: $e'); + return null; + } + } + + @override + Future getActiveApplication() async { + final window = await getCurrentWindow(); + return window?['application'] as String? ?? 'unknown'; + } + + @override + Future getWindowTitle() async { + final window = await getCurrentWindow(); + return window?['title'] as String? ?? ''; + } + + @override + Future?> getCurrentWorkspace() async { + try { + final result = await Process.run('hyprctl', ['activeworkspace', '-j']); + if (result.exitCode != 0) { + return null; + } + + final workspaceData = jsonDecode(result.stdout) as Map; + + return { + 'id': workspaceData['id'] as int? ?? -1, + 'name': workspaceData['name'] as String? ?? '', + 'monitor': workspaceData['monitor'] as String? ?? '', + 'windows': workspaceData['windows'] as int? ?? 0, + 'hasfullscreen': workspaceData['hasfullscreen'] as bool? ?? false, + 'lastwindow': workspaceData['lastwindow'] as String? ?? '', + 'lastwindowtitle': workspaceData['lastwindowtitle'] as String? ?? '', + }; + } catch (e) { + print('Error getting current workspace from Hyprland: $e'); + return null; + } + } + + @override + Future isAvailable() async { + try { + final result = await Process.run('hyprctl', ['version']); + return result.exitCode == 0; + } catch (e) { + return false; + } + } + + @override + Future getVersion() async { + try { + final result = await Process.run('hyprctl', ['version']); + if (result.exitCode == 0) { + final output = result.stdout as String; + final lines = output.split('\n'); + if (lines.isNotEmpty) { + return lines.first.trim(); + } + } + return null; + } catch (e) { + return null; + } + } + + /// Get all windows from Hyprland + Future>> getAllWindows() async { + try { + final result = await Process.run('hyprctl', ['clients', '-j']); + if (result.exitCode != 0) { + return []; + } + + final clientsData = jsonDecode(result.stdout) as List; + return clientsData.cast>(); + } catch (e) { + print('Error getting all windows from Hyprland: $e'); + return []; + } + } + + /// Get all workspaces from Hyprland + Future>> getAllWorkspaces() async { + try { + final result = await Process.run('hyprctl', ['workspaces', '-j']); + if (result.exitCode != 0) { + return []; + } + + final workspacesData = jsonDecode(result.stdout) as List; + return workspacesData.cast>(); + } catch (e) { + print('Error getting all workspaces from Hyprland: $e'); + return []; + } + } + + /// Get monitor information from Hyprland + Future>> getMonitors() async { + try { + final result = await Process.run('hyprctl', ['monitors', '-j']); + if (result.exitCode != 0) { + return []; + } + + final monitorsData = jsonDecode(result.stdout) as List; + return monitorsData.cast>(); + } catch (e) { + print('Error getting monitors from Hyprland: $e'); + return []; + } + } + + /// Execute a Hyprland dispatch command + Future dispatch(String command, [List args = const []]) async { + try { + final fullArgs = ['dispatch', command, ...args]; + final result = await Process.run('hyprctl', fullArgs); + return result.exitCode == 0; + } catch (e) { + print('Error executing Hyprland dispatch: $e'); + return false; + } + } + + @override + Future?> getCursorPosition() async { + try { + final result = await Process.run('hyprctl', ['cursorpos']); + if (result.exitCode != 0) { + return null; + } + + final output = result.stdout as String; + // Parse output format: "123, 456" (x, y coordinates) + final coordinates = output.trim().split(', '); + if (coordinates.length != 2) { + print('Unexpected cursor position format: $output'); + return null; + } + + final x = int.tryParse(coordinates[0]); + final y = int.tryParse(coordinates[1]); + + if (x == null || y == null) { + print('Failed to parse cursor coordinates: $output'); + return null; + } + + return {'x': x, 'y': y}; + } catch (e) { + print('Error getting cursor position from Hyprland: $e'); + return null; + } + } +} \ No newline at end of file diff --git a/xp_server/lib/src/window_managers/sway_manager.dart b/xp_server/lib/src/window_managers/sway_manager.dart new file mode 100644 index 0000000..349202e --- /dev/null +++ b/xp_server/lib/src/window_managers/sway_manager.dart @@ -0,0 +1,296 @@ +import 'dart:convert'; +import 'dart:io'; +import '../interfaces/i_window_manager.dart'; + +/// Sway window manager implementation +class SwayManager implements IWindowManager { + @override + String get managerType => 'Sway'; + + @override + Future?> getCurrentWindow() async { + try { + final result = await Process.run('swaymsg', ['-t', 'get_tree']); + if (result.exitCode != 0) { + return null; + } + + final treeData = jsonDecode(result.stdout) as Map; + final focusedNode = _findFocusedNode(treeData); + + if (focusedNode == null) { + return null; + } + + return { + 'application': _extractAppId(focusedNode), + 'title': _extractWindowTitle(focusedNode), + 'pid': focusedNode['pid'] as int? ?? -1, + 'workspace': _extractWorkspaceNumber(focusedNode), + 'id': focusedNode['id'] as int? ?? -1, + 'floating': _isFloating(focusedNode), + 'fullscreen_mode': focusedNode['fullscreen_mode'] as int? ?? 0, + 'rect': focusedNode['rect'] != null + ? Map.from(focusedNode['rect'] as Map) + : null, + 'window_rect': focusedNode['window_rect'] != null + ? Map.from(focusedNode['window_rect'] as Map) + : null, + 'type': focusedNode['type'] as String? ?? 'unknown', + }; + } catch (e) { + print('Error getting current window from Sway: $e'); + return null; + } + } + + @override + Future getActiveApplication() async { + final window = await getCurrentWindow(); + return window?['application'] as String? ?? 'unknown'; + } + + @override + Future getWindowTitle() async { + final window = await getCurrentWindow(); + return window?['title'] as String? ?? ''; + } + + @override + Future?> getCurrentWorkspace() async { + try { + final result = await Process.run('swaymsg', ['-t', 'get_workspaces']); + if (result.exitCode != 0) { + return null; + } + + final workspacesData = jsonDecode(result.stdout) as List; + + // Find the focused workspace + for (final workspace in workspacesData) { + if (workspace is Map && workspace['focused'] == true) { + return { + 'id': workspace['num'] as int? ?? -1, + 'name': workspace['name'] as String? ?? '', + 'output': workspace['output'] as String? ?? '', + 'focused': workspace['focused'] as bool? ?? false, + 'urgent': workspace['urgent'] as bool? ?? false, + 'visible': workspace['visible'] as bool? ?? false, + 'rect': workspace['rect'] != null + ? Map.from(workspace['rect'] as Map) + : null, + }; + } + } + + return null; + } catch (e) { + print('Error getting current workspace from Sway: $e'); + return null; + } + } + + @override + Future isAvailable() async { + try { + final result = await Process.run('swaymsg', ['-t', 'get_version']); + return result.exitCode == 0; + } catch (e) { + return false; + } + } + + @override + Future getVersion() async { + try { + final result = await Process.run('swaymsg', ['-t', 'get_version']); + if (result.exitCode == 0) { + final versionData = jsonDecode(result.stdout) as Map; + return versionData['human_readable'] as String? ?? 'Sway (version unknown)'; + } + return null; + } catch (e) { + return null; + } + } + + /// Recursively find the focused node in the Sway tree + Map? _findFocusedNode(Map node) { + // Check if this node is focused + if (node['focused'] == true) { + return node; + } + + // Check child nodes + final nodes = node['nodes'] as List? ?? []; + for (final childNode in nodes) { + if (childNode is Map) { + final focused = _findFocusedNode(childNode); + if (focused != null) { + return focused; + } + } + } + + // Check floating nodes + final floatingNodes = node['floating_nodes'] as List? ?? []; + for (final floatingNode in floatingNodes) { + if (floatingNode is Map) { + final focused = _findFocusedNode(floatingNode); + if (focused != null) { + return focused; + } + } + } + + return null; + } + + /// Extract application ID from a Sway node + String _extractAppId(Map node) { + // For Wayland applications, use app_id + final appId = node['app_id'] as String?; + if (appId != null && appId.isNotEmpty) { + return appId; + } + + // For X11 applications, use window_properties.class + final windowProperties = node['window_properties'] as Map?; + if (windowProperties != null) { + final windowClass = windowProperties['class'] as String?; + if (windowClass != null && windowClass.isNotEmpty) { + return windowClass; + } + } + + // Fallback to window type or node type + final type = node['type'] as String?; + if (type != null && type != 'con') { + return type; + } + + return 'unknown'; + } + + /// Extract window title from a Sway node + String _extractWindowTitle(Map node) { + // Try the name field first + final name = node['name'] as String?; + if (name != null && name.isNotEmpty) { + return name; + } + + // For X11 applications, try window_properties.title + final windowProperties = node['window_properties'] as Map?; + if (windowProperties != null) { + final title = windowProperties['title'] as String?; + if (title != null && title.isNotEmpty) { + return title; + } + } + + return ''; + } + + /// Extract workspace number from a Sway node by traversing up the tree + int _extractWorkspaceNumber(Map node) { + // If this node has a workspace number, return it + final num = node['num'] as int?; + if (num != null && num > 0) { + return num; + } + + // This is a simplified approach - in practice, you might need to + // maintain the parent relationship while traversing the tree + return -1; + } + + /// Check if a node represents a floating window + bool _isFloating(Map node) { + final type = node['type'] as String?; + return type == 'floating_con'; + } + + /// Get all workspaces from Sway + Future>> getAllWorkspaces() async { + try { + final result = await Process.run('swaymsg', ['-t', 'get_workspaces']); + if (result.exitCode != 0) { + return []; + } + + final workspacesData = jsonDecode(result.stdout) as List; + return workspacesData.cast>(); + } catch (e) { + print('Error getting all workspaces from Sway: $e'); + return []; + } + } + + /// Get outputs (monitors) from Sway + Future>> getOutputs() async { + try { + final result = await Process.run('swaymsg', ['-t', 'get_outputs']); + if (result.exitCode != 0) { + return []; + } + + final outputsData = jsonDecode(result.stdout) as List; + return outputsData.cast>(); + } catch (e) { + print('Error getting outputs from Sway: $e'); + return []; + } + } + + /// Get the full window tree from Sway + Future?> getWindowTree() async { + try { + final result = await Process.run('swaymsg', ['-t', 'get_tree']); + if (result.exitCode != 0) { + return null; + } + + return jsonDecode(result.stdout) as Map; + } catch (e) { + print('Error getting window tree from Sway: $e'); + return null; + } + } + + /// Execute a Sway command + Future executeCommand(String command) async { + try { + final result = await Process.run('swaymsg', [command]); + return result.exitCode == 0; + } catch (e) { + print('Error executing Sway command: $e'); + return false; + } + } + + @override + Future?> getCursorPosition() async { + try { + // Sway doesn't have a direct cursor position query command + // As a fallback, we'll return the center of the focused window + final window = await getCurrentWindow(); + if (window == null) { + return null; + } + + final rect = window['rect'] as Map?; + if (rect == null) { + return null; + } + + final x = (rect['x'] as int? ?? 0) + ((rect['width'] as int? ?? 0) ~/ 2); + final y = (rect['y'] as int? ?? 0) + ((rect['height'] as int? ?? 0) ~/ 2); + + return {'x': x, 'y': y}; + } catch (e) { + print('Error getting cursor position from Sway: $e'); + return null; + } + } +} \ No newline at end of file