Merge pull request #139 from digital-scouts/develop

Develop

Author: JanneckLange

.gitignore

@@ -42,4 +42,4 @@ app.*.map.json
 .vscode/launch.json
 
 venv
-.cache_ggshield
+.cache_ggshield

.vscode/launch.json

@@ -5,7 +5,7 @@
             "name": "Android",
             "request": "launch",
             "type": "dart",
-            "deviceId": "sdk",
+            "deviceId": "emulator-5554",
             "args": [
                 "--dart-define=USE_LOGGING=true"
             ]
@@ -14,10 +14,8 @@
             "name": "iPhone",
             "request": "launch",
             "type": "dart",
-            "deviceId": "C753CEB2-6197-4AF9-AC44-617AD4D40DC7",
+            "deviceId": "29AA1963-EC2E-4DE0-969E-AA4737731BB4",
             "args": [
-                "--flavor",
-                "NaMi",
                 "--dart-define=USE_LOGGING=true"
             ]
         },
@@ -26,8 +24,6 @@
             "request": "launch",
             "type": "dart",
             "args": [
-                "--flavor",
-                "NaMi",
                 "--dart-define=USE_LOGGING=true"
             ]
         },

.vscode/settings.json

@@ -4,11 +4,21 @@
     ".github/workflows/flutter-app-build.yml"
   ],
   "[dart]": {
-      "editor.codeActionsOnSave": {
-          "source.fixAll": "always",
-          "source.organizeImports": "always",
-      }
+    "editor.codeActionsOnSave": {
+      "source.fixAll": "always",
+      "source.organizeImports": "always"
+    },
+    "editor.formatOnSave": true,
+    "editor.formatOnType": false,
+    "editor.defaultFormatter": "Dart-Code.dart-code",
+    "editor.rulers": [
+      80
+    ],
+    "editor.insertSpaces": true,
+    "editor.tabSize": 2,
+    "editor.detectIndentation": false
   },
-  "java.configuration.updateBuildConfiguration": "interactive",
-  "cSpell.enableFiletypes": ["!dart"]
-}
+  "dart.enableSdkFormatter": true,
+  "dart.lineLength": 80,
+  "dart.analysisExcludedFolders": [],
+}

android/app/build.gradle

@@ -27,13 +27,22 @@ android {
 
     namespace 'de.jlange.nami.app'
 
+    // TODO (try to remove later) Force resolution of androidx.core to compatible version
+    configurations.all {
+        resolutionStrategy {
+            force 'androidx.core:core:1.13.1'
+            force 'androidx.core:core-ktx:1.13.1'
+        }
+    }
+
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
+        coreLibraryDesugaringEnabled true
     }
 
     kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = '17'
     }
 
     sourceSets {
@@ -59,4 +68,12 @@ android {
 
 flutter {
     source '../..'
+}
+
+dependencies {
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.1.4'
+    
+    // Force compatible androidx.core version for AGP 8.4.2
+    implementation 'androidx.core:core:1.13.1'
+    implementation 'androidx.core:core-ktx:1.13.1'
 }

android/app/proguard-rules.pro

@@ -7,6 +7,16 @@
 -keep class io.flutter.embedding.** { *; }
 -keep class io.flutter.** { *; }
 
+# Benachrichtigungs-Icon behalten (wird über String-Referenz verwendet)
+-keep class **.R$drawable { 
+    public static final int ic_notification; 
+}
+
+# Ressourcen für Benachrichtigungen behalten
+-keepclassmembers class **.R$* {
+    public static <fields>;
+}
+
 -dontwarn com.google.android.play.core.splitcompat.SplitCompatApplication
 -dontwarn com.google.android.play.core.splitinstall.SplitInstallException
 -dontwarn com.google.android.play.core.splitinstall.SplitInstallManager

android/app/src/main/AndroidManifest.xml

@@ -1,6 +1,10 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
   <uses-permission android:name="android.permission.INTERNET" />
+  <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
+  <uses-permission android:name="android.permission.USE_BIOMETRIC" />
+  <uses-permission android:name="android.permission.WAKE_LOCK" />
+  <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
 
   <queries>
     <!-- If your app opens https URLs -->
@@ -20,7 +24,19 @@
     </intent>
   </queries>
 
-  <application android:label="nami" android:icon="@mipmap/launcher_icon" android:allowBackup="false">
+  <application android:label="NaMi" android:icon="@mipmap/ic_launcher"
+    android:roundIcon="@mipmap/ic_launcher_round" android:allowBackup="false">
+    <receiver android:exported="false"
+      android:name="com.dexterous.flutterlocalnotifications.ScheduledNotificationReceiver" />
+    <receiver android:exported="false"
+      android:name="com.dexterous.flutterlocalnotifications.ScheduledNotificationBootReceiver">
+      <intent-filter>
+        <action android:name="android.intent.action.BOOT_COMPLETED" />
+        <action android:name="android.intent.action.MY_PACKAGE_REPLACED" />
+        <action android:name="android.intent.action.QUICKBOOT_POWERON" />
+        <action android:name="com.htc.intent.action.QUICKBOOT_POWERON" />
+      </intent-filter>
+    </receiver>
     <activity android:name=".MainActivity" android:launchMode="singleTop"
       android:screenOrientation="portrait"
       android:theme="@style/LaunchTheme"
@@ -49,5 +65,4 @@
              This is used by the Flutter tool to generate GeneratedPluginRegistrant.java -->
     <meta-data android:name="flutterEmbedding" android:value="2" />
   </application>
-  <uses-permission android:name="android.permission.USE_BIOMETRIC"/>
-</manifest>
+</manifest>