From d0b2bce8fa16a86c43ccfe64d4a5429911009df8 Mon Sep 17 00:00:00 2001
From: Konstantin Wachendorff <kw@eyev.de>
Date: Tue, 8 Oct 2024 15:39:58 +0200
Subject: [PATCH] upgrades for android

---
 .metadata                                     | 29 +++--------
 android/app/build.gradle                      | 49 ++++++++-----------
 android/app/src/debug/AndroidManifest.xml     |  3 +-
 android/app/src/main/AndroidManifest.xml      | 15 +++++-
 .../example/skyle_calibration/MainActivity.kt |  6 ---
 .../kotlin/de/eyev/skyle_ik/MainActivity.kt   |  5 ++
 android/app/src/profile/AndroidManifest.xml   |  3 +-
 android/build.gradle                          |  4 +-
 android/gradle.properties                     |  2 +-
 android/settings.gradle                       |  2 +-
 lib/app.dart                                  |  5 ++
 lib/main.dart                                 | 20 +++++---
 pubspec.lock                                  |  8 ++-
 pubspec.yaml                                  |  4 +-
 14 files changed, 73 insertions(+), 82 deletions(-)
 delete mode 100644 android/app/src/main/kotlin/com/example/skyle_calibration/MainActivity.kt
 create mode 100644 android/app/src/main/kotlin/de/eyev/skyle_ik/MainActivity.kt

diff --git a/.metadata b/.metadata
index 31b763f..65a4a37 100644
--- a/.metadata
+++ b/.metadata
@@ -1,11 +1,11 @@
 # 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.
+# This file should be version controlled and should not be manually edited.
 
 version:
-  revision: ffccd96b62ee8cec7740dab303538c5fc26ac543
-  channel: stable
+  revision: "5dcb86f68f239346676ceb1ed1ea385bd215fba1"
+  channel: "stable"
 
 project_type: app
 
@@ -13,26 +13,11 @@ project_type: app
 migration:
   platforms:
     - platform: root
-      create_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543
-      base_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543
+      create_revision: 5dcb86f68f239346676ceb1ed1ea385bd215fba1
+      base_revision: 5dcb86f68f239346676ceb1ed1ea385bd215fba1
     - platform: android
-      create_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543
-      base_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543
-    - platform: ios
-      create_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543
-      base_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543
-    - platform: linux
-      create_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543
-      base_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543
-    - platform: macos
-      create_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543
-      base_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543
-    - platform: web
-      create_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543
-      base_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543
-    - platform: windows
-      create_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543
-      base_revision: ffccd96b62ee8cec7740dab303538c5fc26ac543
+      create_revision: 5dcb86f68f239346676ceb1ed1ea385bd215fba1
+      base_revision: 5dcb86f68f239346676ceb1ed1ea385bd215fba1
 
   # User provided section
 
diff --git a/android/app/build.gradle b/android/app/build.gradle
index 3f2ea17..13fc5f5 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -1,67 +1,58 @@
 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"
 }
 
 def localProperties = new Properties()
-def localPropertiesFile = rootProject.file('local.properties')
+def localPropertiesFile = rootProject.file("local.properties")
 if (localPropertiesFile.exists()) {
-    localPropertiesFile.withReader('UTF-8') { reader ->
+    localPropertiesFile.withReader("UTF-8") { reader ->
         localProperties.load(reader)
     }
 }
 
-def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
+def flutterVersionCode = localProperties.getProperty("flutter.versionCode")
 if (flutterVersionCode == null) {
-    flutterVersionCode = '1'
+    flutterVersionCode = "1"
 }
 
-def flutterVersionName = localProperties.getProperty('flutter.versionName')
+def flutterVersionName = localProperties.getProperty("flutter.versionName")
 if (flutterVersionName == null) {
-    flutterVersionName = '1.0'
+    flutterVersionName = "1.0"
 }
 
 android {
-    namespace "com.example.skyle_ik"
-    compileSdkVersion flutter.compileSdkVersion
-    ndkVersion flutter.ndkVersion
+    namespace = "de.eyev.skyle_ik"
+    compileSdk = flutter.compileSdkVersion
+    ndkVersion = flutter.ndkVersion
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-
-    kotlinOptions {
-        jvmTarget = '1.8'
-    }
-
-    sourceSets {
-        main.java.srcDirs += 'src/main/kotlin'
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
 
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
-        applicationId "com.example.skyle_ik"
+        applicationId = "de.eyev.skyle_ik"
         // You can update the following values to match your application needs.
-        // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-build-configuration.
-        minSdkVersion flutter.minSdkVersion
-        targetSdkVersion flutter.targetSdkVersion
-        versionCode flutterVersionCode.toInteger()
-        versionName flutterVersionName
+        // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
+        minSdk = flutter.minSdkVersion
+        targetSdk = flutter.targetSdkVersion
+        versionCode = flutterVersionCode.toInteger()
+        versionName = flutterVersionName
     }
 
     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.debug
+            signingConfig = signingConfigs.debug
         }
     }
 }
 
 flutter {
-    source '../..'
+    source = "../.."
 }
-
-dependencies { }
diff --git a/android/app/src/debug/AndroidManifest.xml b/android/app/src/debug/AndroidManifest.xml
index dff87af..399f698 100644
--- a/android/app/src/debug/AndroidManifest.xml
+++ b/android/app/src/debug/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.skyle_ik">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- The INTERNET permission is required for development. Specifically,
          the Flutter tool needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 54a16e0..e355261 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.skyle_ik">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
@@ -13,6 +12,7 @@
             android:name=".MainActivity"
             android:exported="true"
             android:launchMode="singleTop"
+            android:taskAffinity=""
             android:theme="@style/LaunchTheme"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
             android:hardwareAccelerated="true"
@@ -36,4 +36,15 @@
             android:name="flutterEmbedding"
             android:value="2" />
     </application>
+    <!-- Required to query activities that can process text, see:
+         https://developer.android.com/training/package-visibility and
+         https://developer.android.com/reference/android/content/Intent#ACTION_PROCESS_TEXT.
+
+         In particular, this is used by the Flutter engine in io.flutter.plugin.text.ProcessTextPlugin. -->
+    <queries>
+        <intent>
+            <action android:name="android.intent.action.PROCESS_TEXT"/>
+            <data android:mimeType="text/plain"/>
+        </intent>
+    </queries>
 </manifest>
diff --git a/android/app/src/main/kotlin/com/example/skyle_calibration/MainActivity.kt b/android/app/src/main/kotlin/com/example/skyle_calibration/MainActivity.kt
deleted file mode 100644
index 7152d43..0000000
--- a/android/app/src/main/kotlin/com/example/skyle_calibration/MainActivity.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package com.example.skyle_ik
-
-import io.flutter.embedding.android.FlutterActivity
-
-class MainActivity: FlutterActivity() {
-}
diff --git a/android/app/src/main/kotlin/de/eyev/skyle_ik/MainActivity.kt b/android/app/src/main/kotlin/de/eyev/skyle_ik/MainActivity.kt
new file mode 100644
index 0000000..666da99
--- /dev/null
+++ b/android/app/src/main/kotlin/de/eyev/skyle_ik/MainActivity.kt
@@ -0,0 +1,5 @@
+package de.eyev.skyle_ik
+
+import io.flutter.embedding.android.FlutterActivity
+
+class MainActivity: FlutterActivity()
diff --git a/android/app/src/profile/AndroidManifest.xml b/android/app/src/profile/AndroidManifest.xml
index dff87af..399f698 100644
--- a/android/app/src/profile/AndroidManifest.xml
+++ b/android/app/src/profile/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.skyle_ik">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- The INTERNET permission is required for development. Specifically,
          the Flutter tool needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
diff --git a/android/build.gradle b/android/build.gradle
index bc157bd..d2ffbff 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -5,12 +5,12 @@ allprojects {
     }
 }
 
-rootProject.buildDir = '../build'
+rootProject.buildDir = "../build"
 subprojects {
     project.buildDir = "${rootProject.buildDir}/${project.name}"
 }
 subprojects {
-    project.evaluationDependsOn(':app')
+    project.evaluationDependsOn(":app")
 }
 
 tasks.register("clean", Delete) {
diff --git a/android/gradle.properties b/android/gradle.properties
index baa47a1..3a975bb 100644
--- a/android/gradle.properties
+++ b/android/gradle.properties
@@ -1,4 +1,4 @@
-org.gradle.jvmargs=-Xmx1536M
+org.gradle.jvmargs=-Xmx4G -XX:+HeapDumpOnOutOfMemoryError
 android.useAndroidX=true
 android.enableJetifier=true
 android.ndk.suppressMinSdkVersionError=21
\ No newline at end of file
diff --git a/android/settings.gradle b/android/settings.gradle
index 4270eab..a1cbea7 100644
--- a/android/settings.gradle
+++ b/android/settings.gradle
@@ -22,4 +22,4 @@ plugins {
     id "org.jetbrains.kotlin.android" version "2.0.20" apply false
 }
 
-include ":app"
\ No newline at end of file
+include ":app"
diff --git a/lib/app.dart b/lib/app.dart
index 8aaa09d..429dcb7 100644
--- a/lib/app.dart
+++ b/lib/app.dart
@@ -10,6 +10,7 @@ import 'package:device_info_plus/device_info_plus.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/scheduler.dart';
+import 'package:flutter/services.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:gaze_interactive/api.dart';
 import 'package:millimeters/millimeters.dart';
@@ -64,6 +65,10 @@ class _SkyleAppState extends ConsumerState<SkyleApp> with WidgetsBindingObserver
 
   @override
   void initState() {
+    if (UniversalPlatform.isAndroid) {
+      SystemChrome.setEnabledSystemUIMode(SystemUiMode.edgeToEdge, overlays: []);
+    }
+
     super.initState();
     Routes.widgetRef = ref;
 
diff --git a/lib/main.dart b/lib/main.dart
index 276a1f9..cfd842c 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -9,6 +9,7 @@ import 'package:gaze_interactive/api.dart';
 import 'package:millimeters/millimeters.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 import 'package:skyle_api/api.dart' as skyle;
+import 'package:universal_platform/universal_platform.dart';
 import 'package:window_manager/window_manager.dart';
 
 import 'app.dart';
@@ -23,15 +24,18 @@ Future<void> main() async {
   AppState().sharedPreferences = await SharedPreferences.getInstance();
   skyle.ET.logger = Logger();
 
-  await windowManager.ensureInitialized();
-  const windowOptions = WindowOptions(center: true, minimumSize: Size(1440, 900), titleBarStyle: TitleBarStyle.hidden);
-  await windowManager.waitUntilReadyToShow(windowOptions, () async {
-    await windowManager.show();
-    await windowManager.focus();
-    await windowManager.setSize(const Size(1440, 900));
-  });
+  if (UniversalPlatform.isDesktop) {
+    await windowManager.ensureInitialized();
+    const windowOptions = WindowOptions(center: true,
+        minimumSize: Size(1440, 900),
+        titleBarStyle: TitleBarStyle.hidden);
+    await windowManager.waitUntilReadyToShow(windowOptions, () async {
+      await windowManager.show();
+      await windowManager.focus();
+      await windowManager.setSize(const Size(1440, 900));
+    });
 
-  print(windowManager.getDevicePixelRatio());
+  }
 
   runApp(
     Millimeters.fromView(
diff --git a/pubspec.lock b/pubspec.lock
index b105263..648a3a3 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -524,11 +524,9 @@ packages:
   minimize_app:
     dependency: "direct main"
     description:
-      path: "."
-      ref: HEAD
-      resolved-ref: "81b13e6cf3826943b061624e9090bc35d1b3501f"
-      url: "https://github.com/krjw-eyev/minimize_app_plugin.git"
-    source: git
+      path: "../minimize_app_plugin"
+      relative: true
+    source: path
     version: "1.0.0"
   package_config:
     dependency: transitive
diff --git a/pubspec.yaml b/pubspec.yaml
index 04c0171..272ffb1 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -58,8 +58,8 @@ dependency_overrides:
   #   path: ../flutter_gaze_interactive
   # skyle_api:
   #   path: ../dart_skyle_api
-  # minimize_app:
-  #   path: ../minimize_app_plugin
+  minimize_app:
+    path: ../minimize_app_plugin
 
 dev_dependencies:
   flutter_test: