android: splash, removed singleton, dependency injection, fixed e2e

android/app/src/main/java/com/reactnativenavigation/controllers/NavigationActivity.java

@@ -11,10 +11,10 @@ import com.facebook.react.ReactPackage;
 import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.modules.core.DefaultHardwareBackBtnHandler;
 import com.facebook.react.shell.MainReactPackage;
-import com.reactnativenavigation.R;
 import com.reactnativenavigation.react.NavigationEventEmitter;
 import com.reactnativenavigation.react.NavigationPackage;
 import com.reactnativenavigation.react.ReactDevPermission;
+import com.reactnativenavigation.views.NavigationSplashView;
 
 import java.util.Arrays;
 import java.util.List;
@@ -26,7 +26,8 @@ public class NavigationActivity extends AppCompatActivity implements DefaultHard
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.splash);
+        setContentView(new NavigationSplashView(this));
+
         host = new ReactNativeHost(getApplication()) {
             @Override
             protected boolean getUseDeveloperSupport() {
@@ -37,7 +38,7 @@ public class NavigationActivity extends AppCompatActivity implements DefaultHard
             protected List<ReactPackage> getPackages() {
                 return Arrays.asList(
                         new MainReactPackage(),
-                        new NavigationPackage()
+                        new NavigationPackage(NavigationActivity.this)
                 );
             }
         };
@@ -69,20 +70,24 @@ public class NavigationActivity extends AppCompatActivity implements DefaultHard
             ReactDevPermission.askPermission(this);
         } else {
             host.getReactInstanceManager().createReactContextInBackground();
+            host.getReactInstanceManager().onHostResume(this, this);
         }
-        host.getReactInstanceManager().onHostResume(this, this);
     }
 
     @Override
     protected void onPause() {
         super.onPause();
-        host.getReactInstanceManager().onHostPause(this);
+        if (host.getReactInstanceManager().hasStartedCreatingInitialContext()) {
+            host.getReactInstanceManager().onHostPause(this);
+        }
     }
 
     @Override
     protected void onDestroy() {
         super.onDestroy();
-        host.getReactInstanceManager().onHostDestroy(this);
+        if (host.getReactInstanceManager().hasStartedCreatingInitialContext()) {
+            host.getReactInstanceManager().onHostDestroy(this);
+        }
     }
 
     @Override

android/app/src/main/java/com/reactnativenavigation/controllers/NavigationApplication.java

@@ -1,14 +1,22 @@
 package com.reactnativenavigation.controllers;
 
 import android.app.Application;
+import android.os.Handler;
+import android.os.Looper;
 
 public abstract class NavigationApplication extends Application {
     public static NavigationApplication instance;
+    private Handler handler;
 
     @Override
     public void onCreate() {
         super.onCreate();
         instance = this;
+        handler = new Handler(Looper.getMainLooper());
+    }
+
+    public void runOnUiThread(Runnable runnable) {
+        handler.post(runnable);
     }
 
     public abstract boolean isDebug();

android/app/src/main/java/com/reactnativenavigation/react/NavigationModule.java

@@ -11,6 +11,7 @@ import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.bridge.ReadableMapKeySetIterator;
 import com.reactnativenavigation.controllers.NavigationActivity;
+import com.reactnativenavigation.controllers.NavigationApplication;
 import com.reactnativenavigation.layout.LayoutFactory;
 import com.reactnativenavigation.layout.LayoutNode;
 import com.reactnativenavigation.layout.StackLayout;
@@ -21,10 +22,12 @@ import java.util.HashMap;
 import java.util.Map;
 
 public class NavigationModule extends ReactContextBaseJavaModule {
-    public static final String NAME = "RNNBridgeModule";
+    private static final String NAME = "RNNBridgeModule";
+    private final NavigationActivity activity;
 
-    public NavigationModule(ReactApplicationContext reactContext) {
-        super(reactContext);
+    public NavigationModule(ReactApplicationContext context, NavigationActivity activity) {
+        super(context);
+        this.activity = activity;
     }
 
     @Override
@@ -34,30 +37,35 @@ public class NavigationModule extends ReactContextBaseJavaModule {
 
     @ReactMethod
     public void setRoot(final ReadableMap layoutTree) {
-        getActivity().runOnUiThread(new Runnable() {
+        NavigationApplication.instance.runOnUiThread(new Runnable() {
             @Override
             public void run() {
-                LayoutFactory factory =
-                        new LayoutFactory(getActivity(), new LayoutFactory.ReactRootViewCreator() {
-                            @Override
-                            public View create(String id, String name) {
-                                ReactRootView rootView = new ReactRootView(getActivity());
-                                Bundle opts = new Bundle();
-                                opts.putString("id", id);
-                                rootView.startReactApplication(getActivity().getHost().getReactInstanceManager(), name, opts);
-                                return rootView;
-                            }
-                        }, new BottomTabsCreator());
-
-                final LayoutNode layoutTreeRoot = readableMapToLayoutNode(layoutTree);
-                final View rootView = factory.create(layoutTreeRoot);
-                getActivity().setContentView(rootView);
+                getActivity().runOnUiThread(new Runnable() {
+                    @Override
+                    public void run() {
+                        LayoutFactory factory =
+                                new LayoutFactory(getActivity(), new LayoutFactory.ReactRootViewCreator() {
+                                    @Override
+                                    public View create(String id, String name) {
+                                        ReactRootView rootView = new ReactRootView(getActivity());
+                                        Bundle opts = new Bundle();
+                                        opts.putString("id", id);
+                                        rootView.startReactApplication(getActivity().getHost().getReactInstanceManager(), name, opts);
+                                        return rootView;
+                                    }
+                                }, new BottomTabsCreator());
+
+                        final LayoutNode layoutTreeRoot = readableMapToLayoutNode(layoutTree);
+                        final View rootView = factory.create(layoutTreeRoot);
+                        getActivity().setContentView(rootView);
+                    }
+                });
             }
         });
     }
 
     private NavigationActivity getActivity() {
-        return (NavigationActivity) getCurrentActivity();
+        return activity;
     }
 
     @ReactMethod

android/app/src/main/java/com/reactnativenavigation/react/NavigationPackage.java

@@ -5,6 +5,7 @@ import com.facebook.react.bridge.JavaScriptModule;
 import com.facebook.react.bridge.NativeModule;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.uimanager.ViewManager;
+import com.reactnativenavigation.controllers.NavigationActivity;
 
 import java.util.Arrays;
 import java.util.Collections;
@@ -12,10 +13,16 @@ import java.util.List;
 
 public class NavigationPackage implements ReactPackage {
 
+    private final NavigationActivity activity;
+
+    public NavigationPackage(NavigationActivity activity) {
+        this.activity = activity;
+    }
+
     @Override
     public List<NativeModule> createNativeModules(ReactApplicationContext reactContext) {
         return Arrays.<NativeModule>asList(
-                new NavigationModule(reactContext)
+                new NavigationModule(reactContext, activity)
         );
     }
 

android/app/src/main/java/com/reactnativenavigation/react/ReactDevPermission.java

@@ -13,8 +13,10 @@ import com.reactnativenavigation.controllers.NavigationApplication;
 
 public class ReactDevPermission {
 
+    private static boolean hasRequestedPermissions = false;
+
     public static boolean shouldAskPermission() {
-        return NavigationApplication.instance.isDebug() &&
+        return !hasRequestedPermissions && NavigationApplication.instance.isDebug() &&
                 Build.VERSION.SDK_INT >= 23 &&
                 !Settings.canDrawOverlays(NavigationApplication.instance);
     }
@@ -22,6 +24,7 @@ public class ReactDevPermission {
     @TargetApi(23)
     public static void askPermission(Context context) {
         if (shouldAskPermission()) {
+            hasRequestedPermissions = true;
             Intent serviceIntent = new Intent(Settings.ACTION_MANAGE_OVERLAY_PERMISSION);
             context.startActivity(serviceIntent);
             String msg = "Overlay permissions needs to be granted in order for react native apps to run in dev mode";

android/app/src/main/java/com/reactnativenavigation/views/NavigationSplashView.java

@@ -0,0 +1,16 @@
+package com.reactnativenavigation.views;
+
+import android.content.Context;
+import android.widget.FrameLayout;
+import android.widget.ImageView;
+
+import com.reactnativenavigation.R;
+
+public class NavigationSplashView extends FrameLayout {
+    public NavigationSplashView(Context context) {
+        super(context);
+        ImageView image = new ImageView(context);
+        image.setImageResource(R.drawable.logo);
+        addView(image);
+    }
+}

playground/android/app/build.gradle

@@ -24,6 +24,7 @@ dependencies {
     compile project(':react-native-navigation')
 
     // native e2e
+    androidTestCompile 'org.assertj:assertj-core:2.5.0'
     androidTestCompile 'com.android.support:support-annotations:25.1.1'
     androidTestCompile 'com.android.support.test:runner:0.5'
     androidTestCompile 'com.android.support.test:rules:0.5'

playground/android/app/src/androidTest/java/com/reactnativenavigation/playground/ApplicationLifecycleTest.java

@@ -12,6 +12,7 @@ import android.support.test.uiautomator.UiSelector;
 
 import com.facebook.react.ReactNativeHost;
 import com.reactnativenavigation.controllers.NavigationActivity;
+import com.reactnativenavigation.views.NavigationSplashView;
 
 import org.junit.Rule;
 import org.junit.Test;
@@ -22,6 +23,7 @@ import static android.support.test.espresso.Espresso.onView;
 import static android.support.test.espresso.assertion.ViewAssertions.matches;
 import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
 import static android.support.test.espresso.matcher.ViewMatchers.withText;
+import static org.assertj.core.api.Java6Assertions.assertThat;
 import static org.junit.Assume.assumeFalse;
 import static org.junit.Assume.assumeTrue;
 
@@ -78,7 +80,7 @@ public class ApplicationLifecycleTest {
         rule.launchActivity(null);
     }
 
-    private void acceptPermissionIfNeeded() throws Exception {
+    private void acceptOverlayPermissionIfNeeded() throws Exception {
         if (Settings.canDrawOverlays(getInstrumentation().getContext())) {
             return;
         }
@@ -88,12 +90,11 @@ public class ApplicationLifecycleTest {
         UiDevice.getInstance(getInstrumentation()).pressBack();
     }
 
-
     @Test
-    public void startApp_HandleOverlayPermissions_LoadsBridge_ThenShowsWelcomeScreen() throws Exception {
+    public void startApp_RequiredOverlayPermissions_LoadsBridge_ThenShowsWelcomeScreen() throws Exception {
         assumeFalse(Settings.canDrawOverlays(getInstrumentation().getContext()));
         launchActivity();
-        acceptPermissionIfNeeded();
+        acceptOverlayPermissionIfNeeded();
         onView(withText("React Native Navigation!")).check(matches(isDisplayed()));
     }
 
@@ -105,6 +106,9 @@ public class ApplicationLifecycleTest {
     }
 
     @Test
-    public void () {
+    public void showsSplashOnStartup() throws Exception {
+        launchActivity();
+        assertThat(rule.getActivity().getContentView()).isNotNull().isInstanceOf(NavigationSplashView.class);
+        acceptOverlayPermissionIfNeeded();
     }
 }