refactoring activityLifecycle

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

@@ -4,7 +4,6 @@ import android.app.Application;
 
 import com.facebook.react.ReactApplication;
 import com.facebook.react.ReactNativeHost;
-import com.reactnativenavigation.controllers.NavigationActivityLifecycleHandler;
 import com.reactnativenavigation.react.NavigationReactNativeHost;
 
 public abstract class NavigationApplication extends Application implements ReactApplication {
@@ -16,7 +15,6 @@ public abstract class NavigationApplication extends Application implements React
 		super.onCreate();
 		instance = this;
 		host = new NavigationReactNativeHost(this);
-		registerActivityLifecycleCallbacks(new NavigationActivityLifecycleHandler(host.getReactInstanceManager()));
 	}
 
 	@Override

android/app/src/main/java/com/reactnativenavigation/controllers/NavigationActivityLifecycleHandler.java → android/app/src/main/java/com/reactnativenavigation/controllers/ActivityLifecycleDelegate.java

@@ -1,75 +1,52 @@
 package com.reactnativenavigation.controllers;
 
 import android.app.Activity;
-import android.app.Application;
-import android.os.Bundle;
 
 import com.facebook.react.ReactInstanceManager;
 import com.facebook.react.bridge.ReactContext;
-import com.reactnativenavigation.NavigationActivity;
+import com.facebook.react.modules.core.DefaultHardwareBackBtnHandler;
 import com.reactnativenavigation.react.NavigationEventEmitter;
 import com.reactnativenavigation.react.ReactDevPermission;
 
 import java.util.concurrent.atomic.AtomicBoolean;
 
-public class NavigationActivityLifecycleHandler implements Application.ActivityLifecycleCallbacks {
+public class ActivityLifecycleDelegate {
+
+	private final Activity activity;
+	private final DefaultHardwareBackBtnHandler backBtnHandler;
 	private final ReactInstanceManager reactInstanceManager;
 	private final AtomicBoolean appLaunchEmitted = new AtomicBoolean(false);
 
-	public NavigationActivityLifecycleHandler(ReactInstanceManager reactInstanceManager) {
+	public ActivityLifecycleDelegate(Activity activity,
+	                                 DefaultHardwareBackBtnHandler backBtnHandler,
+	                                 ReactInstanceManager reactInstanceManager) {
+		this.activity = activity;
+		this.backBtnHandler = backBtnHandler;
 		this.reactInstanceManager = reactInstanceManager;
 	}
 
-	@Override
-	public void onActivityCreated(final Activity activity, Bundle bundle) {
-		if (activity instanceof NavigationActivity) {
-			handleCreated();
-		}
-	}
-
-	@Override
-	public void onActivityStarted(Activity activity) {
-	}
-
-	@Override
-	public void onActivityResumed(Activity activity) {
-		if (activity instanceof NavigationActivity) {
-			handleResumed((NavigationActivity) activity);
-		}
+	public void onActivityCreated() {
+		appLaunchEmitted.set(false);
 	}
 
-	@Override
-	public void onActivityPaused(Activity activity) {
-		if (activity instanceof NavigationActivity) {
-			handlePaused((NavigationActivity) activity);
+	public void onActivityResumed() {
+		if (ReactDevPermission.shouldAskPermission()) {
+			ReactDevPermission.askPermission(activity);
+		} else {
+			reactInstanceManager.onHostResume(activity, backBtnHandler);
+			prepareReactApp();
 		}
 	}
 
-	@Override
-	public void onActivityStopped(Activity activity) {
-	}
-
-	@Override
-	public void onActivitySaveInstanceState(Activity activity, Bundle bundle) {
-	}
-
-	@Override
-	public void onActivityDestroyed(Activity activity) {
-		if (activity instanceof NavigationActivity) {
-			handleDestroyed((NavigationActivity) activity);
+	public void onActivityPaused() {
+		if (reactInstanceManager.hasStartedCreatingInitialContext()) {
+			reactInstanceManager.onHostPause(activity);
 		}
 	}
 
-	private void handleCreated() {
-		appLaunchEmitted.set(false);
-	}
-
-	private void handleResumed(NavigationActivity activity) {
-		if (ReactDevPermission.shouldAskPermission()) {
-			ReactDevPermission.askPermission(activity);
-		} else {
-			reactInstanceManager.onHostResume(activity, activity);
-			prepareReactApp();
+	public void onActivityDestroyed() {
+		if (reactInstanceManager.hasStartedCreatingInitialContext()) {
+			reactInstanceManager.onHostDestroy(activity);
 		}
 	}
 
@@ -107,16 +84,4 @@ public class NavigationActivityLifecycleHandler implements Application.ActivityL
 	private boolean shouldCreateContext() {
 		return !reactInstanceManager.hasStartedCreatingInitialContext();
 	}
-
-	private void handlePaused(NavigationActivity activity) {
-		if (reactInstanceManager.hasStartedCreatingInitialContext()) {
-			reactInstanceManager.onHostPause(activity);
-		}
-	}
-
-	private void handleDestroyed(NavigationActivity activity) {
-		if (reactInstanceManager.hasStartedCreatingInitialContext()) {
-			reactInstanceManager.onHostDestroy(activity);
-		}
-	}
 }

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

@@ -0,0 +1,4 @@
+package com.reactnativenavigation.controllers;
+
+public class CommandsHandler {
+}

android/app/src/test/java/com/reactnativenavigation/NavigationActivityTest.java

@@ -16,4 +16,8 @@ public class NavigationActivityTest extends BaseTest {
 		activity.setContentView(view);
 		assertThat(activity.getContentView()).isSameAs(view);
 	}
+
+	@Test
+	public void reportsLifecycleEventsToDelegate() throws Exception {
+	}
 }

android/app/src/test/java/com/reactnativenavigation/controllers/NavigationActivityLifecycleHandlerTest.java

@@ -0,0 +1,4 @@
+package com.reactnativenavigation.controllers;
+
+public class NavigationActivityLifecycleHandlerTest {
+}