refactor - remove CommandsHandler

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

@@ -3,12 +3,10 @@ package com.reactnativenavigation.e2e.androide2e;
 import android.support.test.uiautomator.By;
 
 import org.junit.FixMethodOrder;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runners.MethodSorters;
 
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
-@Ignore
 public class ApplicationLifecycleTest extends BaseTest {
 
 	@Test

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

@@ -6,7 +6,6 @@ import com.facebook.react.ReactApplication;
 import com.facebook.react.ReactInstanceManager;
 import com.facebook.react.ReactNativeHost;
 import com.reactnativenavigation.controllers.ActivityLifecycleDelegate;
-import com.reactnativenavigation.controllers.CommandsHandler;
 import com.reactnativenavigation.react.DevPermissionRequest;
 import com.reactnativenavigation.react.NavigationReactNativeHost;
 
@@ -18,8 +17,7 @@ public abstract class NavigationApplication extends Application implements React
 	@Override
 	public void onCreate() {
 		super.onCreate();
-		CommandsHandler commandsHandler = new CommandsHandler(this);
-		reactNativeHost = new NavigationReactNativeHost(this, isDebug(), commandsHandler);
+		reactNativeHost = new NavigationReactNativeHost(this, isDebug());
 
 		ReactInstanceManager reactInstanceManager = reactNativeHost.getReactInstanceManager();
 		DevPermissionRequest devPermissionRequest = new DevPermissionRequest(this, isDebug());

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

@@ -1,39 +0,0 @@
-package com.reactnativenavigation.controllers;
-
-import android.view.View;
-
-import com.reactnativenavigation.NavigationActivity;
-import com.reactnativenavigation.NavigationApplication;
-import com.reactnativenavigation.layout.LayoutFactory;
-import com.reactnativenavigation.layout.LayoutNode;
-import com.reactnativenavigation.layout.StackLayout;
-import com.reactnativenavigation.layout.containers.Container;
-
-import org.json.JSONObject;
-
-public class CommandsHandler {
-
-	private final NavigationApplication application;
-
-	public CommandsHandler(NavigationApplication application) {
-		this.application = application;
-	}
-
-	public void setRoot(final NavigationActivity activity, final JSONObject layoutTree) {
-		final LayoutNode layoutTreeRoot = LayoutNode.parse(layoutTree);
-		LayoutFactory factory = new LayoutFactory(activity, application.getReactNativeHost());
-		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, application.getReactNativeHost());
-		final View rootView = factory.create(layoutNode);
-		((StackLayout) activity.getContentView()).push((Container) rootView);
-	}
-
-	public void pop(final NavigationActivity activity, String onContainerId) {
-		((StackLayout) activity.getContentView()).pop();
-	}
-}

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

@@ -6,7 +6,7 @@ import android.view.Gravity;
 import android.view.View;
 import android.view.ViewGroup.LayoutParams;
 
-import com.facebook.react.ReactNativeHost;
+import com.facebook.react.ReactInstanceManager;
 import com.reactnativenavigation.layout.containers.BottomTabs;
 import com.reactnativenavigation.layout.containers.BottomTabsLayout;
 import com.reactnativenavigation.layout.containers.Container;
@@ -17,11 +17,11 @@ import com.reactnativenavigation.utils.CompatUtils;
 public class LayoutFactory {
 
 	private final Activity activity;
-	private ReactNativeHost reactNativeHost;
+	private ReactInstanceManager reactInstanceManager;
 
-	public LayoutFactory(Activity activity, ReactNativeHost reactNativeHost) {
+	public LayoutFactory(Activity activity, final ReactInstanceManager reactInstanceManager) {
 		this.activity = activity;
-		this.reactNativeHost = reactNativeHost;
+		this.reactInstanceManager = reactInstanceManager;
 	}
 
 	public View create(LayoutNode node) {
@@ -77,7 +77,7 @@ public class LayoutFactory {
 
 	private View createContainer(LayoutNode node) {
 		final String name = node.data.optString("name");
-		Container container = new Container(activity, node.id, name, reactNativeHost.getReactInstanceManager());
+		Container container = new Container(activity, node.id, name, reactInstanceManager);
 		container.setId(CompatUtils.generateViewId());
 		return container;
 

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

@@ -1,20 +1,26 @@
 package com.reactnativenavigation.react;
 
+import android.view.View;
+
+import com.facebook.react.ReactInstanceManager;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.bridge.ReactMethod;
 import com.facebook.react.bridge.ReadableMap;
 import com.reactnativenavigation.NavigationActivity;
-import com.reactnativenavigation.controllers.CommandsHandler;
+import com.reactnativenavigation.layout.LayoutFactory;
+import com.reactnativenavigation.layout.LayoutNode;
+import com.reactnativenavigation.layout.StackLayout;
+import com.reactnativenavigation.layout.containers.Container;
 import com.reactnativenavigation.utils.UiThread;
 
 public class NavigationModule extends ReactContextBaseJavaModule {
 	private static final String NAME = "RNNBridgeModule";
-	private CommandsHandler commandsHandler;
+	private ReactInstanceManager reactInstanceManager;
 
-	public NavigationModule(final ReactApplicationContext reactContext, CommandsHandler commandsHandler) {
+	public NavigationModule(final ReactApplicationContext reactContext, final ReactInstanceManager reactInstanceManager) {
 		super(reactContext);
-		this.commandsHandler = commandsHandler;
+		this.reactInstanceManager = reactInstanceManager;
 	}
 
 	@Override
@@ -27,7 +33,10 @@ public class NavigationModule extends ReactContextBaseJavaModule {
 		handle(new Runnable() {
 			@Override
 			public void run() {
-				commandsHandler.setRoot(activity(), ArgsParser.parse(layoutTree));
+				final LayoutNode layoutTreeRoot = LayoutNode.parse(ArgsParser.parse(layoutTree));
+				LayoutFactory factory = new LayoutFactory(activity(), reactInstanceManager);
+				final View rootView = factory.create(layoutTreeRoot);
+				activity().setContentView(rootView);
 			}
 		});
 	}
@@ -37,7 +46,10 @@ public class NavigationModule extends ReactContextBaseJavaModule {
 		handle(new Runnable() {
 			@Override
 			public void run() {
-				commandsHandler.push(activity(), onContainerId, ArgsParser.parse(layoutTree));
+				final LayoutNode layoutNode = LayoutNode.parse(ArgsParser.parse(layoutTree));
+				LayoutFactory factory = new LayoutFactory(activity(), reactInstanceManager);
+				final View rootView = factory.create(layoutNode);
+				((StackLayout) activity().getContentView()).push((Container) rootView);
 			}
 		});
 	}
@@ -47,7 +59,7 @@ public class NavigationModule extends ReactContextBaseJavaModule {
 		handle(new Runnable() {
 			@Override
 			public void run() {
-				commandsHandler.pop(activity(), onContainerId);
+				((StackLayout) activity().getContentView()).pop();
 			}
 		});
 	}

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

@@ -1,11 +1,11 @@
 package com.reactnativenavigation.react;
 
+import com.facebook.react.ReactNativeHost;
 import com.facebook.react.ReactPackage;
 import com.facebook.react.bridge.JavaScriptModule;
 import com.facebook.react.bridge.NativeModule;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.uimanager.ViewManager;
-import com.reactnativenavigation.controllers.CommandsHandler;
 
 import java.util.Arrays;
 import java.util.Collections;
@@ -13,16 +13,16 @@ import java.util.List;
 
 public class NavigationPackage implements ReactPackage {
 
-	private CommandsHandler commandsHandler;
+	private ReactNativeHost reactNativeHost;
 
-	public NavigationPackage(final CommandsHandler commandsHandler) {
-		this.commandsHandler = commandsHandler;
+	public NavigationPackage(final ReactNativeHost reactNativeHost) {
+		this.reactNativeHost = reactNativeHost;
 	}
 
 	@Override
 	public List<NativeModule> createNativeModules(ReactApplicationContext reactContext) {
 		return Arrays.<NativeModule>asList(
-				new NavigationModule(reactContext, commandsHandler)
+				new NavigationModule(reactContext, reactNativeHost.getReactInstanceManager())
 		);
 	}
 

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

@@ -5,7 +5,6 @@ import android.app.Application;
 import com.facebook.react.ReactNativeHost;
 import com.facebook.react.ReactPackage;
 import com.facebook.react.shell.MainReactPackage;
-import com.reactnativenavigation.controllers.CommandsHandler;
 
 import java.util.Arrays;
 import java.util.List;
@@ -13,12 +12,10 @@ import java.util.List;
 public class NavigationReactNativeHost extends ReactNativeHost {
 
 	private final boolean isDebug;
-	private CommandsHandler commandsHandler;
 
-	public NavigationReactNativeHost(Application application, boolean isDebug, CommandsHandler commandsHandler) {
+	public NavigationReactNativeHost(Application application, boolean isDebug) {
 		super(application);
 		this.isDebug = isDebug;
-		this.commandsHandler = commandsHandler;
 	}
 
 	@Override
@@ -30,7 +27,7 @@ public class NavigationReactNativeHost extends ReactNativeHost {
 	protected List<ReactPackage> getPackages() {
 		return Arrays.<ReactPackage>asList(
 				new MainReactPackage(),
-				new NavigationPackage(commandsHandler)
+				new NavigationPackage(this)
 		);
 	}
 }