fix(android): rework the splashscreen implementation (#377)

Co-authored-by: jeremydolle <j.dolle@thecodingmachine.com>
thecodingmachine · Aug 25, 2023 · 380a342 · 380a342
1 parent 6590b8a
commit 380a342
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 32 deletions.
diff --git a/template/android/app/src/main/AndroidManifest.xml b/template/android/app/src/main/AndroidManifest.xml
@@ -11,27 +11,17 @@
       android:theme="@style/AppTheme"
     >
       <activity
-        android:name=".SplashActivity"
-        android:theme="@style/SplashTheme"
-        android:label="@string/app_name"
-        android:exported="true"
-      >
+          android:name=".MainActivity"
+          android:label="@string/app_name"
+          android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|screenSize|smallestScreenSize|uiMode"
+          android:launchMode="singleTask"
+          android:theme="@style/SplashTheme"
+          android:windowSoftInputMode="adjustResize"
+          android:exported="true">
         <intent-filter>
           <action android:name="android.intent.action.MAIN" />
           <category android:name="android.intent.category.LAUNCHER" />
         </intent-filter>
       </activity>
-
-      <activity
-        android:name=".MainActivity"
-        android:label="@string/app_name"
-        android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|screenSize|smallestScreenSize|uiMode"
-        android:launchMode="singleTask"
-        android:windowSoftInputMode="adjustResize"
-        android:exported="true">
-        <intent-filter>
-          <action android:name="android.intent.action.MAIN" />
-        </intent-filter>
-      </activity>
     </application>
 </manifest>
diff --git a/template/android/app/src/main/java/com/boilerplate/MainActivity.java b/template/android/app/src/main/java/com/boilerplate/MainActivity.java
@@ -4,6 +4,7 @@
 import com.facebook.react.ReactActivityDelegate;
 import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint;
 import com.facebook.react.defaults.DefaultReactActivityDelegate;
+import android.os.Bundle;
 
 public class MainActivity extends ReactActivity {
 
@@ -29,4 +30,10 @@ protected ReactActivityDelegate createReactActivityDelegate() {
         // If you opted-in for the New Architecture, we enable the Fabric Renderer.
         DefaultNewArchitectureEntryPoint.getFabricEnabled());
   }
+
+  @Override
+  protected void onCreate(Bundle savedInstance) {
+    super.onCreate(savedInstance);
+    setTheme(R.style.AppTheme);
+  }
 }
diff --git a/template/android/app/src/main/java/com/boilerplate/SplashActivity.java b/template/android/app/src/main/java/com/boilerplate/SplashActivity.java
diff --git a/template/android/app/src/main/res/drawable/splash_icon.png b/template/android/app/src/main/res/drawable/splash_icon.png