refactor all the things

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

@@ -3,10 +3,18 @@ package com.reactnativenavigation;
 import android.app.Application;
 import android.os.Handler;
 
-public abstract class NavigationApplication extends Application {
+import com.facebook.react.ReactPackage;
+import com.facebook.react.shell.MainReactPackage;
+import com.reactnativenavigation.bridge.NavigationReactPackage;
+import com.reactnativenavigation.react.NavigationReactInstance;
 
-    public static NavigationApplication instance;
+import java.util.Arrays;
+import java.util.List;
+
+public abstract class NavigationApplication extends Application implements NavigationReactInstance.ReactContextCreator {
 
+    public static NavigationApplication instance;
+    private NavigationReactInstance navigationReactInstance;
     private Handler handler;
 
     @Override
@@ -14,13 +22,29 @@ public abstract class NavigationApplication extends Application {
         super.onCreate();
         instance = this;
         handler = new Handler(getMainLooper());
+        navigationReactInstance = new NavigationReactInstance(this);
+        navigationReactInstance.startReactContextOnceInBackgroundAndExecuteJS();
     }
 
-    public abstract boolean isDebug();
 
     public Handler getMainHandler() {
         return handler;
     }
 
+    public NavigationReactInstance getNavigationReactInstance() {
+        return navigationReactInstance;
+    }
+
+    @Override
+    public final List<ReactPackage> createReactPackages() {
+        List<ReactPackage> list = Arrays.asList(
+                new MainReactPackage(),
+                new NavigationReactPackage());
+        list.addAll(createAdditionalReactPackages());
+        return list;
+    }
+
+    public abstract boolean isDebug();
 
+    public abstract List<ReactPackage> createAdditionalReactPackages();
 }

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

@@ -1,14 +1,19 @@
 package com.reactnativenavigation.controllers;
 
 import android.app.Activity;
+import android.content.BroadcastReceiver;
+import android.content.Context;
 import android.content.Intent;
+import android.content.IntentFilter;
 import android.os.Bundle;
+import android.support.v4.content.LocalBroadcastManager;
 import android.support.v7.app.AppCompatActivity;
 import android.view.KeyEvent;
 
 import com.facebook.react.ReactPackage;
 import com.facebook.react.modules.core.DefaultHardwareBackBtnHandler;
 import com.facebook.react.shell.MainReactPackage;
+import com.reactnativenavigation.NavigationApplication;
 import com.reactnativenavigation.bridge.NavigationReactPackage;
 import com.reactnativenavigation.params.ActivityParams;
 import com.reactnativenavigation.params.parsers.ActivityParamsParser;
@@ -22,7 +27,7 @@ import java.util.Arrays;
 import java.util.List;
 
 
-public class NavigationActivity extends AppCompatActivity implements NavigationReactInstance.ReactContextCreator, DefaultHardwareBackBtnHandler {
+public class NavigationActivity extends AppCompatActivity implements DefaultHardwareBackBtnHandler, NavigationReactInstance.OnJsDevReloadListener {
 
     public static final String PARAMS_BUNDLE = "PARAMS_BUNDLE";
     /**
@@ -32,7 +37,6 @@ public class NavigationActivity extends AppCompatActivity implements NavigationR
      * This is somewhat weird, and in the future either fully support multiple activities, OR a single activity with changing contentView ala ReactNative impl.
      */
     private static Activity currentActivity;
-    private NavigationReactInstance navigationReactInstance;
     private ModalController modalController;
     private Layout layout = new Layout() {
         @Override
@@ -59,14 +63,13 @@ public class NavigationActivity extends AppCompatActivity implements NavigationR
         activityParams = ActivityParamsParser.parse(getIntent().getBundleExtra(PARAMS_BUNDLE));
 
         modalController = new ModalController();
-        navigationReactInstance = new NavigationReactInstance(this);
-        navigationReactInstance.startReactContextOnceInBackgroundAndExecuteJS();
+
         RedboxPermission.permissionToShowRedboxIfNeeded(this);
         createLayout();
     }
 
     private void createLayout() {
-        ScreenLayout screenLayout = new ScreenLayout(this, navigationReactInstance.getReactInstanceManager(), activityParams.screenParams);
+        ScreenLayout screenLayout = new ScreenLayout(this, activityParams.screenParams);
         setContentView(screenLayout);
     }
 
@@ -74,14 +77,14 @@ public class NavigationActivity extends AppCompatActivity implements NavigationR
     protected void onResume() {
         super.onResume();
         currentActivity = this;
-        navigationReactInstance.onResume(this, this);
+        getNavigationReactInstance().onResume(this, this, this);
     }
 
     @Override
     protected void onPause() {
         super.onPause();
         currentActivity = null;
-        navigationReactInstance.onPause();
+        getNavigationReactInstance().onPause();
     }
 
     @Override
@@ -90,23 +93,10 @@ public class NavigationActivity extends AppCompatActivity implements NavigationR
         layout.onDestroy();
         super.onDestroy();
         if (currentActivity == null || currentActivity.isFinishing()) {
-            navigationReactInstance.onHostDestroy();
+            getNavigationReactInstance().onHostDestroy();
         }
     }
 
-
-    private NavigationReactInstance getNavigationReactInstance() {
-        return navigationReactInstance;
-    }
-
-    @Override
-    public List<ReactPackage> createReactPackages() {
-        return Arrays.asList(
-                new MainReactPackage(),
-                new NavigationReactPackage()
-        );
-    }
-
     @Override
     public void onJsDevReload() {
         layout.removeAllReactViews();
@@ -125,17 +115,20 @@ public class NavigationActivity extends AppCompatActivity implements NavigationR
         if (layout.onBackPressed()) {
             return;
         }
-        navigationReactInstance.onBackPressed();
+        getNavigationReactInstance().onBackPressed();
     }
 
     @Override
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
-        navigationReactInstance.onActivityResult(requestCode, resultCode, data);
+        getNavigationReactInstance().onActivityResult(requestCode, resultCode, data);
     }
 
     @Override
     public boolean onKeyUp(int keyCode, KeyEvent event) {
-        return JsDevReloadHandler.onKeyUp(navigationReactInstance.getReactInstanceManager(), getCurrentFocus(), keyCode)
-                || super.onKeyUp(keyCode, event);
+        return JsDevReloadHandler.onKeyUp(getCurrentFocus(), keyCode) || super.onKeyUp(keyCode, event);
+    }
+
+    private NavigationReactInstance getNavigationReactInstance() {
+        return NavigationApplication.instance.getNavigationReactInstance();
     }
 }

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

@@ -0,0 +1,8 @@
+package com.reactnativenavigation.controllers;
+
+import android.support.v7.app.AppCompatActivity;
+
+public class SplashActivity extends AppCompatActivity {
+
+
+}

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

@@ -12,7 +12,12 @@ public class JsDevReloadHandler {
     private static boolean shouldRefreshOnRR = false;
 
     //TODO yuck.
-    public static boolean onKeyUp(ReactInstanceManager reactInstanceManager, View currentFocus, int keyCode) {
+    public static boolean onKeyUp(View currentFocus, int keyCode) {
+        ReactInstanceManager reactInstanceManager = NavigationApplication
+                .instance
+                .getNavigationReactInstance()
+                .getReactInstanceManager();
+
         if (reactInstanceManager != null &&
                 reactInstanceManager.getDevSupportManager().getDevSupportEnabled()) {
             if (keyCode == KeyEvent.KEYCODE_MENU) {

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

@@ -1,6 +1,5 @@
 package com.reactnativenavigation.react;
 
-import android.app.Activity;
 import android.content.Intent;
 
 import com.facebook.react.LifecycleState;
@@ -10,16 +9,20 @@ import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.modules.core.DefaultHardwareBackBtnHandler;
 import com.facebook.react.modules.core.DeviceEventManagerModule.RCTDeviceEventEmitter;
 import com.reactnativenavigation.NavigationApplication;
+import com.reactnativenavigation.controllers.NavigationActivity;
 
 import java.util.List;
 
 public class NavigationReactInstance {
 
     private final ReactInstanceManager reactInstanceManager;
+    private OnJsDevReloadListener onJsDevReloadListener;
 
     public interface ReactContextCreator {
         List<ReactPackage> createReactPackages();
+    }
 
+    public interface OnJsDevReloadListener {
         void onJsDevReload();
     }
 
@@ -58,11 +61,13 @@ public class NavigationReactInstance {
         reactInstanceManager.onBackPressed();
     }
 
-    public void onResume(Activity activity, DefaultHardwareBackBtnHandler defaultHardwareBackBtnHandler) {
+    public void onResume(NavigationActivity activity, DefaultHardwareBackBtnHandler defaultHardwareBackBtnHandler, OnJsDevReloadListener onJsDevReloadListener) {
+        this.onJsDevReloadListener = onJsDevReloadListener;
         reactInstanceManager.onHostResume(activity, defaultHardwareBackBtnHandler);
     }
 
     public void onPause() {
+        this.onJsDevReloadListener = null;
         reactInstanceManager.onHostPause();
     }
 
@@ -74,7 +79,8 @@ public class NavigationReactInstance {
         new JsDevReloadListenerReplacer(reactInstanceManager, new JsDevReloadListenerReplacer.Listener() {
             @Override
             public void onJsDevReload() {
-                reactContextCreator.onJsDevReload();
+                if (onJsDevReloadListener != null)
+                    onJsDevReloadListener.onJsDevReload();
             }
         }).replace();
     }