fix(android): prevent multiple splash screens from appearing on Andro…

…id 12
JagandeepBrar · Mar 17, 2022 · 26523e5 · 26523e5
1 parent cd9a3d2
commit 26523e5
Show file tree

Hide file tree

Showing 9 changed files with 29 additions and 14 deletions.
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
@@ -24,10 +24,6 @@
               android:name="io.flutter.embedding.android.NormalTheme"
               android:resource="@style/NormalTheme"
               />
-            <meta-data
-              android:name="io.flutter.embedding.android.SplashScreenDrawable"
-              android:resource="@drawable/launch_background"
-              />
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>

diff --git a/android/app/src/main/res/values-v31/styles.xml b/android/app/src/main/res/values-v31/styles.xml
@@ -2,6 +2,7 @@
 <resources>
     <!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is off -->
     <style name="LaunchTheme" parent="@android:style/Theme.Black.NoTitleBar">
+        <item name="android:forceDarkAllowed">false</item>
         <item name="android:windowFullscreen">false</item>
         <item name="android:windowSplashScreenBackground">#32323E</item>
     </style>

diff --git a/android/app/src/main/res/values/styles.xml b/android/app/src/main/res/values/styles.xml
@@ -5,6 +5,7 @@
         <!-- Show a splash screen on the activity. Automatically removed when
              Flutter draws its first frame -->
         <item name="android:windowBackground">@drawable/launch_background</item>
+        <item name="android:forceDarkAllowed">false</item>
         <item name="android:windowFullscreen">false</item>
     </style>
     <!-- Theme applied to the Android Window as soon as the process has started.

diff --git a/ios/Runner/Assets.xcassets/BrandingImage.imageset/Contents.json b/ios/Runner/Assets.xcassets/BrandingImage.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "BrandingImage.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "BrandingImage@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "BrandingImage@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/lib/core/system/filesystem/platform/platform_desktop.dart b/lib/core/system/filesystem/platform/platform_desktop.dart
@@ -42,7 +42,7 @@ class Desktop implements LunaFileSystem {
         } else {
           showLunaErrorSnackBar(
             title: 'lunasea.InvalidFileTypeSelected'.tr(),
-            message: 'lunasea.PleaseTryAgain'.tr(),
+            message: extensions.map((s) => '.$s').join(', '),
           );
         }
       }

diff --git a/lib/core/system/filesystem/platform/platform_mobile.dart b/lib/core/system/filesystem/platform/platform_mobile.dart
@@ -55,7 +55,7 @@ class Mobile implements LunaFileSystem {
         } else {
           showLunaErrorSnackBar(
             title: 'lunasea.InvalidFileTypeSelected'.tr(),
-            message: 'lunasea.PleaseTryAgain'.tr(),
+            message: extensions.map((s) => '.$s').join(', '),
           );
         }
       }

diff --git a/lib/modules/settings/routes/account/widgets/config_restore_tile.dart b/lib/modules/settings/routes/account/widgets/config_restore_tile.dart
@@ -66,7 +66,7 @@ class _State extends State<SettingsAccountRestoreConfigurationTile> {
       } else {
         showLunaErrorSnackBar(
           title: 'settings.RestoreFromCloudFailure'.tr(),
-          message: 'settings.IncorrectEncryptionKey'.tr(),
+          message: 'lunasea.IncorrectEncryptionKey'.tr(),
           showButton: true,
           buttonText: 'lunasea.Retry'.tr(),
           buttonOnPressed: () async => _decryptBackup(context, encrypted),

diff --git a/lib/modules/settings/routes/system/widgets/restore_tile.dart b/lib/modules/settings/routes/system/widgets/restore_tile.dart
@@ -44,7 +44,7 @@ class SettingsSystemBackupRestoreRestoreTile extends StatelessWidget {
       } else {
         showLunaErrorSnackBar(
           title: 'settings.RestoreFromCloudFailure'.tr(),
-          message: 'settings.IncorrectEncryptionKey'.tr(),
+          message: 'lunasea.IncorrectEncryptionKey'.tr(),
           showButton: true,
           buttonText: 'lunasea.Retry'.tr(),
           buttonOnPressed: () async => _decryptBackup(context, file),

diff --git a/macos/Podfile.lock b/macos/Podfile.lock
@@ -4,8 +4,6 @@ PODS:
     - Firebase/Firestore (~> 8.11.0)
     - firebase_core
     - FlutterMacOS
-  - file_selector_macos (0.0.1):
-    - FlutterMacOS
   - Firebase/Auth (8.11.0):
     - Firebase/CoreOnly
     - FirebaseAuth (~> 8.11.0)
@@ -127,7 +125,6 @@ PODS:
 
 DEPENDENCIES:
   - cloud_firestore (from `Flutter/ephemeral/.symlinks/plugins/cloud_firestore/macos`)
-  - file_selector_macos (from `Flutter/ephemeral/.symlinks/plugins/file_selector_macos/macos`)
   - firebase_auth (from `Flutter/ephemeral/.symlinks/plugins/firebase_auth/macos`)
   - firebase_core (from `Flutter/ephemeral/.symlinks/plugins/firebase_core/macos`)
   - firebase_messaging (from `Flutter/ephemeral/.symlinks/plugins/firebase_messaging/macos`)
@@ -161,8 +158,6 @@ SPEC REPOS:
 EXTERNAL SOURCES:
   cloud_firestore:
     :path: Flutter/ephemeral/.symlinks/plugins/cloud_firestore/macos
-  file_selector_macos:
-    :path: Flutter/ephemeral/.symlinks/plugins/file_selector_macos/macos
   firebase_auth:
     :path: Flutter/ephemeral/.symlinks/plugins/firebase_auth/macos
   firebase_core:
@@ -198,7 +193,6 @@ CHECKOUT OPTIONS:
 
 SPEC CHECKSUMS:
   cloud_firestore: aaecbaa2643ca4de74935d30d0eab5201268c44f
-  file_selector_macos: f1b08a781e66103e3ba279fd5d4024a2478b3af6
   Firebase: 44dd9724c84df18b486639e874f31436eaa9a20c
   firebase_auth: 09509665526e4e137aa4e79e5117155fc4560998
   firebase_core: 11d0b4e9fa6120706c015fbfe5f4b409758dae5d