JsDevReload

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

@@ -16,28 +16,25 @@ public class NavigationActivity extends AppCompatActivity implements DefaultHard
 		super.onCreate(savedInstanceState);
 		app().getReactGateway().onActivityCreated(this);
 		navigator = new Navigator(this);
-		navigator.onActivityCreated();
+		setContentView(navigator.getView());
 	}
 
 	@Override
 	protected void onResume() {
 		super.onResume();
 		app().getReactGateway().onActivityResumed(this);
-		navigator.onActivityResumed();
 	}
 
 	@Override
 	protected void onPause() {
 		super.onPause();
 		app().getReactGateway().onActivityPaused(this);
-		navigator.onActivityPaused();
 	}
 
 	@Override
 	protected void onDestroy() {
 		super.onDestroy();
 		app().getReactGateway().onActivityDestroyed(this);
-		navigator.onActivityDestroyed();
 	}
 
 	@Override

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

@@ -23,7 +23,7 @@ public class JsDevReloadHandler {
 		}
 
 		if (keyCode == KeyEvent.KEYCODE_R) {
-			if (moreThan500MillisSinceLastR()) {
+			if (lessThan500MillisSinceLastR()) {
 				reactInstanceManager.getDevSupportManager().handleReloadJS();
 				return true;
 			}
@@ -32,7 +32,7 @@ public class JsDevReloadHandler {
 		return false;
 	}
 
-	private boolean moreThan500MillisSinceLastR() {
+	private boolean lessThan500MillisSinceLastR() {
 		return firstRTimestamp != 0 && System.currentTimeMillis() - firstRTimestamp < 500;
 	}
 }

lib/android/app/src/main/java/com/reactnativenavigation/react/NavigationReactNativeHost.java

@@ -4,11 +4,14 @@ import android.app.Application;
 
 import com.facebook.react.ReactNativeHost;
 import com.facebook.react.ReactPackage;
+import com.facebook.react.devsupport.RedBoxHandler;
 import com.facebook.react.shell.MainReactPackage;
 
 import java.util.Arrays;
 import java.util.List;
 
+import javax.annotation.Nullable;
+
 public class NavigationReactNativeHost extends ReactNativeHost {
 
 	private final boolean isDebug;
@@ -18,6 +21,17 @@ public class NavigationReactNativeHost extends ReactNativeHost {
 		this.isDebug = isDebug;
 	}
 
+	@Override
+	public String getJSMainModuleName() {
+		return super.getJSMainModuleName();
+	}
+
+	@Nullable
+	@Override
+	public RedBoxHandler getRedBoxHandler() {
+		return super.getRedBoxHandler();
+	}
+
 	@Override
 	public boolean getUseDeveloperSupport() {
 		return isDebug;

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

@@ -1,15 +1,42 @@
 package com.reactnativenavigation.react;
 
+import com.facebook.react.devsupport.DevSupportManager;
+import com.facebook.react.devsupport.DevSupportManagerImpl;
+import com.facebook.react.devsupport.ReactInstanceDevCommandsHandler;
+import com.facebook.react.devsupport.RedBoxHandler;
 import com.reactnativenavigation.NavigationActivity;
 import com.reactnativenavigation.NavigationApplication;
+import com.reactnativenavigation.utils.ReflectionUtils;
 
 public class ReactGateway {
+
+	public interface JsReloadListener {
+		void onJsReload();
+	}
+
 	private final NavigationReactNativeHost reactNativeHost;
 	private final NavigationReactInitializer initializer;
 	private final JsDevReloadHandler jsDevReloadHandler;
 
 	public ReactGateway(final NavigationApplication application, final boolean isDebug) {
 		reactNativeHost = new NavigationReactNativeHost(application, isDebug);
+
+		DevSupportManager devSupportManager = reactNativeHost.getReactInstanceManager().getDevSupportManager();
+		ReactInstanceDevCommandsHandler reactInstanceCommandsHandler = (ReactInstanceDevCommandsHandler) ReflectionUtils.getDeclaredField(devSupportManager, "mReactInstanceCommandsHandler");
+		String packagerPathForJsBundle = reactNativeHost.getJSMainModuleName();
+		boolean enableOnCreate = reactNativeHost.getUseDeveloperSupport();
+		RedBoxHandler redBoxHandler = reactNativeHost.getRedBoxHandler();
+		DevSupportManagerImpl proxy = new DevSupportManagerImpl(application, reactInstanceCommandsHandler, packagerPathForJsBundle, enableOnCreate, redBoxHandler) {
+			@Override
+			public void handleReloadJS() {
+				super.handleReloadJS();
+				// onJsReload
+//				ReactContext currentReactContext = reactNativeHost.getReactInstanceManager().getCurrentReactContext();
+//				((NavigationActivity) currentReactContext.getCurrentActivity()).getNavigator().onDestroy();
+			}
+		};
+		ReflectionUtils.setField(reactNativeHost.getReactInstanceManager(), "mDevSupportManager", proxy);
+
 		initializer = new NavigationReactInitializer(reactNativeHost.getReactInstanceManager(), isDebug);
 		jsDevReloadHandler = new JsDevReloadHandler(reactNativeHost.getReactInstanceManager());
 	}

lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/Navigator.java

@@ -13,7 +13,6 @@ import java.util.Collections;
 public class Navigator extends ParentController {
 
 	private ViewController root;
-	private boolean activityResumed = false;
 
 	public Navigator(final Activity activity) {
 		super(activity, "navigator" + CompatUtils.generateViewId());
@@ -30,29 +29,6 @@ public class Navigator extends ParentController {
 		return root == null ? Collections.<ViewController>emptyList() : Collections.singletonList(root);
 	}
 
-	/*
-	 * Activity lifecycle
-	 */
-
-	public boolean isActivityResumed() {
-		return activityResumed;
-	}
-
-	public void onActivityCreated() {
-		getActivity().setContentView(getView());
-	}
-
-	public void onActivityResumed() {
-		activityResumed = true;
-	}
-
-	public void onActivityPaused() {
-		activityResumed = false;
-	}
-
-	public void onActivityDestroyed() {
-	}
-
 	@Override
 	public boolean handleBack() {
 		return root != null && root.handleBack();

lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/NavigatorTest.java

@@ -10,7 +10,6 @@ import com.reactnativenavigation.mocks.TestStackAnimator;
 import com.reactnativenavigation.utils.CompatUtils;
 
 import org.junit.Test;
-import org.robolectric.Shadows;
 
 import java.util.Arrays;
 
@@ -41,25 +40,6 @@ public class NavigatorTest extends BaseTest {
 		child5 = new SimpleViewController(activity, "child5");
 	}
 
-
-	@Test
-	public void isActivityResumed() throws Exception {
-		assertThat(uut.isActivityResumed()).isFalse();
-		uut.onActivityCreated();
-		assertThat(uut.isActivityResumed()).isFalse();
-		uut.onActivityResumed();
-		assertThat(uut.isActivityResumed()).isTrue();
-		uut.onActivityPaused();
-		assertThat(uut.isActivityResumed()).isFalse();
-	}
-
-	@Test
-	public void setsItselfAsContentView() throws Exception {
-		assertThat(Shadows.shadowOf(activity).getContentView()).isNull();
-		uut.onActivityCreated();
-		assertThat(Shadows.shadowOf(activity).getContentView()).isNotNull().isEqualTo(uut.getView());
-	}
-
 	@Test
 	public void setRoot_AddsChildControllerView() throws Exception {
 		assertThat(uut.getView().getChildCount()).isZero();