rootViewCreator

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

@@ -8,6 +8,7 @@ import com.reactnativenavigation.controllers.ActivityLifecycleDelegate;
 import com.reactnativenavigation.controllers.CommandsHandler;
 import com.reactnativenavigation.react.DevPermissionRequestImpl;
 import com.reactnativenavigation.react.NavigationReactNativeHost;
+import com.reactnativenavigation.react.NavigationReactRootViewCreator;
 
 public abstract class NavigationApplication extends Application implements ReactApplication {
 	public static NavigationApplication instance;
@@ -47,7 +48,7 @@ public abstract class NavigationApplication extends Application implements React
 		Config config = new Config();
 		config.reactNativeHost = new NavigationReactNativeHost(this, isDebug());
 		config.activityLifecycleDelegate = new ActivityLifecycleDelegate(config.reactNativeHost.getReactInstanceManager(), new DevPermissionRequestImpl());
-		config.commandsHandler = new CommandsHandler();
+		config.commandsHandler = new CommandsHandler(new NavigationReactRootViewCreator());
 		return config;
 	}
 }

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

@@ -6,25 +6,28 @@ import com.reactnativenavigation.NavigationActivity;
 import com.reactnativenavigation.layout.LayoutFactory;
 import com.reactnativenavigation.layout.LayoutNode;
 import com.reactnativenavigation.layout.StackLayout;
-import com.reactnativenavigation.react.NavigationReactRootViewCreator;
+import com.reactnativenavigation.react.ReactRootViewCreator;
 
 import org.json.JSONObject;
 
 public class CommandsHandler {
 
+	private final ReactRootViewCreator reactRootViewCreator;
+
+	public CommandsHandler(ReactRootViewCreator reactRootViewCreator) {
+		this.reactRootViewCreator = reactRootViewCreator;
+	}
+
 	public void setRoot(final NavigationActivity activity, final JSONObject layoutTree) {
 		final LayoutNode layoutTreeRoot = LayoutNode.parse(layoutTree);
-		LayoutFactory factory =
-				new LayoutFactory(activity, new NavigationReactRootViewCreator());
-
+		LayoutFactory factory = new LayoutFactory(activity, reactRootViewCreator);
 		final View rootView = factory.create(layoutTreeRoot);
 		activity.setContentView(rootView);
 	}
 
 	public void push(final NavigationActivity activity, String onContainerId, JSONObject layoutTree) {
 		final LayoutNode layoutNode = LayoutNode.parse(layoutTree);
-		LayoutFactory factory =
-				new LayoutFactory(activity, new NavigationReactRootViewCreator());
+		LayoutFactory factory = new LayoutFactory(activity, reactRootViewCreator);
 		final View rootView = factory.create(layoutNode);
 		((StackLayout) activity.getContentView()).push(rootView);
 	}

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

@@ -5,11 +5,12 @@ import android.widget.FrameLayout;
 
 import com.reactnativenavigation.NavigationApplication;
 import com.reactnativenavigation.react.NavigationEventEmitter;
+import com.reactnativenavigation.react.ReactRootViewCreator;
 
 public class Container extends FrameLayout {
 	private final String id;
 
-	public Container(Activity activity, LayoutFactory.ReactRootViewCreator reactRootViewCreator, String id, String name) {
+	public Container(Activity activity, ReactRootViewCreator reactRootViewCreator, String id, String name) {
 		super(activity);
 		this.id = id;
 		addView(reactRootViewCreator.create(activity, id, name));

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

@@ -8,16 +8,13 @@ import android.view.ViewGroup.LayoutParams;
 
 import com.reactnativenavigation.layout.bottomtabs.BottomTabsCreator;
 import com.reactnativenavigation.layout.bottomtabs.BottomTabsLayout;
+import com.reactnativenavigation.react.ReactRootViewCreator;
 import com.reactnativenavigation.utils.CompatUtils;
 
 import java.util.List;
 
 public class LayoutFactory {
 
-	public interface ReactRootViewCreator {
-		View create(Activity activity, String id, String name);
-	}
-
 	private final Activity activity;
 	private final ReactRootViewCreator reactRootViewCreator;
 	private final BottomTabsCreator bottomTabsCreator; // TODO: revisit this, may not be needed

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

@@ -11,7 +11,7 @@ import com.reactnativenavigation.utils.UiThread;
 public class NavigationModule extends ReactContextBaseJavaModule {
 	private static final String NAME = "RNNBridgeModule";
 
-	public NavigationModule(ReactApplicationContext reactContext) {
+	public NavigationModule(final ReactApplicationContext reactContext) {
 		super(reactContext);
 	}
 

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

@@ -6,7 +6,6 @@ import android.view.View;
 
 import com.facebook.react.ReactRootView;
 import com.reactnativenavigation.NavigationApplication;
-import com.reactnativenavigation.layout.LayoutFactory.ReactRootViewCreator;
 
 public class NavigationReactRootViewCreator implements ReactRootViewCreator {
 	@Override

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

@@ -0,0 +1,8 @@
+package com.reactnativenavigation.react;
+
+import android.app.Activity;
+import android.view.View;
+
+public interface ReactRootViewCreator {
+	View create(Activity activity, final String id, final String name);
+}

lib/android/app/src/test/java/com/reactnativenavigation/TestApplication.java

@@ -4,6 +4,7 @@ import com.reactnativenavigation.controllers.ActivityLifecycleDelegate;
 import com.reactnativenavigation.controllers.CommandsHandler;
 import com.reactnativenavigation.mocks.TestDevPermissionRequest;
 import com.reactnativenavigation.mocks.TestReactNativeHost;
+import com.reactnativenavigation.react.NavigationReactRootViewCreator;
 
 public class TestApplication extends NavigationApplication {
 
@@ -17,7 +18,7 @@ public class TestApplication extends NavigationApplication {
 		Config config = new Config();
 		config.reactNativeHost = new TestReactNativeHost(this, isDebug());
 		config.activityLifecycleDelegate = new ActivityLifecycleDelegate(config.reactNativeHost.getReactInstanceManager(), new TestDevPermissionRequest());
-		config.commandsHandler = new CommandsHandler();
+		config.commandsHandler = new CommandsHandler(new NavigationReactRootViewCreator());
 		return config;
 	}
 }

lib/android/app/src/test/java/com/reactnativenavigation/controllers/CommandsHandlerTest.java

@@ -2,6 +2,7 @@ package com.reactnativenavigation.controllers;
 
 import com.reactnativenavigation.BaseTest;
 import com.reactnativenavigation.NavigationActivity;
+import com.reactnativenavigation.NavigationApplication;
 import com.reactnativenavigation.layout.Container;
 
 import org.json.JSONObject;
@@ -14,7 +15,7 @@ public class CommandsHandlerTest extends BaseTest {
 
 	@Test
 	public void setRootCreatesTheLayout_SetContentView() throws Exception {
-		CommandsHandler uut = new CommandsHandler();
+		CommandsHandler uut = NavigationApplication.instance.getConfig().commandsHandler;
 		JSONObject json = new JSONObject("{" +
 				"id: containerId123," +
 				"type: Container" +