Enable reloading from cmd (#775)

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

@@ -31,7 +31,7 @@ import com.reactnativenavigation.params.SlidingOverlayParams;
 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.views.SideMenu.Side;
 
 import java.util.List;
@@ -108,7 +108,7 @@ public class NavigationActivity extends AppCompatActivity implements DefaultHard
 
         currentActivity = this;
         IntentDataHandler.onResume(getIntent());
-        NavigationApplication.instance.getReactGateway().onResumeActivity(this, this);
+        getReactGateway().onResumeActivity(this, this);
         NavigationApplication.instance.getActivityCallbacks().onActivityResumed(this);
         EventBus.instance.register(this);
         IntentDataHandler.onPostResume(getIntent());
@@ -117,7 +117,7 @@ public class NavigationActivity extends AppCompatActivity implements DefaultHard
     @Override
     protected void onNewIntent(Intent intent) {
         super.onNewIntent(intent);
-        NavigationApplication.instance.getReactGateway().onNewIntent(intent);
+        getReactGateway().onNewIntent(intent);
         NavigationApplication.instance.getActivityCallbacks().onNewIntent(intent);
     }
 
@@ -132,7 +132,7 @@ public class NavigationActivity extends AppCompatActivity implements DefaultHard
         super.onPause();
         currentActivity = null;
         IntentDataHandler.onPause(getIntent());
-        NavigationApplication.instance.getReactGateway().onPauseActivity();
+        getReactGateway().onPauseActivity();
         NavigationApplication.instance.getActivityCallbacks().onActivityPaused(this);
         EventBus.instance.unregister(this);
     }
@@ -163,7 +163,7 @@ public class NavigationActivity extends AppCompatActivity implements DefaultHard
 
     private void destroyJsIfNeeded() {
         if (currentActivity == null || currentActivity.isFinishing()) {
-            NavigationApplication.instance.getReactGateway().onDestroyApp();
+            getReactGateway().onDestroyApp();
         }
     }
 
@@ -175,19 +175,23 @@ public class NavigationActivity extends AppCompatActivity implements DefaultHard
     @Override
     public void onBackPressed() {
         if (layout != null && !layout.onBackPressed()) {
-            NavigationApplication.instance.getReactGateway().onBackPressed();
+            getReactGateway().onBackPressed();
         }
     }
 
     @Override
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
-        NavigationApplication.instance.getReactGateway().onActivityResult(requestCode, resultCode, data);
+        getReactGateway().onActivityResult(requestCode, resultCode, data);
         NavigationApplication.instance.getActivityCallbacks().onActivityResult(requestCode, resultCode, data);
     }
 
     @Override
     public boolean onKeyUp(int keyCode, KeyEvent event) {
-        return JsDevReloadHandler.onKeyUp(getCurrentFocus(), keyCode) || super.onKeyUp(keyCode, event);
+        return getReactGateway().onKeyUp(getCurrentFocus(), keyCode) || super.onKeyUp(keyCode, event);
+    }
+
+    private ReactGateway getReactGateway() {
+        return NavigationApplication.instance.getReactGateway();
     }
 
     void push(ScreenParams params) {

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

@@ -1,5 +1,9 @@
 package com.reactnativenavigation.react;
 
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
 import android.view.KeyEvent;
 import android.view.View;
 import android.widget.EditText;
@@ -7,16 +11,30 @@ import android.widget.EditText;
 import com.facebook.react.ReactInstanceManager;
 import com.reactnativenavigation.NavigationApplication;
 
-public class JsDevReloadHandler {
+class JsDevReloadHandler {
 
     private static boolean shouldRefreshOnRR = false;
+    private final BroadcastReceiver reloadReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            reload();
+        }
+    };
 
-    //TODO yuck.
-    public static boolean onKeyUp(View currentFocus, int keyCode) {
-        ReactInstanceManager reactInstanceManager = NavigationApplication
-                .instance
-                .getReactGateway()
-                .getReactInstanceManager();
+    void onResumeActivity() {
+        if (getReactInstanceManager().getDevSupportManager().getDevSupportEnabled()) {
+            NavigationApplication.instance.registerReceiver(reloadReceiver, new IntentFilter("react.native.RELOAD"));
+        }
+    }
+
+    void onPauseActivity() {
+        if (getReactInstanceManager().getDevSupportManager().getDevSupportEnabled()) {
+            NavigationApplication.instance.unregisterReceiver(reloadReceiver);
+        }
+    }
+
+    boolean onKeyUp(View currentFocus, int keyCode) {
+        ReactInstanceManager reactInstanceManager = getReactInstanceManager();
 
         if (reactInstanceManager != null &&
                 reactInstanceManager.getDevSupportManager().getDevSupportEnabled()) {
@@ -27,8 +45,7 @@ public class JsDevReloadHandler {
             if (keyCode == KeyEvent.KEYCODE_R && !(currentFocus instanceof EditText)) {
                 // Enable double-tap-R-to-reload
                 if (shouldRefreshOnRR) {
-                    reactInstanceManager.getDevSupportManager().handleReloadJS();
-                    shouldRefreshOnRR = false;
+                    reload();
                     return true;
                 } else {
                     shouldRefreshOnRR = true;
@@ -45,4 +62,16 @@ public class JsDevReloadHandler {
         }
         return false;
     }
+
+    private void reload() {
+        getReactInstanceManager().getDevSupportManager().handleReloadJS();
+        shouldRefreshOnRR = false;
+    }
+
+    private ReactInstanceManager getReactInstanceManager() {
+        return NavigationApplication
+                .instance
+                .getReactGateway()
+                .getReactInstanceManager();
+    }
 }

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

@@ -2,6 +2,7 @@ package com.reactnativenavigation.react;
 
 import android.app.Activity;
 import android.content.Intent;
+import android.view.View;
 
 import com.facebook.react.ReactInstanceManager;
 import com.facebook.react.ReactNativeHost;
@@ -20,13 +21,17 @@ import java.util.List;
 
 import javax.annotation.Nullable;
 
+//import android.view.View;
+
 public class NavigationReactGateway implements ReactGateway {
 
     private final ReactNativeHost host;
     private NavigationReactEventEmitter reactEventEmitter;
+    private JsDevReloadHandler jsDevReloadHandler;
 
     public NavigationReactGateway() {
         host = new ReactNativeHostImpl();
+        jsDevReloadHandler = new JsDevReloadHandler();
     }
 
     @Override
@@ -67,14 +72,21 @@ public class NavigationReactGateway implements ReactGateway {
 
     public void onPauseActivity() {
         getReactInstanceManager().onHostPause();
+        jsDevReloadHandler.onPauseActivity();
     }
 
     public void onNewIntent(Intent intent) {
         getReactInstanceManager().onNewIntent(intent);
     }
 
+    @Override
+    public boolean onKeyUp(View currentFocus, int keyCode) {
+        return jsDevReloadHandler.onKeyUp(currentFocus, keyCode);
+    }
+
     public void onResumeActivity(Activity activity, DefaultHardwareBackBtnHandler defaultHardwareBackBtnHandler) {
         getReactInstanceManager().onHostResume(activity, defaultHardwareBackBtnHandler);
+        jsDevReloadHandler.onResumeActivity();
     }
 
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
@@ -87,13 +99,13 @@ public class NavigationReactGateway implements ReactGateway {
     }
 
     //TODO temp hack
-    void onReactContextInitialized() {
+    private void onReactContextInitialized() {
         reactEventEmitter = new NavigationReactEventEmitter(getReactContext());
     }
 
     private static class ReactNativeHostImpl extends ReactNativeHost implements ReactInstanceManager.ReactInstanceEventListener {
 
-        public ReactNativeHostImpl() {
+        ReactNativeHostImpl() {
             super(NavigationApplication.instance);
         }
 

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

@@ -2,6 +2,7 @@ package com.reactnativenavigation.react;
 
 import android.app.Activity;
 import android.content.Intent;
+import android.view.View;
 
 import com.facebook.react.ReactInstanceManager;
 import com.facebook.react.bridge.ReactContext;
@@ -33,4 +34,6 @@ public interface ReactGateway {
     boolean hasStartedCreatingContext();
 
     void onNewIntent(Intent intent);
+
+    boolean onKeyUp(View currentFocus, int keyCode);
 }