refactor

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

@@ -12,6 +12,7 @@ import com.reactnativenavigation.react.NavigationReactNativeHost;
 
 public abstract class NavigationApplication extends Application implements ReactApplication {
 
+	//TODO un mock this
 	NavigationReactNativeHost reactNativeHost;
 	ActivityLifecycleDelegate activityLifecycle;
 
@@ -28,6 +29,7 @@ public abstract class NavigationApplication extends Application implements React
 
 	public abstract boolean isDebug();
 
+	//TODO inline this
 	void init() {
 		CommandsHandler commandsHandler = new CommandsHandler(this);
 		reactNativeHost = new NavigationReactNativeHost(this, isDebug(), commandsHandler);

lib/android/app/src/main/java/com/reactnativenavigation/controllers/ActivityLifecycleDelegate.java

@@ -2,6 +2,7 @@ package com.reactnativenavigation.controllers;
 
 import com.facebook.react.ReactInstanceManager;
 import com.facebook.react.bridge.ReactContext;
+import com.facebook.react.modules.core.DeviceEventManagerModule;
 import com.reactnativenavigation.NavigationActivity;
 import com.reactnativenavigation.react.DevPermissionRequest;
 import com.reactnativenavigation.react.NavigationEventEmitter;
@@ -60,7 +61,7 @@ public class ActivityLifecycleDelegate {
 
 	private void emitAppLaunchedOnceIfNeeded() {
 		if (appLaunchEmitted.compareAndSet(false, true)) {
-			new NavigationEventEmitter(reactInstanceManager.getCurrentReactContext()).appLaunched();
+			new NavigationEventEmitter(reactInstanceManager.getCurrentReactContext().getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)).appLaunched();
 		}
 	}
 

lib/android/app/src/main/java/com/reactnativenavigation/layout/LayoutFactory.java

@@ -77,7 +77,7 @@ public class LayoutFactory {
 
 	private View createContainer(LayoutNode node) {
 		final String name = node.data.optString("name");
-		Container container = new Container(activity, reactNativeHost, node.id, name);
+		Container container = new Container(activity, node.id, name, reactNativeHost.getReactInstanceManager());
 		container.setId(CompatUtils.generateViewId());
 		return container;
 

lib/android/app/src/main/java/com/reactnativenavigation/layout/containers/Container.java

@@ -5,23 +5,25 @@ import android.os.Bundle;
 import android.view.View;
 import android.widget.FrameLayout;
 
-import com.facebook.react.ReactNativeHost;
+import com.facebook.react.ReactInstanceManager;
 import com.facebook.react.ReactRootView;
-import com.facebook.react.bridge.ReactContext;
-import com.reactnativenavigation.NavigationApplication;
+import com.facebook.react.modules.core.DeviceEventManagerModule;
 import com.reactnativenavigation.react.NavigationEventEmitter;
 
 public class Container extends FrameLayout {
-	private final ReactNativeHost reactNativeHost;
+
 	private final String id;
 	private final String name;
 	private ReactRootView rootView;
+	private final ReactInstanceManager reactInstanceManager;
+
 
-	public Container(Activity activity, ReactNativeHost reactNativeHost, String id, String name) {
+	public Container(Activity activity, String id, String name, final ReactInstanceManager reactInstanceManager) {
 		super(activity);
-		this.reactNativeHost = reactNativeHost;
+
 		this.id = id;
 		this.name = name;
+		this.reactInstanceManager = reactInstanceManager;
 		addView(createReactRootView());
 	}
 
@@ -31,6 +33,7 @@ public class Container extends FrameLayout {
 		onStop();
 	}
 
+
 	public void destroy() {
 		rootView.unmountReactApplication();
 	}
@@ -39,7 +42,7 @@ public class Container extends FrameLayout {
 		rootView = new ReactRootView(getContext());
 		Bundle opts = new Bundle();
 		opts.putString("id", id);
-		rootView.startReactApplication(reactNativeHost.getReactInstanceManager(), name, opts);
+		rootView.startReactApplication(reactInstanceManager, name, opts);
 		rootView.setEventListener(new ReactRootView.ReactRootViewEventListener() {
 			@Override
 			public void onAttachedToReactInstance(final ReactRootView reactRootView) {
@@ -51,15 +54,11 @@ public class Container extends FrameLayout {
 	}
 
 	private void onStart() {
-		new NavigationEventEmitter(reactContext()).containerStart(id);
+		new NavigationEventEmitter(reactInstanceManager.getCurrentReactContext().getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)).containerStart(id);
 	}
 
 	private void onStop() {
-		new NavigationEventEmitter(reactContext()).containerStop(id);
+		new NavigationEventEmitter(reactInstanceManager.getCurrentReactContext().getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)).containerStop(id);
 	}
 
-	private ReactContext reactContext() {
-		//TODO this is wrong, we should inject reactContext somehow
-		return ((NavigationApplication) getContext().getApplicationContext()).getReactNativeHost().getReactInstanceManager().getCurrentReactContext();
-	}
 }

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

@@ -1,7 +1,6 @@
 package com.reactnativenavigation.react;
 
 import com.facebook.react.bridge.Arguments;
-import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.bridge.WritableMap;
 
 import static com.facebook.react.modules.core.DeviceEventManagerModule.RCTDeviceEventEmitter;
@@ -13,8 +12,8 @@ public class NavigationEventEmitter {
 
 	private final RCTDeviceEventEmitter emitter;
 
-	public NavigationEventEmitter(ReactContext reactContext) {
-		this.emitter = reactContext.getJSModule(RCTDeviceEventEmitter.class);
+	public NavigationEventEmitter(final RCTDeviceEventEmitter emitter) {
+		this.emitter = emitter;
 	}
 
 	public void appLaunched() {

lib/android/app/src/test/java/com/reactnativenavigation/layout/ContainerStackTest.java

@@ -36,6 +36,6 @@ public class ContainerStackTest extends BaseTest {
 	private Container createContainer(final NavigationActivity context) {
 		ReactNativeHost reactNativeHost = mock(ReactNativeHost.class);
 		when(reactNativeHost.getReactInstanceManager()).thenReturn(mock(ReactInstanceManager.class));
-		return new Container(context, reactNativeHost, "id", "name");
+		return new Container(context, "id", "name", reactNativeHost.getReactInstanceManager());
 	}
 }