exposed JS path params for ReactNativeHosts, refactored ReactGateway

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

@@ -11,7 +11,6 @@ import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.bridge.WritableMap;
 import com.reactnativenavigation.react.NavigationReactGateway;
 import com.reactnativenavigation.react.ReactGateway;
-import com.reactnativenavigation.react.ReactGatewayHost;
 
 import java.util.List;
 
@@ -19,18 +18,18 @@ public abstract class NavigationApplication extends Application implements React
 
     public static NavigationApplication instance;
 
-    private ReactGatewayHost reactGateway;
+    private NavigationReactGateway reactGateway;
     private Handler handler;
 
     @Override
     public void onCreate() {
         super.onCreate();
         instance = this;
-        reactGateway = new NavigationReactGateway();
         handler = new Handler(getMainLooper());
+        reactGateway = new NavigationReactGateway();
     }
 
-    public void startReactContext() {
+    public void startReactContextOnceInBackgroundAndExecuteJS() {
         reactGateway.startReactContextOnceInBackgroundAndExecuteJS();
     }
 
@@ -56,7 +55,31 @@ public abstract class NavigationApplication extends Application implements React
 
     @Override
     public ReactNativeHost getReactNativeHost() {
-        return reactGateway;
+        return reactGateway.getReactNativeHost();
+    }
+
+    /**
+     * @see ReactNativeHost#getJSMainModuleName()
+     */
+    @Nullable
+    public String getJSMainModuleName() {
+        return null;
+    }
+
+    /**
+     * @see ReactNativeHost#getJSBundleFile()
+     */
+    @Nullable
+    public String getJSBundleFile() {
+        return null;
+    }
+
+    /**
+     * @see ReactNativeHost#getBundleAssetName()
+     */
+    @Nullable
+    public String getBundleAssetName() {
+        return null;
     }
 
     public abstract boolean isDebug();
@@ -92,5 +115,4 @@ public abstract class NavigationApplication extends Application implements React
         }
         reactGateway.getReactEventEmitter().sendEvent(eventId, arguments);
     }
-
 }

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

@@ -9,6 +9,7 @@ import com.facebook.react.modules.core.DefaultHardwareBackBtnHandler;
 import com.reactnativenavigation.NavigationApplication;
 import com.reactnativenavigation.events.Event;
 import com.reactnativenavigation.events.EventBus;
+import com.reactnativenavigation.events.JsDevReloadEvent;
 import com.reactnativenavigation.events.ModalDismissedEvent;
 import com.reactnativenavigation.events.Subscriber;
 import com.reactnativenavigation.layouts.BottomTabsLayout;
@@ -20,12 +21,11 @@ import com.reactnativenavigation.params.SnackbarParams;
 import com.reactnativenavigation.params.TitleBarButtonParams;
 import com.reactnativenavigation.params.TitleBarLeftButtonParams;
 import com.reactnativenavigation.react.JsDevReloadHandler;
-import com.reactnativenavigation.react.ReactGateway;
 import com.reactnativenavigation.react.RedboxPermission;
 
 import java.util.List;
 
-public class NavigationActivity extends AppCompatActivity implements DefaultHardwareBackBtnHandler, ReactGateway.OnJsDevReloadListener, Subscriber {
+public class NavigationActivity extends AppCompatActivity implements DefaultHardwareBackBtnHandler, Subscriber {
 
     /**
      * Although we start multiple activities, we make sure to pass Intent.CLEAR_TASK | Intent.NEW_TASK
@@ -46,7 +46,7 @@ public class NavigationActivity extends AppCompatActivity implements DefaultHard
         super.onCreate(savedInstanceState);
 
         if (!NavigationApplication.instance.isReactContextInitialized()) {
-            NavigationApplication.instance.startReactContext();
+            NavigationApplication.instance.startReactContextOnceInBackgroundAndExecuteJS();
             return;
         }
 
@@ -82,7 +82,7 @@ public class NavigationActivity extends AppCompatActivity implements DefaultHard
         }
 
         currentActivity = this;
-        NavigationApplication.instance.getReactGateway().onResumeActivity(this, this, this);
+        NavigationApplication.instance.getReactGateway().onResumeActivity(this, this);
         EventBus.instance.register(this);
     }
 
@@ -116,12 +116,6 @@ public class NavigationActivity extends AppCompatActivity implements DefaultHard
         }
     }
 
-    @Override
-    public void onJsDevReload() {
-        modalController.destroy();
-        layout.destroy();
-    }
-
     @Override
     public void invokeDefaultOnBackPressed() {
         super.onBackPressed();
@@ -258,8 +252,11 @@ public class NavigationActivity extends AppCompatActivity implements DefaultHard
 
     @Override
     public void onEvent(Event event) {
-        if (event.getType() == ModalDismissedEvent.TYPE) {
+        if (event.getType().equals(ModalDismissedEvent.TYPE)) {
             layout.onModalDismissed();
+        } else if (event.getType().equals(JsDevReloadEvent.TYPE)) {
+            modalController.destroy();
+            layout.destroy();
         }
     }
 }

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

@@ -15,7 +15,7 @@ public abstract class SplashActivity extends AppCompatActivity {
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setSplashLayout();
-        NavigationApplication.instance.startReactContext();
+        NavigationApplication.instance.startReactContextOnceInBackgroundAndExecuteJS();
     }
 
     @Override

android/app/src/main/java/com/reactnativenavigation/events/JsDevReloadEvent.java

@@ -0,0 +1,11 @@
+package com.reactnativenavigation.events;
+
+public class JsDevReloadEvent implements Event {
+
+    public static final String TYPE = "JsDevReloadEvent";
+
+    @Override
+    public String getType() {
+        return TYPE;
+    }
+}

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

@@ -4,6 +4,7 @@ import android.app.Activity;
 import android.content.Intent;
 
 import com.facebook.react.ReactInstanceManager;
+import com.facebook.react.ReactNativeHost;
 import com.facebook.react.ReactPackage;
 import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.modules.core.DefaultHardwareBackBtnHandler;
@@ -11,17 +12,21 @@ import com.facebook.react.shell.MainReactPackage;
 import com.reactnativenavigation.NavigationApplication;
 import com.reactnativenavigation.bridge.NavigationReactEventEmitter;
 import com.reactnativenavigation.bridge.NavigationReactPackage;
+import com.reactnativenavigation.events.EventBus;
+import com.reactnativenavigation.events.JsDevReloadEvent;
 
 import java.util.ArrayList;
 import java.util.List;
 
-public class NavigationReactGateway extends ReactGatewayHost implements ReactInstanceManager.ReactInstanceEventListener {
+import javax.annotation.Nullable;
 
-    private OnJsDevReloadListener onJsDevReloadListener;
+public class NavigationReactGateway implements ReactGateway {
+
+    private final ReactNativeHost host;
     private NavigationReactEventEmitter reactEventEmitter;
 
     public NavigationReactGateway() {
-        super(NavigationApplication.instance);
+        host = new ReactNativeHostImpl();
     }
 
     @Override
@@ -30,7 +35,7 @@ public class NavigationReactGateway extends ReactGatewayHost implements ReactIns
     }
 
     public boolean isInitialized() {
-        return hasInstance() && getReactInstanceManager().getCurrentReactContext() != null;
+        return host.hasInstance() && getReactInstanceManager().getCurrentReactContext() != null;
     }
 
     public ReactContext getReactContext() {
@@ -38,26 +43,31 @@ public class NavigationReactGateway extends ReactGatewayHost implements ReactIns
     }
 
     public NavigationReactEventEmitter getReactEventEmitter() {
+        if (reactEventEmitter == null && isInitialized()) {
+            reactEventEmitter = new NavigationReactEventEmitter(getReactContext());
+        }
         return reactEventEmitter;
     }
 
+    @Override
+    public ReactInstanceManager getReactInstanceManager() {
+        return host.getReactInstanceManager();
+    }
+
     public void onBackPressed() {
         getReactInstanceManager().onBackPressed();
     }
 
     public void onDestroyApp() {
         getReactInstanceManager().onHostDestroy();
-        getReactInstanceManager().removeReactInstanceEventListener(this);
-        clear();
+        host.clear();
     }
 
     public void onPauseActivity() {
         getReactInstanceManager().onHostPause();
-        onJsDevReloadListener = null;
     }
 
-    public void onResumeActivity(Activity activity, DefaultHardwareBackBtnHandler defaultHardwareBackBtnHandler, OnJsDevReloadListener onJsDevReloadListener) {
-        this.onJsDevReloadListener = onJsDevReloadListener;
+    public void onResumeActivity(Activity activity, DefaultHardwareBackBtnHandler defaultHardwareBackBtnHandler) {
         getReactInstanceManager().onHostResume(activity, defaultHardwareBackBtnHandler);
     }
 
@@ -65,63 +75,101 @@ public class NavigationReactGateway extends ReactGatewayHost implements ReactIns
         getReactInstanceManager().onActivityResult(requestCode, resultCode, data);
     }
 
-    private void replaceJsDevReloadListener(ReactInstanceManager manager) {
-        new JsDevReloadListenerReplacer(manager, new JsDevReloadListenerReplacer.Listener() {
-            @Override
-            public void onJsDevReload() {
-                if (onJsDevReloadListener != null)
-                    onJsDevReloadListener.onJsDevReload();
-            }
-        }).replace();
+    public ReactNativeHost getReactNativeHost() {
+        return host;
     }
 
-    @Override
-    protected ReactInstanceManager createReactInstanceManager() {
-        ReactInstanceManager manager = super.createReactInstanceManager();
-        if (NavigationApplication.instance.isDebug()) {
-            replaceJsDevReloadListener(manager);
+
+    private static class ReactNativeHostImpl extends ReactNativeHost implements ReactInstanceManager.ReactInstanceEventListener {
+
+        public ReactNativeHostImpl() {
+            super(NavigationApplication.instance);
         }
-        manager.addReactInstanceEventListener(this);
-        return manager;
-    }
 
-    @Override
-    protected boolean getUseDeveloperSupport() {
-        return NavigationApplication.instance.isDebug();
-    }
+        @Override
+        protected boolean getUseDeveloperSupport() {
+            return NavigationApplication.instance.isDebug();
+        }
 
-    @Override
-    protected List<ReactPackage> getPackages() {
-        return createReactPackages();
-    }
+        @Override
+        protected List<ReactPackage> getPackages() {
+            List<ReactPackage> list = new ArrayList<>();
+            list.add(new MainReactPackage());
+            list.add(new NavigationReactPackage());
+            addAdditionalReactPackagesIfNeeded(list);
+            return list;
+        }
 
-    private List<ReactPackage> createReactPackages() {
-        List<ReactPackage> list = new ArrayList<>();
-        list.add(new MainReactPackage());
-        list.add(new NavigationReactPackage());
-        addAdditionalReactPackagesIfNeeded(list);
-        return list;
-    }
+        private void addAdditionalReactPackagesIfNeeded(List<ReactPackage> list) {
+            List<ReactPackage> additionalReactPackages = NavigationApplication.instance.createAdditionalReactPackages();
+            if (additionalReactPackages == null) {
+                return;
+            }
+
+            for (ReactPackage reactPackage : additionalReactPackages) {
+                if (reactPackage instanceof MainReactPackage)
+                    throw new RuntimeException("Do not create a new MainReactPackage. This is created for you.");
+                if (reactPackage instanceof NavigationReactPackage)
+                    throw new RuntimeException("Do not create a new NavigationReactPackage. This is created for you.");
+            }
 
-    private void addAdditionalReactPackagesIfNeeded(List<ReactPackage> list) {
-        List<ReactPackage> additionalReactPackages = NavigationApplication.instance.createAdditionalReactPackages();
-        if (additionalReactPackages == null) {
-            return;
+            list.addAll(additionalReactPackages);
         }
 
-        for (ReactPackage reactPackage : additionalReactPackages) {
-            if (reactPackage instanceof MainReactPackage)
-                throw new RuntimeException("Do not create a new MainReactPackage. This is created for you.");
-            if (reactPackage instanceof NavigationReactPackage)
-                throw new RuntimeException("Do not create a new NavigationReactPackage. This is created for you.");
+        @Override
+        protected ReactInstanceManager createReactInstanceManager() {
+            ReactInstanceManager manager = super.createReactInstanceManager();
+            if (NavigationApplication.instance.isDebug()) {
+                replaceJsDevReloadListener(manager);
+            }
+            manager.addReactInstanceEventListener(this);
+            return manager;
         }
 
-        list.addAll(additionalReactPackages);
-    }
+        private void replaceJsDevReloadListener(ReactInstanceManager manager) {
+            new JsDevReloadListenerReplacer(manager, new JsDevReloadListenerReplacer.Listener() {
+                @Override
+                public void onJsDevReload() {
+                    EventBus.instance.post(new JsDevReloadEvent());
+                }
+            }).replace();
+        }
 
-    @Override
-    public void onReactContextInitialized(ReactContext context) {
-        reactEventEmitter = new NavigationReactEventEmitter(context);
-        NavigationApplication.instance.onReactInitialized(context);
+        @Override
+        public void onReactContextInitialized(ReactContext context) {
+            NavigationApplication.instance.onReactInitialized(context);
+        }
+
+        @Override
+        public void clear() {
+            getReactInstanceManager().removeReactInstanceEventListener(this);
+            super.clear();
+        }
+
+        @Override
+        protected String getJSMainModuleName() {
+            String jsMainModuleName = NavigationApplication.instance.getJSMainModuleName();
+            if (jsMainModuleName != null)
+                return jsMainModuleName;
+            return super.getJSMainModuleName();
+        }
+
+        @Nullable
+        @Override
+        protected String getJSBundleFile() {
+            String jsBundleFile = NavigationApplication.instance.getJSBundleFile();
+            if (jsBundleFile != null)
+                return jsBundleFile;
+            return super.getJSBundleFile();
+        }
+
+        @Nullable
+        @Override
+        protected String getBundleAssetName() {
+            String bundleAssetName = NavigationApplication.instance.getBundleAssetName();
+            if (bundleAssetName != null)
+                return bundleAssetName;
+            return super.getBundleAssetName();
+        }
     }
 }

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

@@ -10,10 +10,6 @@ import com.reactnativenavigation.bridge.NavigationReactEventEmitter;
 
 public interface ReactGateway {
 
-    interface OnJsDevReloadListener {
-        void onJsDevReload();
-    }
-
     void startReactContextOnceInBackgroundAndExecuteJS();
 
     boolean isInitialized();
@@ -24,7 +20,7 @@ public interface ReactGateway {
 
     ReactInstanceManager getReactInstanceManager();
 
-    void onResumeActivity(Activity activity, DefaultHardwareBackBtnHandler defaultHardwareBackBtnHandler, OnJsDevReloadListener onJsDevReloadListener);
+    void onResumeActivity(Activity activity, DefaultHardwareBackBtnHandler defaultHardwareBackBtnHandler);
 
     void onPauseActivity();
 

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

@@ -1,11 +0,0 @@
-package com.reactnativenavigation.react;
-
-import android.app.Application;
-
-import com.facebook.react.ReactNativeHost;
-
-public abstract class ReactGatewayHost extends ReactNativeHost implements ReactGateway {
-    protected ReactGatewayHost(Application application) {
-        super(application);
-    }
-}

example-redux/android/app/src/main/java/com/exampleredux/MainApplication.java

@@ -9,7 +9,6 @@ import java.util.List;
 
 public class MainApplication extends NavigationApplication {
 
-
     @Override
     public boolean isDebug() {
         return BuildConfig.DEBUG;