Merge remote-tracking branch 'origin/stable' into stable

helomri · Oct 25, 2023 · 570f8f8 · 570f8f8
2 parents fca4d73 + 7619c86
commit 570f8f8
Show file tree

Hide file tree

Showing 88 changed files with 320 additions and 1,289 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,4 +1,4 @@
 [submodule ".flutter"]
 	path = .flutter
 	url = https://github.com/flutter/flutter.git
-	branch = stable
+	branch = beta
diff --git a/.vscode/launch.json b/.vscode/launch.json
diff --git a/.vscode/settings.json b/.vscode/settings.json
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
diff --git a/android/app/src/main/java/fr/theskyblockman/life_chest/MainActivity.java b/android/app/src/main/java/fr/theskyblockman/life_chest/MainActivity.java
@@ -66,4 +66,4 @@ protected void onResume() {
         super.onResume();
         NotificationManagerCompat.from(this).cancel(1);
     }
-}
+}
diff --git a/android/app/src/main/java/io/flutter/app/FlutterMultiDexApplication.java b/android/app/src/main/java/io/flutter/app/FlutterMultiDexApplication.java
diff --git a/android/app/src/main/res/drawable/ic_launcher_monochrome.xml b/android/app/src/main/res/drawable/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="@android:color/system_accent1_800"/>
+    <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="@android:color/system_accent1_800"/>
+  </group>
+</vector>
diff --git a/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -2,4 +2,5 @@
 <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"/>
+    <monochrome android:drawable="@drawable/ic_launcher"/>
 </adaptive-icon>
diff --git a/fastlane/metadata/android/en-US/images/icon.png b/fastlane/metadata/android/en-US/images/icon.png
diff --git a/fastlane/metadata/android/fr-FR/changelogs/10200.txt b/fastlane/metadata/android/fr-FR/changelogs/10200.txt
@@ -1,2 +1,2 @@
-- Bugs reglés et amelioration générale de la stabilité
+- Bugs reglés et amélioration générale de la stabilité
 - Mise a jour générale de qualité de vie
diff --git a/fastlane/metadata/android/fr-FR/changelogs/10201.txt b/fastlane/metadata/android/fr-FR/changelogs/10201.txt
@@ -1 +1 @@
-- Bugs reglés et amelioration générale de la stabilité
+- Bugs reglés et amélioration générale de la stabilité
diff --git a/fastlane/metadata/android/fr-FR/changelogs/10202.txt b/fastlane/metadata/android/fr-FR/changelogs/10202.txt
@@ -1 +1 @@
-- Bugs reglés et amelioration générale de la stabilité
+- Bugs reglés et amélioration générale de la stabilité
diff --git a/fastlane/metadata/android/fr-FR/changelogs/10300.txt b/fastlane/metadata/android/fr-FR/changelogs/10300.txt
@@ -1 +1 @@
-- Bugs reglés et amelioration générale de la stabilité. Le lecteur vidéo est maintenant stable même si il est moins sécurisé mais assez pour être utilisé.
+- Bugs reglés et amélioration générale de la stabilité. Le lecteur vidéo est maintenant stable même si il est moins sécurisé mais assez pour être utilisé.
diff --git a/fastlane/metadata/android/fr-FR/images/icon.png b/fastlane/metadata/android/fr-FR/images/icon.png
diff --git a/ios/.gitignore b/ios/.gitignore
diff --git a/ios/Flutter/AppFrameworkInfo.plist b/ios/Flutter/AppFrameworkInfo.plist
diff --git a/ios/Flutter/Debug.xcconfig b/ios/Flutter/Debug.xcconfig
diff --git a/ios/Flutter/Release.xcconfig b/ios/Flutter/Release.xcconfig
-Original file line number
+Diff line change
@@ Expand Up / @@ -66,4 +66,4 @@ protected void onResume() { @@
             super.onResume();
             NotificationManagerCompat.from(this).cancel(1);
         }
-    }
+    }
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		- Bugs reglés et amelioration générale de la stabilité
		- Bugs reglés et amélioration générale de la stabilité