[native] Configure expo-splash-screen for Android

CommE2E · Jun 5, 2020 · bcd544f · bcd544f
1 parent e4d0c1e
commit bcd544f
Show file tree

Hide file tree

Showing 9 changed files with 6 additions and 140 deletions.
diff --git a/native/android/app/src/main/java/org/squadcal/MainActivity.java b/native/android/app/src/main/java/org/squadcal/MainActivity.java
@@ -1,7 +1,6 @@
 package org.squadcal;
 
 import com.facebook.react.ReactFragmentActivity;
-import org.devio.rn.splashscreen.SplashScreen;
 import android.os.Bundle;
 import android.content.Intent;
 import android.content.res.Configuration;
@@ -10,6 +9,9 @@
 import com.facebook.react.ReactRootView;
 import com.swmansion.gesturehandler.react.RNGestureHandlerEnabledRootView;
 
+import expo.modules.splashscreen.SplashScreen;
+import expo.modules.splashscreen.SplashScreenImageResizeMode;
+
 public class MainActivity extends ReactFragmentActivity {
 
   /**
@@ -23,8 +25,8 @@ protected String getMainComponentName() {
 
   @Override
   protected void onCreate(Bundle savedInstanceState) {
-    SplashScreen.show(this);
-    super.onCreate(null);
+    super.onCreate(savedInstanceState);
+    SplashScreen.show(this, SplashScreenImageResizeMode.NATIVE, ReactRootView.class);
   }
 
   @Override

diff --git a/...roid/app/src/main/res/drawable/splash.xml → .../main/res/drawable/splashscreen_image.xml b/...roid/app/src/main/res/drawable/splash.xml → .../main/res/drawable/splashscreen_image.xml
diff --git a/native/android/app/src/main/res/layout-w481dp-xxhdpi/launch_screen.xml b/native/android/app/src/main/res/layout-w481dp-xxhdpi/launch_screen.xml
diff --git a/native/android/app/src/main/res/layout-w481dp-xxxhdpi/launch_screen.xml b/native/android/app/src/main/res/layout-w481dp-xxxhdpi/launch_screen.xml
diff --git a/native/android/app/src/main/res/layout-w801dp-xhdpi/launch_screen.xml b/native/android/app/src/main/res/layout-w801dp-xhdpi/launch_screen.xml
diff --git a/native/android/app/src/main/res/layout-w801dp/launch_screen.xml b/native/android/app/src/main/res/layout-w801dp/launch_screen.xml
diff --git a/native/android/app/src/main/res/layout-w961dp-hdpi/launch_screen.xml b/native/android/app/src/main/res/layout-w961dp-hdpi/launch_screen.xml
diff --git a/native/android/app/src/main/res/layout/launch_screen.xml b/native/android/app/src/main/res/layout/launch_screen.xml
diff --git a/native/android/app/src/main/res/values/styles.xml b/native/android/app/src/main/res/values/styles.xml
@@ -5,7 +5,7 @@
   <style name="SplashTheme" parent="Theme.AppCompat.Light.NoActionBar">
     <item name="android:textColor">#000000</item>
     <item name="android:windowNoTitle">true</item>
-    <item name="android:background">@drawable/splash</item>
+    <item name="android:background">@drawable/splashscreen_image</item>
     <item name="android:windowDrawsSystemBarBackgrounds">false</item>
   </style>
 </resources>