Fix for #26

mehcode · Jan 21, 2017 · f8bfc54 · f8bfc54
1 parent 3cdbb18
commit f8bfc54
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 18 deletions.
diff --git a/android/src/main/java/com/mehcode/reactnative/splashscreen/SplashScreen.java b/android/src/main/java/com/mehcode/reactnative/splashscreen/SplashScreen.java
@@ -2,33 +2,59 @@
 
 import android.app.Activity;
 import android.app.Dialog;
+import android.graphics.Color;
+
+import com.facebook.react.ReactActivity;
+import com.facebook.react.ReactInstanceManager;
+import com.facebook.react.bridge.ReactContext;
 
 import java.lang.ref.WeakReference;
 
 public class SplashScreen {
     private static Dialog mSplashDialog;
-    private static WeakReference<Activity> mActivity;
+    private static WeakReference<ReactActivity> mActivity;
 
     /**
      * Show the splash screen.
      */
-    public static void show(final Activity activity) {
+    public static void show(final ReactActivity activity, final ReactInstanceManager instanceManager) {
         if (activity == null) return;
 
         // Store weak-reference to showing activity (in case we try to hide too early)
         // NOTE: For instance in direct execution of index.android.js
-        mActivity = new WeakReference<Activity>(activity);
+        mActivity = new WeakReference<ReactActivity>(activity);
 
         activity.runOnUiThread(new Runnable() {
             @Override
             public void run() {
                 if (!activity.isFinishing()) {
                     mSplashDialog = new Dialog(activity, R.style.RNSplashScreen_SplashTheme);
                     mSplashDialog.setCancelable(false);
-                    
+
                     if (!mSplashDialog.isShowing()) {
                         mSplashDialog.show();
                     }
+
+                    // If given an instance manager; ensure that we transition to the stage-2
+                    // splash screen
+                    // TODO: If you think of a better way to do this; PR please
+                    if (instanceManager != null) {
+                        // A non-null context means that we are resuming from a
+                        // background state and we will not get the context created event
+                        ReactContext ctx = instanceManager.getCurrentReactContext();
+                        if (ctx != null) {
+                            activity.getWindow().getDecorView().setBackgroundColor(Color.WHITE);
+                        } else {
+                            // Else; wait until react is initialized before we release the native splash
+                            instanceManager.addReactInstanceEventListener(new ReactInstanceManager.ReactInstanceEventListener() {
+                                @Override
+                                public void onReactContextInitialized(ReactContext context) {
+                                    // Hide the native splash screen
+                                    activity.getWindow().getDecorView().setBackgroundColor(Color.WHITE);
+                                }
+                            });
+                        }
+                    }
                 }
             }
         });

diff --git a/android/src/main/java/com/mehcode/reactnative/splashscreen/SplashScreenModule.java b/android/src/main/java/com/mehcode/reactnative/splashscreen/SplashScreenModule.java
@@ -1,5 +1,6 @@
 package com.mehcode.reactnative.splashscreen;
 
+import com.facebook.react.ReactActivity;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.bridge.ReactMethod;
@@ -19,7 +20,7 @@ public String getName() {
      */
     @ReactMethod
     public void show() {
-        SplashScreen.show(getCurrentActivity());
+        SplashScreen.show((ReactActivity)getCurrentActivity(), null);
     }
 
     /**

diff --git a/.../android/app/src/main/java/com/mehcode/reactnative/splashscreen/example/MainActivity.java b/.../android/app/src/main/java/com/mehcode/reactnative/splashscreen/example/MainActivity.java
@@ -12,16 +12,9 @@ public class MainActivity extends ReactActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         // Show the js-controlled splash screen
-        SplashScreen.show(this);
-
-        // After react is initialized; set our background color (override splash screen theme)
-        getReactNativeHost().getReactInstanceManager().addReactInstanceEventListener(new ReactInstanceManager.ReactInstanceEventListener() {
-            @Override
-            public void onReactContextInitialized(ReactContext context) {
-                // Hide the native splash screen
-                getWindow().getDecorView().setBackgroundColor(Color.WHITE);
-            }
-        });
+        // NOTE: It needs the react instance manager so it can listen to the react
+        //       context creation event and hide the native splash
+        SplashScreen.show(this, getReactInstanceManager());
 
         super.onCreate(savedInstanceState);
     }

diff --git a/example/android/app/src/main/res/drawable/splash.png b/example/android/app/src/main/res/drawable/splash.png
diff --git a/example/android/build.gradle b/example/android/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.1.2'
+        classpath 'com.android.tools.build:gradle:2.2.3'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

diff --git a/example/android/gradle/wrapper/gradle-wrapper.properties b/example/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Thu Jul 21 02:54:06 PDT 2016
+#Fri Jan 20 16:10:09 PST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip