jsDevReload

AndroidE2E/app/src/androidTest/java/com/reactnativenavigation/e2e/androide2e/ApplicationLifecycleTest.java

@@ -4,7 +4,6 @@ import android.content.Intent;
 import android.net.Uri;
 import android.provider.Settings;
 import android.support.test.uiautomator.By;
-import android.view.KeyEvent;
 
 import org.junit.FixMethodOrder;
 import org.junit.Test;
@@ -76,17 +75,6 @@ public class ApplicationLifecycleTest extends BaseTest {
 		assertMainShown();
 	}
 
-	@Test
-	public void _6_reloadReactNativeApp() throws Exception {
-		launchTheApp();
-		assertMainShown();
-		elementByText("PUSH").click();
-		assertExists(By.text("Pushed Screen"));
-		device().pressKeyCode(KeyEvent.KEYCODE_R);
-		device().pressKeyCode(KeyEvent.KEYCODE_R);
-		assertMainShown();
-	}
-
 	private void killAppSaveInstanceState_ByTogglingPermissions() throws Exception {
 		device().pressHome();
 

AndroidE2E/app/src/androidTest/java/com/reactnativenavigation/e2e/androide2e/ReactEventsTest.java

@@ -0,0 +1,42 @@
+package com.reactnativenavigation.e2e.androide2e;
+
+import android.support.test.uiautomator.By;
+import android.view.KeyEvent;
+
+import org.junit.Test;
+
+public class ReactEventsTest extends BaseTest {
+
+	@Test
+	public void pressingMenuOpensDevMenu() throws Exception {
+		launchTheApp();
+		assertMainShown();
+		device().pressKeyCode(KeyEvent.KEYCODE_MENU);
+		assertExists(By.text("Debug JS Remotely"));
+	}
+
+	@Test
+	public void pressingRTwiceInSuccessionReloadsReactNative() throws Exception {
+		launchTheApp();
+		assertMainShown();
+		elementByText("PUSH").click();
+		assertExists(By.text("Pushed Screen"));
+
+		device().pressKeyCode(KeyEvent.KEYCODE_R);
+		device().pressKeyCode(KeyEvent.KEYCODE_R);
+		assertMainShown();
+	}
+
+	@Test
+	public void pressingRTwiceWithDelayDoesNothing() throws Exception {
+		launchTheApp();
+		assertMainShown();
+		elementByText("PUSH").click();
+		assertExists(By.text("Pushed Screen"));
+
+		device().pressKeyCode(KeyEvent.KEYCODE_R);
+		Thread.sleep(1000);
+		device().pressKeyCode(KeyEvent.KEYCODE_R);
+		assertExists(By.text("Pushed Screen"));
+	}
+}

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

@@ -4,7 +4,6 @@ import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.support.v7.app.AppCompatActivity;
 import android.view.KeyEvent;
-import android.widget.Toast;
 
 import com.facebook.react.modules.core.DefaultHardwareBackBtnHandler;
 import com.reactnativenavigation.viewcontrollers.Navigator;
@@ -15,6 +14,7 @@ public class NavigationActivity extends AppCompatActivity implements DefaultHard
 	@Override
 	protected void onCreate(@Nullable Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
+		app().getReactGateway().onActivityCreated(this);
 		navigator = new Navigator(this);
 		navigator.onActivityCreated();
 	}
@@ -22,18 +22,21 @@ public class NavigationActivity extends AppCompatActivity implements DefaultHard
 	@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();
 	}
 
@@ -49,16 +52,13 @@ public class NavigationActivity extends AppCompatActivity implements DefaultHard
 		}
 	}
 
-	
 	@Override
-	public boolean onKeyMultiple(final int keyCode, final int repeatCount, final KeyEvent event) {
-		Toast.makeText(this, "onKeyMultiple", Toast.LENGTH_SHORT).show();
-		if (keyCode == KeyEvent.KEYCODE_R && repeatCount == 2) {
-			Toast.makeText(this, "RR!!!!", Toast.LENGTH_SHORT).show();
-			return true;
-		} else {
-			return super.onKeyMultiple(keyCode, repeatCount, event);
-		}
+	public boolean onKeyUp(final int keyCode, final KeyEvent event) {
+		return app().getReactGateway().onKeyUp(keyCode) || super.onKeyUp(keyCode, event);
+	}
+
+	private NavigationApplication app() {
+		return (NavigationApplication) getApplication();
 	}
 
 	public Navigator getNavigator() {

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

@@ -1,71 +1,29 @@
 package com.reactnativenavigation;
 
-import android.app.Activity;
 import android.app.Application;
-import android.os.Bundle;
 
 import com.facebook.react.ReactApplication;
 import com.facebook.react.ReactNativeHost;
-import com.reactnativenavigation.react.NavigationReactInitializer;
-import com.reactnativenavigation.react.NavigationReactNativeHost;
+import com.reactnativenavigation.react.ReactGateway;
 
-public abstract class NavigationApplication extends Application implements ReactApplication, Application.ActivityLifecycleCallbacks {
+public abstract class NavigationApplication extends Application implements ReactApplication {
 
-	private NavigationReactNativeHost reactNativeHost;
-	private NavigationReactInitializer initializer;
+	private ReactGateway reactGateway;
 
 	@Override
 	public void onCreate() {
 		super.onCreate();
-		reactNativeHost = new NavigationReactNativeHost(this, isDebug());
-		initializer = new NavigationReactInitializer(reactNativeHost.getReactInstanceManager(), isDebug());
-		registerActivityLifecycleCallbacks(this);
+		reactGateway = new ReactGateway(this, isDebug());
 	}
 
-	@Override
-	public ReactNativeHost getReactNativeHost() {
-		return reactNativeHost;
-	}
-
-	public abstract boolean isDebug();
-
-	@Override
-	public void onActivityCreated(final Activity activity, final Bundle savedInstanceState) {
-		if (activity instanceof NavigationActivity) {
-			initializer.onActivityCreated((NavigationActivity) activity);
-		}
-	}
-
-	@Override
-	public void onActivityStarted(final Activity activity) {
+	public ReactGateway getReactGateway() {
+		return reactGateway;
 	}
 
 	@Override
-	public void onActivityResumed(final Activity activity) {
-		if (activity instanceof NavigationActivity) {
-			initializer.onActivityResumed((NavigationActivity) activity);
-		}
-	}
-
-	@Override
-	public void onActivityPaused(final Activity activity) {
-		if (activity instanceof NavigationActivity) {
-			initializer.onActivityPaused((NavigationActivity) activity);
-		}
-	}
-
-	@Override
-	public void onActivityStopped(final Activity activity) {
-	}
-
-	@Override
-	public void onActivitySaveInstanceState(final Activity activity, final Bundle outState) {
+	public ReactNativeHost getReactNativeHost() {
+		return getReactGateway().getReactNativeHost();
 	}
 
-	@Override
-	public void onActivityDestroyed(final Activity activity) {
-		if (activity instanceof NavigationActivity) {
-			initializer.onActivityDestroyed((NavigationActivity) activity);
-		}
-	}
+	public abstract boolean isDebug();
 }

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

@@ -0,0 +1,45 @@
+package com.reactnativenavigation.react;
+
+import android.view.KeyEvent;
+
+import com.facebook.react.ReactInstanceManager;
+import com.facebook.react.bridge.ReactContext;
+
+public class JsDevReloadHandler {
+	private final ReactInstanceManager reactInstanceManager;
+	private long firstRTimestamp = 0;
+
+	public JsDevReloadHandler(final ReactInstanceManager reactInstanceManager) {
+		this.reactInstanceManager = reactInstanceManager;
+		reactInstanceManager.addReactInstanceEventListener(new ReactInstanceManager.ReactInstanceEventListener() {
+			@Override
+			public void onReactContextInitialized(final ReactContext context) {
+				//this is too late
+			}
+		});
+	}
+
+	public boolean onKeyUp(int keyCode) {
+		if (!reactInstanceManager.getDevSupportManager().getDevSupportEnabled()) {
+			return false;
+		}
+
+		if (keyCode == KeyEvent.KEYCODE_MENU) {
+			reactInstanceManager.getDevSupportManager().showDevOptionsDialog();
+			return true;
+		}
+
+		if (keyCode == KeyEvent.KEYCODE_R) {
+			if (moreThan500MillisSinceLastR()) {
+				reactInstanceManager.getDevSupportManager().handleReloadJS();
+				return true;
+			}
+			firstRTimestamp = System.currentTimeMillis();
+		}
+		return false;
+	}
+
+	private boolean moreThan500MillisSinceLastR() {
+		return firstRTimestamp != 0 && System.currentTimeMillis() - firstRTimestamp < 500;
+	}
+}

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

@@ -0,0 +1,40 @@
+package com.reactnativenavigation.react;
+
+import com.reactnativenavigation.NavigationActivity;
+import com.reactnativenavigation.NavigationApplication;
+
+public class ReactGateway {
+	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);
+		initializer = new NavigationReactInitializer(reactNativeHost.getReactInstanceManager(), isDebug);
+		jsDevReloadHandler = new JsDevReloadHandler(reactNativeHost.getReactInstanceManager());
+	}
+
+	public NavigationReactNativeHost getReactNativeHost() {
+		return reactNativeHost;
+	}
+
+	public void onActivityCreated(NavigationActivity activity) {
+		initializer.onActivityCreated(activity);
+	}
+
+	public void onActivityResumed(NavigationActivity activity) {
+		initializer.onActivityResumed(activity);
+	}
+
+	public void onActivityPaused(NavigationActivity activity) {
+		initializer.onActivityPaused(activity);
+	}
+
+	public void onActivityDestroyed(NavigationActivity activity) {
+		initializer.onActivityDestroyed(activity);
+	}
+
+	public boolean onKeyUp(final int keyCode) {
+		return jsDevReloadHandler.onKeyUp(keyCode);
+	}
+}

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

@@ -51,7 +51,6 @@ public class Navigator extends ParentController {
 	}
 
 	public void onActivityDestroyed() {
-		//
 	}
 
 	@Override