1.4.0 Pre-release, sorry for a single commit, the technical changes o…

…bliged me to change everything at once. Waiting to see how flutter/flutter#147037 and miguelpruivo/flutter_file_picker#561 do before posting 1.4.0

LICENSE

@@ -1,4 +1,4 @@
-Copyright 2023 Haroun El Omri
+Copyright 2023-2024 Haroun El Omri
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

README.md

@@ -27,9 +27,4 @@ THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR I
 ## Credits
 - Thanks to Syncfusion for letting us use their software with their Open Source Community License. (NOTE: We are not using their software anymore because of their proprietary license)
 
-## Support
-I develop the Life Chest application in my free time, to support what I am doing, you can buy me a coffee!
-
-[![ko-fi](https://ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/N4N6N222N)
-
 :copyright: Haroun El Omri, 2023

android/app/build.gradle

@@ -1,3 +1,9 @@
+plugins {
+    id 'com.android.application'
+    id "kotlin-android"
+    id "dev.flutter.flutter-gradle-plugin"
+}
+
 def localProperties = new Properties()
 def localPropertiesFile = rootProject.file('local.properties')
 if (localPropertiesFile.exists()) {
@@ -6,11 +12,6 @@ if (localPropertiesFile.exists()) {
     }
 }
 
-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'
@@ -21,10 +22,6 @@ if (flutterVersionName == null) {
     flutterVersionName = '1.0'
 }
 
-apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
-apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
-
 def keystoreProperties = new Properties()
 def keystorePropertiesFile = rootProject.file('key.properties')
 if (keystorePropertiesFile.exists()) {
@@ -38,25 +35,21 @@ repositories {
 dependencies {
     //noinspection GradleDependency
     implementation 'com.github.prongbang:android-secure-biometric:0.0.6'
+
+    implementation 'com.android.support:multidex:2.0.1'
 }
 
 android {
     compileSdkVersion flutter.compileSdkVersion
-    ndkVersion flutter.ndkVersion
+    ndkVersion "25.1.8937393" //flutter.ndkVersion
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-
-    sourceSets {
-        main.java.srcDirs += 'src/main/kotlin'
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
 
     defaultConfig {
         applicationId "fr.theskyblockman.life_chest"
-        // 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.
         minSdkVersion 23
         targetSdkVersion flutter.targetSdkVersion
         versionCode flutterVersionCode.toInteger()
@@ -66,6 +59,8 @@ android {
             //noinspection ChromeOsAbiSupport
             abiFilters 'armeabi-v7a', 'arm64-v8a', 'x86_64'
         }
+
+        multiDexEnabled true
     }
 
     signingConfigs {
@@ -88,6 +83,7 @@ android {
             signingConfig signingConfigs.release
         }
     }
+
     namespace 'fr.theskyblockman.life_chest'
 }
 

android/app/src/main/AndroidManifest.xml

@@ -1,6 +1,7 @@
 <manifest xmlns:tools="http://schemas.android.com/tools"
     xmlns:android="http://schemas.android.com/apk/res/android">
 
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
     <uses-permission android:name="android.permission.VIBRATE" />
     <uses-permission android:name="android.permission.WAKE_LOCK"/>
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
@@ -13,7 +14,8 @@
         android:icon="@mipmap/ic_launcher"
         android:networkSecurityConfig="@xml/network_security_config"
         android:usesCleartextTraffic="true"
-        tools:targetApi="n">
+        tools:targetApi="n"
+        tools:ignore="ForegroundServicePermission">
         <activity
             android:name=".MainActivity"
             android:exported="true"
@@ -45,15 +47,13 @@
             </intent-filter>
         </service>
 
-        <!-- ADD THIS "RECEIVER" element -->
         <receiver android:name="com.ryanheise.audioservice.MediaButtonReceiver"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MEDIA_BUTTON" />
             </intent-filter>
         </receiver>
-        <!-- Don't delete the meta-data below.
-             This is used by the Flutter tool to generate GeneratedPluginRegistrant.java -->
+
         <meta-data
             android:name="flutterEmbedding"
             android:value="2" />

android/app/src/main/java/fr/theskyblockman/life_chest/MainActivity.java

@@ -2,13 +2,18 @@
 
 import static android.app.PendingIntent.*;
 
+import android.app.NotificationChannel;
+import android.app.NotificationManager;
 import android.app.PendingIntent;
 import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.os.Build;
 import android.os.Bundle;
 import android.view.WindowManager;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.core.app.ActivityCompat;
 import androidx.core.app.NotificationCompat;
 import androidx.core.app.NotificationManagerCompat;
 
@@ -27,18 +32,35 @@ public class MainActivity extends AudioServiceFragmentActivity {
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         getWindow().addFlags(WindowManager.LayoutParams.FLAG_SECURE);
+        createNotificationChannel();
         super.onCreate(savedInstanceState);
     }
 
+    private void createNotificationChannel() {
+        // Create the NotificationChannel, but only on API 26+ because
+        // the NotificationChannel class is not in the Support Library.
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            CharSequence name = getString(R.string.channel_name);
+            String description = getString(R.string.channel_description);
+            int importance = NotificationManager.IMPORTANCE_DEFAULT;
+            NotificationChannel channel = new NotificationChannel("theskyblockman.fr/notification_channel", name, importance);
+            channel.setDescription(description);
+            // Register the channel with the system; you can't change the importance
+            // or other notification behaviors after this.
+            NotificationManager notificationManager = getSystemService(NotificationManager.class);
+            notificationManager.createNotificationChannel(channel);
+        }
+    }
+
     @Override
     @SuppressWarnings("unchecked")
     public void configureFlutterEngine(@NonNull FlutterEngine flutterEngine) {
         super.configureFlutterEngine(flutterEngine);
         engine = flutterEngine;
-        channel = new MethodChannel(flutterEngine.getDartExecutor().getBinaryMessenger(),"theskyblockman.fr/channel");
+        channel = new MethodChannel(flutterEngine.getDartExecutor().getBinaryMessenger(), "theskyblockman.fr/channel");
 
         channel.setMethodCallHandler((call, result) -> {
-            if(Objects.equals(call.method, "sendVaultNotification")) {
+            if (Objects.equals(call.method, "sendVaultNotification")) {
                 Map<String, String> args = (Map<String, String>) call.arguments;
                 Intent tapIntent = new Intent(this, VaultCloseBroadcastReceiver.class);
                 PendingIntent pendingTapIntent = getBroadcast(this, 0, tapIntent, FLAG_IMMUTABLE);
@@ -49,6 +71,10 @@ public void configureFlutterEngine(@NonNull FlutterEngine flutterEngine) {
                         .setPriority(NotificationCompat.PRIORITY_HIGH)
                         .addAction(R.mipmap.ic_launcher, args.get("notification_close_button_content"), pendingTapIntent);
 
+                if (ActivityCompat.checkSelfPermission(this, android.Manifest.permission.POST_NOTIFICATIONS) != PackageManager.PERMISSION_GRANTED) {
+                    result.success(false);
+                    return;
+                }
                 NotificationManagerCompat.from(this).notify(1, builder.build());
                 result.success(true);
             }

android/app/src/main/res/drawable-anydpi-v26/ic_launcher_monochrome.xml

@@ -0,0 +1,19 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="12.7"
+    android:viewportHeight="12.7">
+  <group android:scaleX="0.5"
+      android:scaleY="0.5"
+      android:translateX="3.175"
+      android:translateY="3.175">
+    <path
+        android:pathData="M6.35,8.229C7.135,7.514 7.64,7.014 7.865,6.727c0.225,-0.287 0.337,-0.575 0.337,-0.867 0,-0.282 -0.099,-0.523 -0.298,-0.721 -0.198,-0.198 -0.439,-0.298 -0.721,-0.298 -0.168,0 -0.324,0.033 -0.47,0.099 -0.146,0.066 -0.267,0.157 -0.364,0.271 -0.097,-0.115 -0.218,-0.205 -0.364,-0.271 -0.146,-0.066 -0.302,-0.099 -0.47,-0.099 -0.282,0 -0.523,0.099 -0.721,0.298 -0.198,0.198 -0.298,0.439 -0.298,0.721 0,0.141 0.02,0.276 0.06,0.403 0.04,0.128 0.126,0.276 0.258,0.443 0.132,0.168 0.32,0.37 0.562,0.609 0.243,0.238 0.567,0.542 0.972,0.913z"
+        android:strokeWidth="0.0132292"
+        android:fillColor="#000000"/>
+    <path
+        android:pathData="m6.35,11.628c-1.235,-0.309 -2.249,-1.025 -3.043,-2.15 -0.794,-1.124 -1.191,-2.357 -1.191,-3.698v-3.149l4.233,-1.587 4.233,1.587v3.149c0,1.341 -0.397,2.573 -1.191,3.698 -0.794,1.124 -1.808,1.841 -3.043,2.15zM6.35,10.808c1.014,-0.335 1.841,-0.968 2.48,-1.898C9.47,7.979 9.79,6.936 9.79,5.781v-2.593l-3.44,-1.296 -3.44,1.296v2.593c0,1.155 0.32,2.198 0.959,3.129 0.639,0.93 1.466,1.563 2.48,1.898z"
+        android:strokeWidth="0.0132292"
+        android:fillColor="#000000"/>
+  </group>
+</vector>

android/app/src/main/res/drawable-v21/ic_launcher_monochrome.xml

@@ -0,0 +1,19 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="12.7"
+    android:viewportHeight="12.7">
+  <group android:scaleX="0.5"
+      android:scaleY="0.5"
+      android:translateX="3.175"
+      android:translateY="3.175">
+    <path
+        android:pathData="M6.35,8.229C7.135,7.514 7.64,7.014 7.865,6.727c0.225,-0.287 0.337,-0.575 0.337,-0.867 0,-0.282 -0.099,-0.523 -0.298,-0.721 -0.198,-0.198 -0.439,-0.298 -0.721,-0.298 -0.168,0 -0.324,0.033 -0.47,0.099 -0.146,0.066 -0.267,0.157 -0.364,0.271 -0.097,-0.115 -0.218,-0.205 -0.364,-0.271 -0.146,-0.066 -0.302,-0.099 -0.47,-0.099 -0.282,0 -0.523,0.099 -0.721,0.298 -0.198,0.198 -0.298,0.439 -0.298,0.721 0,0.141 0.02,0.276 0.06,0.403 0.04,0.128 0.126,0.276 0.258,0.443 0.132,0.168 0.32,0.37 0.562,0.609 0.243,0.238 0.567,0.542 0.972,0.913z"
+        android:strokeWidth="0.0132292"
+        android:fillColor="#000000"/>
+    <path
+        android:pathData="m6.35,11.628c-1.235,-0.309 -2.249,-1.025 -3.043,-2.15 -0.794,-1.124 -1.191,-2.357 -1.191,-3.698v-3.149l4.233,-1.587 4.233,1.587v3.149c0,1.341 -0.397,2.573 -1.191,3.698 -0.794,1.124 -1.808,1.841 -3.043,2.15zM6.35,10.808c1.014,-0.335 1.841,-0.968 2.48,-1.898C9.47,7.979 9.79,6.936 9.79,5.781v-2.593l-3.44,-1.296 -3.44,1.296v2.593c0,1.155 0.32,2.198 0.959,3.129 0.639,0.93 1.466,1.563 2.48,1.898z"
+        android:strokeWidth="0.0132292"
+        android:fillColor="#000000"/>
+  </group>
+</vector>

android/app/src/main/res/drawable-v21/launch_background.xml

@@ -1,11 +1,10 @@
-<?xml version="1.0" encoding="utf-8"?><!-- Modify this file to customize your launch splash screen -->
+<?xml version="1.0" encoding="utf-8"?>
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="?android:colorBackground" />
+    <item android:drawable="@color/ic_launcher_background" />
 
-    <!-- You can insert your own image assets here -->
-    <!-- <item>
+    <item>
         <bitmap
             android:gravity="center"
-            android:src="@mipmap/launch_image" />
-    </item> -->
+            android:src="@drawable/launch_image" />
+    </item>
 </layer-list>

android/app/src/main/res/drawable-v21/launch_image.xml

@@ -0,0 +1,20 @@
+
+        <vector xmlns:android="http://schemas.android.com/apk/res/android"
+            android:width="108dp"
+            android:height="108dp"
+            android:viewportWidth="12.7"
+            android:viewportHeight="12.7">
+            <group android:scaleX="0.5"
+                android:scaleY="0.5"
+                android:translateX="3.175"
+                android:translateY="3.175">
+                <path
+                    android:pathData="M6.35,8.229C7.135,7.514 7.64,7.014 7.865,6.727c0.225,-0.287 0.337,-0.575 0.337,-0.867 0,-0.282 -0.099,-0.523 -0.298,-0.721 -0.198,-0.198 -0.439,-0.298 -0.721,-0.298 -0.168,0 -0.324,0.033 -0.47,0.099 -0.146,0.066 -0.267,0.157 -0.364,0.271 -0.097,-0.115 -0.218,-0.205 -0.364,-0.271 -0.146,-0.066 -0.302,-0.099 -0.47,-0.099 -0.282,0 -0.523,0.099 -0.721,0.298 -0.198,0.198 -0.298,0.439 -0.298,0.721 0,0.141 0.02,0.276 0.06,0.403 0.04,0.128 0.126,0.276 0.258,0.443 0.132,0.168 0.32,0.37 0.562,0.609 0.243,0.238 0.567,0.542 0.972,0.913z"
+                    android:strokeWidth="0.0132292"
+                    android:fillColor="#d93235"/>
+                <path
+                    android:pathData="m6.35,11.628c-1.235,-0.309 -2.249,-1.025 -3.043,-2.15 -0.794,-1.124 -1.191,-2.357 -1.191,-3.698v-3.149l4.233,-1.587 4.233,1.587v3.149c0,1.341 -0.397,2.573 -1.191,3.698 -0.794,1.124 -1.808,1.841 -3.043,2.15zM6.35,10.808c1.014,-0.335 1.841,-0.968 2.48,-1.898C9.47,7.979 9.79,6.936 9.79,5.781v-2.593l-3.44,-1.296 -3.44,1.296v2.593c0,1.155 0.32,2.198 0.959,3.129 0.639,0.93 1.466,1.563 2.48,1.898z"
+                    android:strokeWidth="0.0132292"
+                    android:fillColor="#000000"/>
+            </group>
+        </vector>

android/app/src/main/res/drawable/launch_background.xml

@@ -1,11 +1,10 @@
-<?xml version="1.0" encoding="utf-8"?><!-- Modify this file to customize your launch splash screen -->
+<?xml version="1.0" encoding="utf-8"?>
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@android:color/white" />
+    <item android:drawable="@color/ic_launcher_background" />
 
-    <!-- You can insert your own image assets here -->
-    <!-- <item>
+    <item>
         <bitmap
             android:gravity="center"
-            android:src="@mipmap/launch_image" />
-    </item> -->
+            android:src="@drawable/launch_image" />
+    </item>
 </layer-list>

android/app/src/main/res/drawable/launch_image.xml

@@ -0,0 +1,20 @@
+
+        <vector xmlns:android="http://schemas.android.com/apk/res/android"
+            android:width="108dp"
+            android:height="108dp"
+            android:viewportWidth="12.7"
+            android:viewportHeight="12.7">
+            <group android:scaleX="0.5"
+                android:scaleY="0.5"
+                android:translateX="3.175"
+                android:translateY="3.175">
+                <path
+                    android:pathData="M6.35,8.229C7.135,7.514 7.64,7.014 7.865,6.727c0.225,-0.287 0.337,-0.575 0.337,-0.867 0,-0.282 -0.099,-0.523 -0.298,-0.721 -0.198,-0.198 -0.439,-0.298 -0.721,-0.298 -0.168,0 -0.324,0.033 -0.47,0.099 -0.146,0.066 -0.267,0.157 -0.364,0.271 -0.097,-0.115 -0.218,-0.205 -0.364,-0.271 -0.146,-0.066 -0.302,-0.099 -0.47,-0.099 -0.282,0 -0.523,0.099 -0.721,0.298 -0.198,0.198 -0.298,0.439 -0.298,0.721 0,0.141 0.02,0.276 0.06,0.403 0.04,0.128 0.126,0.276 0.258,0.443 0.132,0.168 0.32,0.37 0.562,0.609 0.243,0.238 0.567,0.542 0.972,0.913z"
+                    android:strokeWidth="0.0132292"
+                    android:fillColor="#d93235"/>
+                <path
+                    android:pathData="m6.35,11.628c-1.235,-0.309 -2.249,-1.025 -3.043,-2.15 -0.794,-1.124 -1.191,-2.357 -1.191,-3.698v-3.149l4.233,-1.587 4.233,1.587v3.149c0,1.341 -0.397,2.573 -1.191,3.698 -0.794,1.124 -1.808,1.841 -3.043,2.15zM6.35,10.808c1.014,-0.335 1.841,-0.968 2.48,-1.898C9.47,7.979 9.79,6.936 9.79,5.781v-2.593l-3.44,-1.296 -3.44,1.296v2.593c0,1.155 0.32,2.198 0.959,3.129 0.639,0.93 1.466,1.563 2.48,1.898z"
+                    android:strokeWidth="0.0132292"
+                    android:fillColor="#000000"/>
+            </group>
+        </vector>

android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@color/ic_launcher_background"/>
-    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
-</adaptive-icon>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+    <monochrome android:drawable="@mipmap/ic_launcher_monochrome"/>
+</adaptive-icon>

android/build.gradle

@@ -1,31 +1,27 @@
-buildscript {
-    ext.kotlin_version = '1.7.20'
-    repositories {
-        google()
-        mavenCentral()
-    }
-
-    dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.2'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-    }
-}
-
 allprojects {
     repositories {
         google()
         mavenCentral()
     }
 }
 
-rootProject.buildDir = '../build'
-subprojects {
-    project.buildDir = "${rootProject.buildDir}/${project.name}"
-}
+rootProject.getLayout().setBuildDirectory('../build')
+
 subprojects {
+    afterEvaluate { project ->
+        if (project.hasProperty('android')) {
+            project.android {
+                if (namespace == null) {
+                    namespace project.group
+                }
+            }
+        }
+    }
+
+    project.getLayout().setBuildDirectory("${rootProject.getLayout().getBuildDirectory().get().asFile.path}/${project.name}")
     project.evaluationDependsOn(':app')
 }
 
 tasks.register("clean", Delete) {
-    delete rootProject.buildDir
+    delete rootProject.getLayout().getBuildDirectory()
 }

android/gradle.properties

@@ -4,4 +4,4 @@ android.enableJetifier=true
 android.defaults.buildfeatures.buildconfig=true
 android.nonTransitiveRClass=false
 android.nonFinalResIds=false
-android.bundle.enableUncompressedNativeLibs=false
+kotlin.jvm.target.validation.mode = IGNORE

android/gradle/wrapper/gradle-wrapper.properties

@@ -2,5 +2,5 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-all.zip
-distributionSha256Sum=f30b29580fe11719087d698da23f3b0f0d04031d8995f7dd8275a31f7674dc01
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip
+distributionSha256Sum=194717442575a6f96e1c1befa2c30e9a4fc90f701d7aee33eb879b79e7ff05c0