Update android files

.metadata

@@ -15,9 +15,24 @@ migration:
     - 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
 

android/.gitignore

@@ -7,7 +7,7 @@ gradle-wrapper.jar
 GeneratedPluginRegistrant.java
 
 # Remember to never publicly share your keystore.
-# See https://flutter.dev/docs/deployment/android#reference-the-keystore-from-the-app
+# See https://flutter.dev/to/reference-keystore
 key.properties
 **/*.keystore
 **/*.jks

android/app/build.gradle

@@ -1,71 +1,44 @@
-def localProperties = new Properties()
+plugins {
-def localPropertiesFile = rootProject.file('local.properties')
+    id "com.android.application"
-if (localPropertiesFile.exists()) {
+    id "kotlin-android"
-    localPropertiesFile.withReader('UTF-8') { reader ->
+    // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins.
-        localProperties.load(reader)
+    id "dev.flutter.flutter-gradle-plugin"
 }
-}
-
-def flutterRoot = localProperties.getProperty('flutter.sdk')
-if (flutterRoot == null) {
-    throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
-}
-
-def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
-if (flutterVersionCode == null) {
-    flutterVersionCode = '1'
-}
-
-def flutterVersionName = localProperties.getProperty('flutter.versionName')
-if (flutterVersionName == null) {
-    flutterVersionName = '1.0'
-}
-
-apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
-apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion flutter.compileSdkVersion
+    namespace = "com.example.sheetless"
-    ndkVersion flutter.ndkVersion
+    compileSdk = flutter.compileSdkVersion
+    ndkVersion = flutter.ndkVersion
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
     }
 
     kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = JavaVersion.VERSION_1_8
-    }
-
-    sourceSets {
-        main.java.srcDirs += 'src/main/kotlin'
     }
 
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
-        applicationId "com.example.sheetless"
+        applicationId = "com.example.sheetless"
         // You can update the following values to match your application needs.
-        // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
+        // For more information, see: https://flutter.dev/to/review-gradle-config.
-        minSdkVersion flutter.minSdkVersion
+        minSdk = flutter.minSdkVersion
-        targetSdkVersion flutter.targetSdkVersion
+        targetSdk = flutter.targetSdkVersion
-        versionCode flutterVersionCode.toInteger()
+        versionCode = flutter.versionCode
-        versionName flutterVersionName
+        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.debug
+            signingConfig = signingConfigs.debug
         }
     }
 }
 
 flutter {
-    source '../..'
+    source = "../.."
-}
-
-dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 }

android/app/src/debug/AndroidManifest.xml

@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-    package="com.example.sheetless">
     <!-- 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.

android/app/src/main/AndroidManifest.xml

@@ -1,10 +1,5 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-          package="com.example.sheetless">
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
-    <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE"/>
     <application
-        android:requestLegacyExternalStorage="true"
         android:label="sheetless"
         android:name="${applicationName}"
         android:icon="@mipmap/ic_launcher">
@@ -12,6 +7,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"
@@ -35,4 +31,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>

android/app/src/main/kotlin/com/example/sheetless/MainActivity.kt

@@ -2,5 +2,4 @@ package com.example.sheetless
 
 import io.flutter.embedding.android.FlutterActivity
 
-class MainActivity: FlutterActivity() {
+class MainActivity: FlutterActivity()
-}

android/app/src/profile/AndroidManifest.xml

@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-    package="com.example.sheetless">
     <!-- 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.

android/build.gradle

@@ -1,16 +1,3 @@
-buildscript {
-    ext.kotlin_version = '1.7.10'
-    repositories {
-        google()
-        mavenCentral()
-    }
-
-    dependencies {
-        classpath 'com.android.tools.build:gradle:7.2.0'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-    }
-}
-
 allprojects {
     repositories {
         google()
@@ -18,14 +5,14 @@ allprojects {
     }
 }
 
-rootProject.buildDir = '../build'
+rootProject.buildDir = "../build"
 subprojects {
     project.buildDir = "${rootProject.buildDir}/${project.name}"
 }
 subprojects {
-    project.evaluationDependsOn(':app')
+    project.evaluationDependsOn(":app")
 }
 
-task clean(type: Delete) {
+tasks.register("clean", Delete) {
     delete rootProject.buildDir
 }

android/gradle.properties

@@ -1,3 +1,3 @@
-org.gradle.jvmargs=-Xmx1536M
+org.gradle.jvmargs=-Xmx4G -XX:MaxMetaspaceSize=2G -XX:+HeapDumpOnOutOfMemoryError
 android.useAndroidX=true
 android.enableJetifier=true

android/gradle/wrapper/gradle-wrapper.properties

@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip

android/settings.gradle

@@ -1,11 +1,25 @@
-include ':app'
+pluginManagement {
-
+    def flutterSdkPath = {
-def localPropertiesFile = new File(rootProject.projectDir, "local.properties")
         def properties = new Properties()
-
+        file("local.properties").withInputStream { properties.load(it) }
-assert localPropertiesFile.exists()
-localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) }
-
         def flutterSdkPath = properties.getProperty("flutter.sdk")
         assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
-apply from: "$flutterSdkPath/packages/flutter_tools/gradle/app_plugin_loader.gradle"
+        return 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.1.0" apply false
+    id "org.jetbrains.kotlin.android" version "1.8.22" apply false
+}
+
+include ":app"

flake.nix

@@ -20,23 +20,99 @@
             allowUnfree = true;
           };
         };
-        buildToolsVersion = "33.0.2";
+
         androidComposition = pkgs.androidenv.composeAndroidPackages {
-          buildToolsVersions = [ buildToolsVersion ];
+          buildToolsVersions = [
-          platformVersions = [ "33" ];
+            "34.0.0"
-          abiVersions = [ "arm64-v8a" ];
+            "33.0.1"
+          ];
+          platformVersions = [
+            "28"
+            "29"
+            "30"
+            "31"
+            "32"
+            "33"
+            "34"
+          ];
+          abiVersions = [
+            "armeabi-v7a"
+            "arm64-v8a"
+          ];
+          includeNDK = true;
+          ndkVersions = [ "25.1.8937393" ];
         };
+        # androidComposition = pkgs.androidenv.composeAndroidPackages {
+        #   toolsVersion = "26.1.1";
+        #   platformToolsVersion = "34.0.5";
+        #   buildToolsVersions = [ "30.0.3" ];
+        #   includeEmulator = false;
+        #   emulatorVersion = "34.1.9";
+        #   platformVersions = [
+        #     "28"
+        #     "29"
+        #     "30"
+        #     "31"
+        #     "32"
+        #     "33"
+        #     "34"
+        #   ];
+        #   includeSources = false;
+        #   includeSystemImages = false;
+        #   systemImageTypes = [ "google_apis_playstore" ];
+        #   abiVersions = [
+        #     "armeabi-v7a"
+        #     "arm64-v8a"
+        #   ];
+        #   cmakeVersions = [ "3.10.2" ];
+        #   includeNDK = true;
+        #   ndkVersions = [ "21.4.7075529" ];
+        #   useGoogleAPIs = false;
+        #   useGoogleTVAddOns = false;
+        #   # buildToolsVersions = [ buildToolsVersion ];
+        #   # platformVersions = [
+        #   #   "29"
+        #   #   "30"
+        #   #   "31"
+        #   #   "32"
+        #   #   "33"
+        #   #   "34"
+        #   #   "28"
+        #   # ];
+        #   # abiVersions = [
+        #   #   "armeabi-v7a"
+        #   #   "arm64-v8a"
+        #   # ];
+        # };
         androidSdk = androidComposition.androidsdk;
+        platformTools = androidComposition.platform-tools;
       in
       {
         devShell =
           with pkgs;
           mkShell rec {
             ANDROID_SDK_ROOT = "${androidSdk}/libexec/android-sdk";
+            # JAVA_HOME = pkgs.jdk17;
             buildInputs = [
               flutter
               androidSdk
-              jdk11
+              # platformTools
+              jdk17
+
+              # Needed by flutter_secure_storage
+              libsecret.dev
+              gtk3.dev
+              pcre2.dev
+              libsysprof-capture
+              util-linux.dev
+              libselinux.dev
+              libsepol.dev
+              libthai.dev
+              libgcrypt.dev
+              libdatrie.dev
+              libgpg-error.dev
+              xorg.libXdmcp.dev
+              pkg-config
             ];
           };
       }

pubspec.lock

@@ -424,14 +424,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.28.0"
-  saf:
-    dependency: "direct main"
-    description:
-      name: saf
-      sha256: "3b7565638bc155801dc2b1b948ee0545f8cf9310da6e0f4ded45f62ee83f1321"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.0.3+4"
   sky_engine:
     dependency: transitive
     description: flutter

pubspec.yaml

@@ -38,7 +38,6 @@ dependencies:
 
   path: ^1.8.2
   pdfx: ^2.3.0
-  saf: ^1.0.3+4
   permission_handler: ^10.2.0
   http: ^1.2.2
   path_provider: ^2.1.5