Merge branch 'develop' of https://github.com/NO-ob/LoliSnatcher_Droid

Author: NO-ob

.fvmrc

@@ -1,5 +1,5 @@
 {
-  "flutter": "3.29.2",
+  "flutter": "3.32.4",
   "runPubGetOnSdkChanges": true,
   "updateVscodeSettings": true,
   "updateGitIgnore": true

.gitignore

@@ -23,7 +23,7 @@
 
 # Flutter/Dart/Pub related
 **/doc/api/
-.dart_tool/
+/.dart_tool/
 .flutter-plugins
 .flutter-plugins-dependencies
 .packages
@@ -35,20 +35,23 @@
 /lib/generated/
 
 # Web related
-lib/generated_plugin_registrant.dart
+/lib/generated_plugin_registrant.dart
 
 # Windows related
-windows/flutter/generated_plugin_registrant.cc
-windows/flutter/generated_plugin_registrant.h
+/windows/flutter/generated_plugin_registrant.cc
+/windows/flutter/generated_plugin_registrant.h
 
 # Exceptions to above rules.
 !/packages/flutter_tools/test/data/dart_dependencies_test/**/.packages
 /ios/
 
 # FVM files
-.fvm/
+/.fvm/
 
 # Secret variables
 /config/secrets.json
 
+# Private
+/shortcuts/
+Notes.txt
 

analysis_options.yaml

@@ -17,9 +17,13 @@ analyzer:
   exclude:
     - lib/generated_plugin_registrant.dart
 
+formatter:
+  page_width: 120
+  trailing_commas: preserve
+
 linter:
   rules:
-    # TODO some are set to false, because right now they are not useful, but could be later
+    # TODO some are set to false, but could be useful later
     always_declare_return_types: true
     always_put_required_named_parameters_first: true
     always_use_package_imports: true
@@ -74,8 +78,8 @@ linter:
     exhaustive_cases: true
     file_names: true
     hash_and_equals: true
-    implicit_call_tearoffs: true
     implementation_imports: true
+    implicit_call_tearoffs: true
     implicit_reopen: true
     invalid_case_patterns: true
     join_return_with_assignment: true
@@ -151,8 +155,8 @@ linter:
     type_init_formals: true
     unawaited_futures: true
     unnecessary_await_in_return: true
-    # unnecessary_breaks: true # fluter/dart doesn't have case fallthrough in switches after dart 3.0
     unnecessary_brace_in_string_interps: true
+    unnecessary_breaks: false # fluter/dart doesn't have case fallthrough in switches after dart 3.0
     unnecessary_const: true
     unnecessary_constructor_name: true
     unnecessary_getters_setters: true

android/app/build.gradle

@@ -100,9 +100,12 @@ android {
         }
 
         debug {
-            signingConfig signingConfigs.debug
+            signingConfig keystoreProperties['storeFile'] ? signingConfigs.release : signingConfigs.debug
         }
     }
+    buildFeatures {
+        buildConfig true
+    }
 }
 
 flutter {

android/app/src/main/AndroidManifest.xml

@@ -57,10 +57,19 @@
             android:name="flutterEmbedding"
             android:value="2" />
 
-        <!-- Disable impeller -->
-        <!-- in 3.29 it's mostly fine, but there are still some flickering/artifacts on videos and when changing pages in viewer -->
+        <!-- Disable Impeller -->
+        <!-- in 3.32 there is a noticeable performance drop, permanent 100% gpu use (at least on xiaomi devices) -->
+        <!-- Possibly need to do a global performance pass? (always scale images (aside from main in viewer), cache widgets...) -->
         <meta-data
             android:name="io.flutter.embedding.android.EnableImpeller"
             android:value="false" />
+
+        <!-- <meta-data
+            android:name="io.flutter.embedding.android.EnablePlatformIsolates"
+            android:value="false" /> Makes every plain isolate run in its own thread -->
+
+        <!-- <meta-data
+            android:name="io.flutter.embedding.android.DisableMergedPlatformUIThread"
+            android:value="true" /> Makes service isolate run in a separate thread -->
     </application>
 </manifest>

android/app/src/main/kotlin/com/noaisu/loliSnatcher/MainActivity.kt

@@ -1,4 +1,3 @@
 org.gradle.jvmargs=-Xmx1536M
 android.useAndroidX=true
 android.enableJetifier=true
-android.defaults.buildfeatures.buildconfig=true

android/gradle.properties

@@ -2,6 +2,6 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true

android/gradle/wrapper/gradle-wrapper.properties

@@ -19,7 +19,7 @@ pluginManagement {
 
 plugins {
     id "dev.flutter.flutter-plugin-loader" version "1.0.0"
-    id "com.android.application" version '8.7.1' apply false
+    id "com.android.application" version '8.10.0' apply false
     id "org.jetbrains.kotlin.android" version "1.9.0" apply false
 }
 

android/settings.gradle

@@ -5,8 +5,27 @@ source scripts/select.sh
 selected_item=0
 menu_items=("Testing" "Github" "Store")
 title="Select a build type (arrow keys to select, enter to confirm):"
-run_menu "$title" "$selected_item" "${menu_items[@]}"
-menu_result="$?"
+
+if [ -z "$1" ]; then
+    run_menu "$title" "$selected_item" "${menu_items[@]}"
+    menu_result="$?"
+else
+    case "$1" in
+        "testing" | "test" | "debug")
+            menu_result=0
+            ;;
+        "github" | "gh")
+            menu_result=1
+            ;;
+        "store" | "release")
+            menu_result=2
+            ;;
+        *)
+            echo "Invalid option: $1" >&2
+            exit 1
+            ;;
+    esac
+fi
 
 echo
 
@@ -17,22 +36,22 @@ build_extras="--dart-define-from-file=./config/secrets.json"
 suffix="test"
 case "$menu_result"
 in
-	0)
-		build_arg="LS_IS_TESTING=true"
+    0)
+        build_arg="LS_IS_TESTING=true"
         build_desc="Testing"
-		suffix="test"
-		;;
-	1)
-		build_arg="LS_IS_STORE=false"
+        suffix="test"
+        ;;
+    1)
+        build_arg="LS_IS_STORE=false"
         build_desc="Github"
-		suffix="github"
-		;;
-	2)
-		build_arg="LS_IS_STORE=true"
+        suffix="github"
+        ;;
+    2)
+        build_arg="LS_IS_STORE=true"
         build_desc="Store"
-		build_mode="appbundle"
-		suffix="store"
-		;;
+        build_mode="appbundle"
+        suffix="store"
+        ;;
 esac
 
 clear
@@ -44,23 +63,23 @@ sh gen_config.sh
 # Check if fvm is installed
 fvmAvailalble=false
 if command -v fvm &> /dev/null; then
-	fvmAvailalble=true
+    fvmAvailalble=true
 fi
 
 if [ "$fvmAvailalble" = true ]; then
-	if fvm flutter pub get && fvm flutter build $build_mode --release --dart-define=$build_arg $build_extras ; then
-		echo "Build succeeded"
-	else
-		echo "Build failed"
-		exit 1
-	fi
+    if fvm flutter pub get && fvm flutter build $build_mode --release --dart-define=$build_arg $build_extras ; then
+        echo "Build succeeded"
+    else
+        echo "Build failed"
+        exit 1
+    fi
 else
-	if flutter pub get && flutter build $build_mode --release --dart-define=$build_arg $build_extras ; then
-		echo "Build succeeded"
-	else
-		echo "Build failed"
-		exit 1
-	fi
+    if flutter pub get && flutter build $build_mode --release --dart-define=$build_arg $build_extras ; then
+        echo "Build succeeded"
+    else
+        echo "Build failed"
+        exit 1
+    fi
 fi
 
 get_version_and_build() {
@@ -72,26 +91,26 @@ get_version_and_build() {
 get_version_and_build
 
 if [ "$build_mode" = "appbundle" ]; then
-	src_aab="build/app/outputs/bundle/release/app-release.aab"
+    src_aab="build/app/outputs/bundle/release/app-release.aab"
     dest_aab="build/app/outputs/bundle/release/LoliSnatcher_${version}_${build}_appbundle_${suffix}.aab"
     cp "$src_aab" "$dest_aab"
 
-	echo
+    echo
     echo "=> Built AAB: LoliSnatcher_${version}_${build}_appbundle_${suffix}.aab"
 else
-	srcv8_apk="build/app/outputs/flutter-apk/app-arm64-v8a-release.apk"
-	destv8_apk="build/app/outputs/flutter-apk/LoliSnatcher_${version}_${build}_arm64-v8a_${suffix}.apk"
-	cp "$srcv8_apk" "$destv8_apk"
+    srcv8_apk="build/app/outputs/flutter-apk/app-arm64-v8a-release.apk"
+    destv8_apk="build/app/outputs/flutter-apk/LoliSnatcher_${version}_${build}_arm64-v8a_${suffix}.apk"
+    cp "$srcv8_apk" "$destv8_apk"
 
-	srcv7_apk="build/app/outputs/flutter-apk/app-armeabi-v7a-release.apk"
-	destv7_apk="build/app/outputs/flutter-apk/LoliSnatcher_${version}_${build}_armeabi-v7a_${suffix}.apk"
-	cp "$srcv7_apk" "$destv7_apk"
+    srcv7_apk="build/app/outputs/flutter-apk/app-armeabi-v7a-release.apk"
+    destv7_apk="build/app/outputs/flutter-apk/LoliSnatcher_${version}_${build}_armeabi-v7a_${suffix}.apk"
+    cp "$srcv7_apk" "$destv7_apk"
 
-	src64_apk="build/app/outputs/flutter-apk/app-x86_64-release.apk"
-	dest64_apk="build/app/outputs/flutter-apk/LoliSnatcher_${version}_${build}_x86_64_${suffix}.apk"
-	cp "$src64_apk" "$dest64_apk"
+    src64_apk="build/app/outputs/flutter-apk/app-x86_64-release.apk"
+    dest64_apk="build/app/outputs/flutter-apk/LoliSnatcher_${version}_${build}_x86_64_${suffix}.apk"
+    cp "$src64_apk" "$dest64_apk"
 
-	echo
-	echo "=> Built APKs: LoliSnatcher_${version}_${build}_[arch]_${suffix}.apk"
+    echo
+    echo "=> Built APKs: LoliSnatcher_${version}_${build}_[arch]_${suffix}.apk"
 fi