sorting out android

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

@@ -13,25 +13,25 @@ public class NavigationActivity extends AppCompatActivity implements DefaultHard
 	@Override
 	protected void onCreate(@Nullable Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
-		NavigationApplication.instance.getConfig().activityLifecycleDelegate.onActivityCreated(this);
+		app().activityLifecycleDelegate.onActivityCreated(this);
 	}
 
 	@Override
 	protected void onResume() {
 		super.onResume();
-		NavigationApplication.instance.getConfig().activityLifecycleDelegate.onActivityResumed(this, this);
+		app().activityLifecycleDelegate.onActivityResumed(this, this);
 	}
 
 	@Override
 	protected void onPause() {
 		super.onPause();
-		NavigationApplication.instance.getConfig().activityLifecycleDelegate.onActivityPaused(this);
+		app().activityLifecycleDelegate.onActivityPaused(this);
 	}
 
 	@Override
 	protected void onDestroy() {
 		super.onDestroy();
-		NavigationApplication.instance.getConfig().activityLifecycleDelegate.onActivityDestroyed(this);
+		app().activityLifecycleDelegate.onActivityDestroyed(this);
 	}
 
 	@Override
@@ -49,4 +49,8 @@ public class NavigationActivity extends AppCompatActivity implements DefaultHard
 	public void invokeDefaultOnBackPressed() {
 		onBackPressed();
 	}
+
+	private NavigationApplication app() {
+		return ((NavigationApplication) getApplication());
+	}
 }

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

@@ -3,52 +3,39 @@ package com.reactnativenavigation;
 import android.app.Application;
 
 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.DevPermissionRequestImpl;
 import com.reactnativenavigation.react.NavigationReactNativeHost;
-import com.reactnativenavigation.react.NavigationReactRootViewCreator;
+import com.reactnativenavigation.react.ReactRootViewCreatorImpl;
 
 public abstract class NavigationApplication extends Application implements ReactApplication {
-	public static NavigationApplication instance;
 
-	public static class Config {
-		public ReactNativeHost reactNativeHost;
-		public ActivityLifecycleDelegate activityLifecycleDelegate;
-		public CommandsHandler commandsHandler;
-	}
-
-	private Config config;
+	NavigationReactNativeHost reactNativeHost;
+	ActivityLifecycleDelegate activityLifecycleDelegate;
 
 	@Override
 	public void onCreate() {
 		super.onCreate();
-		instance = this;
-		config = createConfig();
-	}
-
-	public final Config getConfig() {
-		return config;
+		init();
 	}
 
 	@Override
 	public ReactNativeHost getReactNativeHost() {
-		return getConfig().reactNativeHost;
+		return reactNativeHost;
 	}
 
 	public abstract boolean isDebug();
 
-	/**
-	 * override this to inject your own configuration
-	 *
-	 * @return the Config
-	 */
-	protected Config createConfig() {
-		Config config = new Config();
-		config.reactNativeHost = new NavigationReactNativeHost(this, isDebug());
-		config.activityLifecycleDelegate = new ActivityLifecycleDelegate(config.reactNativeHost.getReactInstanceManager(), new DevPermissionRequestImpl());
-		config.commandsHandler = new CommandsHandler(new NavigationReactRootViewCreator());
-		return config;
+	void init() {
+		ReactRootViewCreatorImpl reactRootViewCreator = new ReactRootViewCreatorImpl();
+		CommandsHandler commandsHandler = new CommandsHandler(reactRootViewCreator);
+		reactNativeHost = new NavigationReactNativeHost(this, isDebug(), commandsHandler);
+
+		ReactInstanceManager reactInstanceManager = reactNativeHost.getReactInstanceManager();
+		DevPermissionRequestImpl devPermissionRequest = new DevPermissionRequestImpl(this, isDebug());
+		activityLifecycleDelegate = new ActivityLifecycleDelegate(reactInstanceManager, devPermissionRequest);
 	}
 }

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

@@ -30,7 +30,8 @@ public class Container extends FrameLayout {
 	@Override
 	protected void onDetachedFromWindow() {
 		super.onDetachedFromWindow();
-		NavigationEventEmitter.emit(NavigationApplication.instance.getReactNativeHost().getReactInstanceManager().getCurrentReactContext())
+		//TODO this is wrong
+		NavigationEventEmitter.emit(((NavigationApplication) getContext().getApplicationContext()).getReactNativeHost().getReactInstanceManager().getCurrentReactContext())
 				.containerStop(id);
 	}
 }

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

@@ -1,6 +1,7 @@
 package com.reactnativenavigation.react;
 
 import android.annotation.TargetApi;
+import android.app.Application;
 import android.content.Intent;
 import android.os.Build;
 import android.provider.Settings;
@@ -8,14 +9,21 @@ import android.util.Log;
 import android.widget.Toast;
 
 import com.facebook.react.common.ReactConstants;
-import com.reactnativenavigation.NavigationApplication;
 
 public class DevPermissionRequestImpl implements DevPermissionRequest {
 
+	private final Application application;
+	private final boolean isDebug;
+
+	public DevPermissionRequestImpl(Application application, boolean isDebug) {
+		this.application = application;
+		this.isDebug = isDebug;
+	}
+
 	public boolean shouldAskPermission() {
-		return NavigationApplication.instance.isDebug() &&
+		return isDebug &&
 				Build.VERSION.SDK_INT >= 23 &&
-				!Settings.canDrawOverlays(NavigationApplication.instance);
+				!Settings.canDrawOverlays(application);
 	}
 
 	@Override
@@ -24,12 +32,12 @@ public class DevPermissionRequestImpl implements DevPermissionRequest {
 		if (shouldAskPermission()) {
 			Intent serviceIntent = new Intent(Settings.ACTION_MANAGE_OVERLAY_PERMISSION);
 			serviceIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-			NavigationApplication.instance.startActivity(serviceIntent);
+			application.startActivity(serviceIntent);
 			String msg = "Overlay permissions needs to be granted in order for react native apps to run in dev mode";
 			Log.w(ReactConstants.TAG, "======================================\n\n");
 			Log.w(ReactConstants.TAG, msg);
 			Log.w(ReactConstants.TAG, "\n\n======================================");
-			Toast.makeText(NavigationApplication.instance, msg, Toast.LENGTH_LONG).show();
+			Toast.makeText(application, msg, Toast.LENGTH_LONG).show();
 		}
 	}
 }

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

@@ -5,14 +5,16 @@ 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.NavigationApplication;
+import com.reactnativenavigation.controllers.CommandsHandler;
 import com.reactnativenavigation.utils.UiThread;
 
 public class NavigationModule extends ReactContextBaseJavaModule {
 	private static final String NAME = "RNNBridgeModule";
+	private CommandsHandler commandsHandler;
 
-	public NavigationModule(final ReactApplicationContext reactContext) {
+	public NavigationModule(final ReactApplicationContext reactContext, CommandsHandler commandsHandler) {
 		super(reactContext);
+		this.commandsHandler = commandsHandler;
 	}
 
 	@Override
@@ -20,16 +22,12 @@ public class NavigationModule extends ReactContextBaseJavaModule {
 		return NAME;
 	}
 
-	public NavigationActivity activity() {
-		return (NavigationActivity) getCurrentActivity();
-	}
-
 	@ReactMethod
 	public void setRoot(final ReadableMap layoutTree) {
 		handle(new Runnable() {
 			@Override
 			public void run() {
-				NavigationApplication.instance.getConfig().commandsHandler.setRoot(activity(), ArgsParser.parse(layoutTree));
+				commandsHandler.setRoot(activity(), ArgsParser.parse(layoutTree));
 			}
 		});
 	}
@@ -39,7 +37,7 @@ public class NavigationModule extends ReactContextBaseJavaModule {
 		handle(new Runnable() {
 			@Override
 			public void run() {
-				NavigationApplication.instance.getConfig().commandsHandler.push(activity(), onContainerId, ArgsParser.parse(layoutTree));
+				commandsHandler.push(activity(), onContainerId, ArgsParser.parse(layoutTree));
 			}
 		});
 	}
@@ -49,11 +47,15 @@ public class NavigationModule extends ReactContextBaseJavaModule {
 		handle(new Runnable() {
 			@Override
 			public void run() {
-				NavigationApplication.instance.getConfig().commandsHandler.pop(activity(), onContainerId);
+				commandsHandler.pop(activity(), onContainerId);
 			}
 		});
 	}
 
+	NavigationActivity activity() {
+		return (NavigationActivity) getCurrentActivity();
+	}
+
 	private void handle(Runnable task) {
 		if (activity() == null) return;
 		UiThread.post(task);

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

@@ -5,6 +5,7 @@ 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;
@@ -12,10 +13,16 @@ import java.util.List;
 
 public class NavigationPackage implements ReactPackage {
 
+	private CommandsHandler commandsHandler;
+
+	public NavigationPackage(final CommandsHandler commandsHandler) {
+		this.commandsHandler = commandsHandler;
+	}
+
 	@Override
 	public List<NativeModule> createNativeModules(ReactApplicationContext reactContext) {
 		return Arrays.<NativeModule>asList(
-				new NavigationModule(reactContext)
+				new NavigationModule(reactContext, commandsHandler)
 		);
 	}
 

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

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

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

@@ -4,16 +4,20 @@ import android.app.Activity;
 import android.os.Bundle;
 import android.view.View;
 
+import com.facebook.react.ReactInstanceManager;
 import com.facebook.react.ReactRootView;
 import com.reactnativenavigation.NavigationApplication;
 
-public class NavigationReactRootViewCreator implements ReactRootViewCreator {
+public class ReactRootViewCreatorImpl implements ReactRootViewCreator {
+
 	@Override
 	public View create(Activity activity, final String id, final String name) {
 		ReactRootView rootView = new ReactRootView(activity);
 		Bundle opts = new Bundle();
 		opts.putString("id", id);
-		rootView.startReactApplication(NavigationApplication.instance.getReactNativeHost().getReactInstanceManager(), name, opts);
+		//TODO this seems like a hack
+		ReactInstanceManager reactInstanceManager = ((NavigationApplication) activity.getApplication()).getReactNativeHost().getReactInstanceManager();
+		rootView.startReactApplication(reactInstanceManager, name, opts);
 		return rootView;
 	}
 }

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

@@ -5,6 +5,7 @@ import com.facebook.react.uimanager.DisplayMetricsHolder;
 import org.junit.Before;
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 
 @RunWith(RobolectricTestRunner.class)
@@ -13,6 +14,6 @@ public abstract class BaseTest {
 
 	@Before
 	public void beforeEach() {
-		DisplayMetricsHolder.initDisplayMetrics(NavigationApplication.instance);
+		DisplayMetricsHolder.initDisplayMetrics(RuntimeEnvironment.application);
 	}
 }

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

@@ -1,62 +0,0 @@
-package com.reactnativenavigation;
-
-import android.view.View;
-
-import com.facebook.react.modules.core.DefaultHardwareBackBtnHandler;
-import com.reactnativenavigation.controllers.ActivityLifecycleDelegate;
-
-import org.junit.Test;
-import org.robolectric.Robolectric;
-import org.robolectric.android.controller.ActivityController;
-
-import static org.assertj.core.api.Java6Assertions.assertThat;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoMoreInteractions;
-import static org.mockito.Mockito.verifyZeroInteractions;
-
-public class NavigationActivityTest extends BaseTest {
-
-	@Test
-	public void holdsContentView() throws Exception {
-		NavigationActivity activity = Robolectric.setupActivity(NavigationActivity.class);
-		assertThat(activity.getContentView()).isNull();
-		View view = new View(activity);
-		activity.setContentView(view);
-		assertThat(activity.getContentView()).isSameAs(view);
-	}
-
-	@Test
-	public void reportsLifecycleEventsToDelegate() throws Exception {
-		ActivityController<NavigationActivity> activityController = Robolectric.buildActivity(NavigationActivity.class);
-		NavigationApplication.instance.getConfig().activityLifecycleDelegate = mock(ActivityLifecycleDelegate.class);
-		ActivityLifecycleDelegate activityLifecycleDelegate = NavigationApplication.instance.getConfig().activityLifecycleDelegate;
-
-		verifyZeroInteractions(activityLifecycleDelegate);
-
-		activityController.create();
-		verify(activityLifecycleDelegate, times(1)).onActivityCreated(activityController.get());
-		verifyNoMoreInteractions(activityLifecycleDelegate);
-
-		activityController.resume();
-		verify(activityLifecycleDelegate, times(1)).onActivityResumed(activityController.get(), activityController.get());
-		verifyNoMoreInteractions(activityLifecycleDelegate);
-
-		activityController.pause();
-		verify(activityLifecycleDelegate, times(1)).onActivityPaused(activityController.get());
-		verifyNoMoreInteractions(activityLifecycleDelegate);
-
-		activityController.destroy();
-		verify(activityLifecycleDelegate, times(1)).onActivityDestroyed(activityController.get());
-		verifyNoMoreInteractions(activityLifecycleDelegate);
-	}
-
-	@Test
-	public void defaultBackBtnHandler() throws Exception {
-		NavigationActivity navigationActivity = Robolectric.setupActivity(NavigationActivity.class);
-		assertThat(navigationActivity).isInstanceOf(DefaultHardwareBackBtnHandler.class);
-		navigationActivity.invokeDefaultOnBackPressed();
-		assertThat(navigationActivity.isFinishing()).isTrue();
-	}
-}

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

@@ -1,40 +0,0 @@
-package com.reactnativenavigation;
-
-import com.facebook.react.ReactApplication;
-import com.facebook.react.ReactNativeHost;
-import com.reactnativenavigation.controllers.ActivityLifecycleDelegate;
-
-import org.junit.Test;
-import org.robolectric.RuntimeEnvironment;
-
-import static org.assertj.core.api.Java6Assertions.assertThat;
-
-public class NavigationApplicationTest extends BaseTest {
-
-	@Test
-	public void reactApplication() throws Exception {
-		assertThat(RuntimeEnvironment.application).isInstanceOf(ReactApplication.class);
-		assertThat(((ReactApplication) RuntimeEnvironment.application).getReactNativeHost()).isNotNull();
-	}
-
-	@Test
-	public void isDebug() throws Exception {
-		assertThat(((NavigationApplication) RuntimeEnvironment.application).isDebug()).isTrue();
-	}
-
-	@Test
-	public void singleGlobalInstance() throws Exception {
-		assertThat(RuntimeEnvironment.application).isSameAs(NavigationApplication.instance);
-	}
-
-	@Test
-	public void holdsConfiguration() throws Exception {
-		assertThat(NavigationApplication.instance.getConfig()).isInstanceOf(NavigationApplication.Config.class);
-	}
-
-	@Test
-	public void config() throws Exception {
-		assertThat(NavigationApplication.instance.getConfig().reactNativeHost).isInstanceOf(ReactNativeHost.class);
-		assertThat(NavigationApplication.instance.getConfig().activityLifecycleDelegate).isInstanceOf(ActivityLifecycleDelegate.class);
-	}
-}

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

@@ -4,7 +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;
+import com.reactnativenavigation.react.ReactRootViewCreatorImpl;
 
 public class TestApplication extends NavigationApplication {
 
@@ -14,11 +14,8 @@ public class TestApplication extends NavigationApplication {
 	}
 
 	@Override
-	protected Config createConfig() {
-		Config config = new Config();
-		config.reactNativeHost = new TestReactNativeHost(this, isDebug());
-		config.activityLifecycleDelegate = new ActivityLifecycleDelegate(config.reactNativeHost.getReactInstanceManager(), new TestDevPermissionRequest());
-		config.commandsHandler = new CommandsHandler(new NavigationReactRootViewCreator());
-		return config;
+	protected void init() {
+		reactNativeHost = new TestReactNativeHost(this, isDebug(), new CommandsHandler(new ReactRootViewCreatorImpl()));
+		activityLifecycleDelegate = new ActivityLifecycleDelegate(reactNativeHost.getReactInstanceManager(), new TestDevPermissionRequest());
 	}
 }

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

@@ -1,29 +0,0 @@
-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;
-import org.junit.Test;
-import org.robolectric.Robolectric;
-
-import static org.assertj.core.api.Java6Assertions.assertThat;
-
-public class CommandsHandlerTest extends BaseTest {
-
-	@Test
-	public void setRootCreatesTheLayout_SetContentView() throws Exception {
-		CommandsHandler uut = NavigationApplication.instance.getConfig().commandsHandler;
-		JSONObject json = new JSONObject("{" +
-				"id: containerId123," +
-				"type: Container" +
-				"}");
-		NavigationActivity activity = Robolectric.setupActivity(NavigationActivity.class);
-		uut.setRoot(activity, json);
-
-		assertThat(activity.getContentView()).isInstanceOf(Container.class);
-		assertThat(((Container) activity.getContentView()).getContainerId()).isEqualTo("containerId123");
-	}
-}

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

@@ -1,135 +0,0 @@
-package com.reactnativenavigation.layout;
-
-import android.app.Activity;
-import android.view.View;
-
-import com.reactnativenavigation.BaseTest;
-import com.reactnativenavigation.layout.bottomtabs.BottomTabs;
-import com.reactnativenavigation.layout.bottomtabs.BottomTabsLayout;
-import com.reactnativenavigation.layout.bottomtabs.TooManyTabsException;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.robolectric.Robolectric;
-
-import static org.assertj.core.api.Java6Assertions.assertThat;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-
-public class BottomTabsContainerTest extends BaseTest {
-
-	private static final String TAB_NAME = "myTab";
-	private static final String OTHER_TAB_NAME = "myOtherTab";
-
-	private BottomTabs bottomTabs;
-	private Activity activity;
-
-	@Before
-	public void setUp() throws Exception {
-		bottomTabs = mock(BottomTabs.class);
-		activity = Robolectric.buildActivity(Activity.class).get();
-	}
-
-	@Test
-	public void addsTabToBottomTabs() throws Exception {
-		ContainerStackLayout tabContent = new ContainerStackLayout(activity);
-
-		BottomTabsLayout bottomTabsContainer = createBottomTabsContainer();
-		bottomTabsContainer.addTabContent(TAB_NAME, tabContent);
-
-		verify(bottomTabs).add(TAB_NAME);
-	}
-
-	@Test
-	public void addsTabContentToLayout() throws Exception {
-		ContainerStackLayout stackLayout = new ContainerStackLayout(activity);
-
-		BottomTabsLayout bottomTabsContainer = createBottomTabsContainer();
-		bottomTabsContainer.addTabContent(TAB_NAME, stackLayout);
-
-		verify(bottomTabs).attach(bottomTabsContainer);
-		TestUtils.assertViewChildren(bottomTabsContainer, stackLayout);
-	}
-
-	@Test
-	public void addsTwoTabsContentToLayout() throws Exception {
-		View tabContent = new ContainerStackLayout(activity);
-		View otherTabContent = new ContainerStackLayout(activity);
-
-		BottomTabsLayout bottomTabsContainer = createBottomTabsContainer();
-		bottomTabsContainer.addTabContent(TAB_NAME, tabContent);
-		bottomTabsContainer.addTabContent(OTHER_TAB_NAME, otherTabContent);
-
-		TestUtils.assertViewChildren(bottomTabsContainer, tabContent, otherTabContent);
-	}
-
-	@Test(expected = TooManyTabsException.class)
-	public void throwsExceptionWhenMoreThenFiveTabs() throws Exception {
-		BottomTabsLayout bottomTabsContainer = createBottomTabsContainer();
-		for (int i = 0; i < 6; i++) {
-			ContainerStackLayout content = new ContainerStackLayout(activity);
-			bottomTabsContainer.addTabContent("#" + i, content);
-		}
-	}
-
-	@Test
-	public void addFiveTabs() throws Exception {
-		BottomTabsLayout bottomTabsContainer = createBottomTabsContainer();
-		for (int i = 0; i < 5; i++) {
-			ContainerStackLayout content = new ContainerStackLayout(activity);
-			bottomTabsContainer.addTabContent("#" + i, content);
-		}
-	}
-
-	@Test
-	public void onlyFirstTabShouldBeVisible() throws Exception {
-		ContainerStackLayout tabContent = new ContainerStackLayout(activity);
-		ContainerStackLayout otherTabContent = new ContainerStackLayout(activity);
-
-		BottomTabsLayout bottomTabsContainer = createBottomTabsContainer();
-		bottomTabsContainer.addTabContent(TAB_NAME, tabContent);
-		bottomTabsContainer.addTabContent(OTHER_TAB_NAME, otherTabContent);
-
-		assertThat(tabContent.getVisibility()).isEqualTo(View.VISIBLE);
-		assertThat(otherTabContent.getVisibility()).isEqualTo(View.GONE);
-	}
-
-	@Test
-	public void listensToTabsSwitchingEvents() throws Exception {
-		BottomTabsLayout bottomTabsContainer = createBottomTabsContainer();
-		verify(bottomTabs).setSelectionListener(bottomTabsContainer);
-	}
-
-	@Test
-	public void switchesBetweenFirstAndSecondTabs() throws Exception {
-		ContainerStackLayout tabContent = new ContainerStackLayout(activity);
-		ContainerStackLayout otherTabContent = new ContainerStackLayout(activity);
-
-		BottomTabsLayout bottomTabsContainer = createBottomTabsContainer();
-		bottomTabsContainer.addTabContent(TAB_NAME, tabContent);
-		bottomTabsContainer.addTabContent(OTHER_TAB_NAME, otherTabContent);
-		bottomTabsContainer.onTabSelected(1);
-
-		assertThat(tabContent.getVisibility()).isEqualTo(View.GONE);
-		assertThat(otherTabContent.getVisibility()).isEqualTo(View.VISIBLE);
-	}
-
-	@Test
-	public void switchesBetweenSecondAndFirstTabs() throws Exception {
-		ContainerStackLayout tabContent = new ContainerStackLayout(activity);
-		ContainerStackLayout otherTabContent = new ContainerStackLayout(activity);
-
-		BottomTabsLayout bottomTabsContainer = createBottomTabsContainer();
-		bottomTabsContainer.addTabContent(TAB_NAME, tabContent);
-		bottomTabsContainer.addTabContent(OTHER_TAB_NAME, otherTabContent);
-		bottomTabsContainer.onTabSelected(1);
-		bottomTabsContainer.onTabSelected(0);
-
-		assertThat(tabContent.getVisibility()).isEqualTo(View.VISIBLE);
-		assertThat(otherTabContent.getVisibility()).isEqualTo(View.GONE);
-	}
-
-	private BottomTabsLayout createBottomTabsContainer() {
-		return new BottomTabsLayout(activity, bottomTabs);
-	}
-}

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

@@ -1,238 +0,0 @@
-package com.reactnativenavigation.layout;
-
-import android.app.Activity;
-import android.support.v7.app.AppCompatActivity;
-import android.view.View;
-import android.view.ViewGroup;
-
-import com.reactnativenavigation.BaseTest;
-import com.reactnativenavigation.layout.bottomtabs.BottomTabsLayout;
-import com.reactnativenavigation.react.ReactRootViewCreator;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-import org.junit.Before;
-import org.junit.Test;
-import org.robolectric.Robolectric;
-
-import java.util.Arrays;
-import java.util.List;
-
-import static org.assertj.core.api.Java6Assertions.assertThat;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-public class LayoutFactoryTest extends BaseTest {
-
-	private final static String NODE_ID = "myUniqueId";
-	private final static String REACT_ROOT_VIEW_KEY = "myName";
-
-	private final static String OTHER_NODE_ID = "anotherUniqueId";
-	private final static String OTHER_REACT_ROOT_VIEW_KEY = "anotherName";
-
-	private Activity activity;
-	private View mockView;
-	private View otherMockView;
-	private ReactRootViewCreator reactRootViewCreator;
-
-	@Before
-	public void setUp() {
-		activity = Robolectric.buildActivity(AppCompatActivity.class).get();
-		mockView = new View(activity);
-		otherMockView = new View(activity);
-		reactRootViewCreator = mock(ReactRootViewCreator.class);
-	}
-
-	@Test
-	public void returnsContainerThatHoldsTheRootView() throws Exception {
-		when(reactRootViewCreator.create(any(Activity.class), eq(NODE_ID), eq(REACT_ROOT_VIEW_KEY))).thenReturn(mockView);
-		final LayoutNode node = createContainerNode();
-
-		final ViewGroup result = (ViewGroup) createLayoutFactory().create(node);
-
-		assertThat(result).isInstanceOf(Container.class);
-		TestUtils.assertViewChildren(result, mockView);
-	}
-
-	@Test
-	public void returnsContainerStack() throws Exception {
-		when(reactRootViewCreator.create(any(Activity.class), eq(NODE_ID), eq(REACT_ROOT_VIEW_KEY))).thenReturn(mockView);
-		final LayoutNode containerNode = createContainerNode();
-		final LayoutNode stackNode = createContainerStackNode(containerNode);
-
-		final ViewGroup result = (ViewGroup) createLayoutFactory().create(stackNode);
-
-		assertThat(result).isInstanceOf(ContainerStackLayout.class);
-		ViewGroup container = (ViewGroup) TestUtils.assertViewChildrenCount(result, 1).get(0);
-		TestUtils.assertViewChildren(container, mockView);
-	}
-
-	@Test
-	public void returnsContainerStackWithMultipleViews() throws Exception {
-		final View mockView1 = mock(View.class);
-		final View mockView2 = mock(View.class);
-		when(reactRootViewCreator.create(any(Activity.class), eq(NODE_ID), eq(REACT_ROOT_VIEW_KEY))).thenReturn(mockView1);
-		when(reactRootViewCreator.create(any(Activity.class), eq(OTHER_NODE_ID), eq(OTHER_REACT_ROOT_VIEW_KEY))).thenReturn(mockView2);
-
-		final LayoutNode containerNode1 = createContainerNode(NODE_ID, REACT_ROOT_VIEW_KEY);
-		final LayoutNode containerNode2 = createContainerNode(OTHER_NODE_ID, OTHER_REACT_ROOT_VIEW_KEY);
-		final LayoutNode stackNode = createContainerStackNode(containerNode1, containerNode2);
-
-		final ViewGroup result = (ViewGroup) createLayoutFactory().create(stackNode);
-
-		assertThat(result).isInstanceOf(ContainerStackLayout.class);
-		List<View> containers = TestUtils.assertViewChildrenCount(result, 2);
-		ViewGroup container1 = (ViewGroup) containers.get(0);
-		ViewGroup container2 = (ViewGroup) containers.get(1);
-		TestUtils.assertViewChildren(container1, mockView1);
-		TestUtils.assertViewChildren(container2, mockView2);
-	}
-
-	@Test
-	public void returnsSideMenuRoot() throws Exception {
-		when(reactRootViewCreator.create(any(Activity.class), eq(NODE_ID), eq(REACT_ROOT_VIEW_KEY))).thenReturn(mockView);
-		final LayoutNode containerNode = createSideMenuContainerNode(Arrays.asList(createContainerNode()));
-		final ViewGroup result = (ViewGroup) createLayoutFactory().create(containerNode);
-		assertThat(result).isInstanceOf(SideMenuLayout.class);
-	}
-
-	@Test
-	public void hasContentContainer() throws Exception {
-		when(reactRootViewCreator.create(any(Activity.class), eq(NODE_ID), eq(REACT_ROOT_VIEW_KEY))).thenReturn(mockView);
-		LayoutNode contentContainer = createContainerNode();
-		final LayoutNode sideMenu = createSideMenuContainerNode(Arrays.asList(contentContainer));
-		final ViewGroup result = (ViewGroup) createLayoutFactory().create(sideMenu);
-		assertThat(result.getChildAt(0)).isInstanceOf(Container.class);
-	}
-
-	@Test
-	public void hasLeftMenu() throws Exception {
-		when(reactRootViewCreator.create(any(Activity.class), eq(NODE_ID), eq(REACT_ROOT_VIEW_KEY))).thenReturn(mockView);
-		LayoutNode sideMenuLeft = createSideMenuLeftNode();
-		final LayoutNode sideMenu = createSideMenuContainerNode(Arrays.asList(sideMenuLeft));
-		final ViewGroup result = (ViewGroup) createLayoutFactory().create(sideMenu);
-		assertThat(result.getChildAt(0)).isInstanceOf(Container.class);
-	}
-
-	@Test
-	public void hasRightMenu() throws Exception {
-		when(reactRootViewCreator.create(any(Activity.class), eq(NODE_ID), eq(REACT_ROOT_VIEW_KEY))).thenReturn(mockView);
-		LayoutNode sideMenuRight = createSideMenuRightNode();
-		final LayoutNode sideMenu = createSideMenuContainerNode(Arrays.asList(sideMenuRight));
-		final ViewGroup result = (ViewGroup) createLayoutFactory().create(sideMenu);
-		assertThat(result.getChildAt(0)).isInstanceOf(Container.class);
-	}
-
-	@Test
-	public void pushScreenToScreenStackLayout() throws Exception {
-		when(reactRootViewCreator.create(any(Activity.class), eq(NODE_ID), eq(REACT_ROOT_VIEW_KEY))).thenReturn(mockView);
-		final LayoutNode container = createContainerNode();
-		final LayoutNode stackNode = createContainerStackNode(container);
-		final ContainerStackLayout containerStackLayout = (ContainerStackLayout) createLayoutFactory().create(stackNode);
-
-		when(reactRootViewCreator.create(any(Activity.class), eq(OTHER_NODE_ID), eq(OTHER_REACT_ROOT_VIEW_KEY))).thenReturn(otherMockView);
-		final LayoutNode pushedContainer = createContainerNode(OTHER_NODE_ID, OTHER_REACT_ROOT_VIEW_KEY);
-		containerStackLayout.push(createLayoutFactory().create(pushedContainer));
-
-		ViewGroup result = (ViewGroup) TestUtils.assertViewChildrenCount(containerStackLayout, 1).get(0);
-		assertThat(result.getChildAt(0)).isEqualTo(otherMockView);
-	}
-
-	@Test
-	public void pushTwoScreensToStackLayout() throws Exception {
-		when(reactRootViewCreator.create(any(Activity.class), eq(NODE_ID), eq(REACT_ROOT_VIEW_KEY))).thenReturn(mockView);
-		final LayoutNode container = createContainerNode();
-		final LayoutNode stackNode = createContainerStackNode(container);
-		final ContainerStackLayout containerStackLayout = (ContainerStackLayout) createLayoutFactory().create(stackNode);
-
-		View first = new View(activity);
-		pushContainer(containerStackLayout, OTHER_NODE_ID, OTHER_REACT_ROOT_VIEW_KEY, first);
-
-		View second = new View(activity);
-		pushContainer(containerStackLayout, "secondPushedScreenId", "secondPushedScreenKey", second);
-
-		ViewGroup result = (ViewGroup) TestUtils.assertViewChildrenCount(containerStackLayout, 1).get(0);
-		assertThat(result.getChildAt(0)).isEqualTo(second);
-	}
-
-	@Test
-	public void popTwoScreensFromStackLayout() throws Exception {
-		when(reactRootViewCreator.create(any(Activity.class), eq(NODE_ID), eq(REACT_ROOT_VIEW_KEY))).thenReturn(mockView);
-		final LayoutNode container = createContainerNode();
-		final LayoutNode stackNode = createContainerStackNode(container);
-		final ContainerStackLayout containerStackLayout = (ContainerStackLayout) createLayoutFactory().create(stackNode);
-
-		pushContainer(containerStackLayout, OTHER_NODE_ID, OTHER_REACT_ROOT_VIEW_KEY, new View(activity));
-		pushContainer(containerStackLayout, "secondPushedScreenId", "secondPushedScreenKey", new View(activity));
-
-		containerStackLayout.pop();
-		containerStackLayout.pop();
-
-		ViewGroup result = (ViewGroup) TestUtils.assertViewChildrenCount(containerStackLayout, 1).get(0);
-		assertThat(result.getChildAt(0)).isEqualTo(mockView);
-	}
-
-	private void pushContainer(ContainerStackLayout containerStackLayout, String screenId, String reactRootViewKey, View rootView) throws Exception {
-		when(reactRootViewCreator.create(any(Activity.class), eq(screenId), eq(reactRootViewKey))).thenReturn(rootView);
-		View pushedContainer = createLayoutFactory().create(createContainerNode(screenId, reactRootViewKey));
-		containerStackLayout.push(pushedContainer);
-	}
-
-	private void pushContainer(BottomTabsLayout containerStackLayout, String screenId, String reactRootViewKey, View rootView) throws Exception {
-		when(reactRootViewCreator.create(any(Activity.class), eq(screenId), eq(reactRootViewKey))).thenReturn(rootView);
-		View pushedContainer = createLayoutFactory().create(createContainerNode(screenId, reactRootViewKey));
-		containerStackLayout.push(pushedContainer);
-	}
-
-	@Test
-	public void popScreenFromScreenStackLayout() throws Exception {
-		when(reactRootViewCreator.create(any(Activity.class), eq(NODE_ID), eq(REACT_ROOT_VIEW_KEY))).thenReturn(mockView);
-		final LayoutNode container = createContainerNode();
-		final LayoutNode stackNode = createContainerStackNode(container);
-		final ContainerStackLayout containerStackLayout = (ContainerStackLayout) createLayoutFactory().create(stackNode);
-
-		when(reactRootViewCreator.create(any(Activity.class), eq(OTHER_NODE_ID), eq(OTHER_REACT_ROOT_VIEW_KEY))).thenReturn(otherMockView);
-		final LayoutNode pushedContainer = createContainerNode(OTHER_NODE_ID, OTHER_REACT_ROOT_VIEW_KEY);
-		containerStackLayout.push(createLayoutFactory().create(pushedContainer));
-
-		containerStackLayout.pop();
-		ViewGroup result = (ViewGroup) TestUtils.assertViewChildrenCount(containerStackLayout, 1).get(0);
-		assertThat(result.getChildAt(0)).isEqualTo(mockView);
-	}
-
-	private LayoutFactory createLayoutFactory() {
-		return new LayoutFactory(activity, reactRootViewCreator);
-	}
-
-	private LayoutNode createContainerNode() throws Exception {
-		return createContainerNode(NODE_ID, REACT_ROOT_VIEW_KEY);
-	}
-
-	private LayoutNode createSideMenuLeftNode() throws Exception {
-		List<LayoutNode> children = Arrays.asList(createContainerNode());
-		return new LayoutNode("SideMenuLeft", LayoutNode.Type.SideMenuLeft, null, children);
-	}
-
-	private LayoutNode createSideMenuRightNode() throws Exception {
-		List<LayoutNode> children = Arrays.asList(createContainerNode());
-		return new LayoutNode("SideMenuRight", LayoutNode.Type.SideMenuRight, null, children);
-	}
-
-	private LayoutNode createContainerNode(final String id, final String name) throws JSONException {
-		return new LayoutNode(id, LayoutNode.Type.Container, new JSONObject().put("name", name), null);
-	}
-
-	private LayoutNode createSideMenuContainerNode(List<LayoutNode> children) {
-		return new LayoutNode("SideMenuRoot", LayoutNode.Type.SideMenuRoot, null, children);
-	}
-
-	private LayoutNode createContainerStackNode(LayoutNode... children) {
-		return new LayoutNode("ContainerStack", LayoutNode.Type.ContainerStack, null, Arrays.asList(children));
-	}
-
-	private LayoutNode createBottomTabNode(LayoutNode... children) {
-		return new LayoutNode("BottomTabs", LayoutNode.Type.BottomTabs, null, Arrays.asList(children));
-	}
-}

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

@@ -1,27 +0,0 @@
-package com.reactnativenavigation.layout;
-
-import android.view.View;
-import android.view.ViewGroup;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import static org.assertj.core.api.Java6Assertions.assertThat;
-
-public class TestUtils {
-	public static List<View> assertViewChildrenCount(ViewGroup view, int count) {
-		assertThat(view.getChildCount()).isEqualTo(count);
-
-		final List<View> children = new ArrayList<>(count);
-		for (int i = 0; i < count; i++) {
-			children.add(view.getChildAt(i));
-		}
-		return children;
-	}
-
-	public static void assertViewChildren(ViewGroup view, View... children) {
-		final List<View> childViews = assertViewChildrenCount(view, children.length);
-		assertThat(childViews).isEqualTo(Arrays.asList(children));
-	}
-}

lib/android/app/src/test/java/com/reactnativenavigation/mocks/TestReactNativeHost.java

@@ -3,13 +3,14 @@ package com.reactnativenavigation.mocks;
 import android.app.Application;
 
 import com.facebook.react.ReactInstanceManager;
+import com.reactnativenavigation.controllers.CommandsHandler;
 import com.reactnativenavigation.react.NavigationReactNativeHost;
 
 import static org.mockito.Mockito.mock;
 
 public class TestReactNativeHost extends NavigationReactNativeHost {
-	public TestReactNativeHost(Application application, boolean isDebug) {
-		super(application, isDebug);
+	public TestReactNativeHost(Application application, boolean isDebug, CommandsHandler commandsHandler) {
+		super(application, isDebug, commandsHandler);
 	}
 
 	@Override

lib/android/app/src/test/java/com/reactnativenavigation/react/NavigationModuleTest.java

@@ -5,7 +5,6 @@ import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactMethod;
 import com.reactnativenavigation.BaseTest;
 import com.reactnativenavigation.NavigationActivity;
-import com.reactnativenavigation.NavigationApplication;
 import com.reactnativenavigation.controllers.CommandsHandler;
 
 import org.json.JSONObject;
@@ -28,29 +27,24 @@ public class NavigationModuleTest extends BaseTest {
 
 	private NavigationModule uut;
 	private ReactApplicationContext mockReactApplicationContext;
+	private CommandsHandler commandsHandler;
 
 	@Before
 	public void beforeEach() {
 		mockReactApplicationContext = mock(ReactApplicationContext.class);
-		uut = new NavigationModule(mockReactApplicationContext);
-	}
-
-	@Test
-	public void bridgeModule() throws Exception {
-		assertThat(uut.getName()).isEqualTo("RNNBridgeModule");
+		commandsHandler = mock(CommandsHandler.class);
+		uut = new NavigationModule(mockReactApplicationContext, commandsHandler);
 	}
 
 	@Test
 	public void allReactMethodsProtectAgainstNullActivity() throws Exception {
-		NavigationApplication.instance.getConfig().commandsHandler = mock(CommandsHandler.class);
-
 		assertThat(uut.activity()).isNull();
 
 		for (Method method : NavigationModule.class.getDeclaredMethods()) {
 			if (method.getAnnotation(ReactMethod.class) != null) {
 				Object[] args = new Object[method.getParameterTypes().length];
 				method.invoke(uut, args);
-				verifyZeroInteractions(NavigationApplication.instance.getConfig().commandsHandler);
+				verifyZeroInteractions(commandsHandler);
 			}
 		}
 	}
@@ -58,13 +52,12 @@ public class NavigationModuleTest extends BaseTest {
 	@SuppressWarnings("unchecked")
 	@Test
 	public void parsesArgumentsIntoMap() throws Exception {
-		NavigationApplication.instance.getConfig().commandsHandler = mock(CommandsHandler.class);
 		when(mockReactApplicationContext.getCurrentActivity()).thenReturn(Robolectric.buildActivity(NavigationActivity.class).get());
 		JavaOnlyMap input = new JavaOnlyMap();
 		input.putString("key", "value");
 		uut.setRoot(input);
 		ArgumentCaptor<JSONObject> captor = ArgumentCaptor.forClass(JSONObject.class);
-		verify(NavigationApplication.instance.getConfig().commandsHandler, times(1)).setRoot((NavigationActivity) any(), captor.capture());
+		verify(commandsHandler, times(1)).setRoot((NavigationActivity) any(), captor.capture());
 		assertThat(captor.getAllValues()).hasSize(1);
 		assertThat(captor.getValue()).isNotNull();
 	}

lib/android/app/src/test/java/com/reactnativenavigation/react/NavigationReactRootViewCreatorTest.java

@@ -1,42 +0,0 @@
-package com.reactnativenavigation.react;
-
-import android.app.Activity;
-import android.os.Bundle;
-import android.view.View;
-
-import com.facebook.react.ReactRootView;
-import com.reactnativenavigation.BaseTest;
-
-import org.assertj.core.api.Condition;
-import org.junit.Test;
-import org.robolectric.Robolectric;
-
-import java.lang.reflect.Method;
-
-import static org.assertj.core.api.Java6Assertions.assertThat;
-
-public class NavigationReactRootViewCreatorTest extends BaseTest {
-	@Test
-	public void createsReactRootView() throws Exception {
-		NavigationReactRootViewCreator uut = new NavigationReactRootViewCreator();
-		View result = uut.create(Robolectric.buildActivity(Activity.class).get(), "the container id", "the container name");
-		assertThat(result).isNotNull().isInstanceOf(ReactRootView.class);
-	}
-
-	@Test
-	public void startReactContainer() throws Exception {
-		NavigationReactRootViewCreator uut = new NavigationReactRootViewCreator();
-		ReactRootView result = (ReactRootView) uut.create(Robolectric.buildActivity(Activity.class).get(), "the container id", "the container name");
-		Method getJSModuleName = ReactRootView.class.getDeclaredMethod("getJSModuleName");
-		Method getLaunchOptions = ReactRootView.class.getDeclaredMethod("getLaunchOptions");
-		getJSModuleName.setAccessible(true);
-		getLaunchOptions.setAccessible(true);
-		assertThat(getJSModuleName.invoke(result)).isEqualTo("the container name");
-		assertThat(getLaunchOptions.invoke(result)).isNotNull().isInstanceOf(Bundle.class).has(new Condition<Object>() {
-			@Override
-			public boolean matches(final Object value) {
-				return ((Bundle) value).getString("id").equals("the container id");
-			}
-		});
-	}
-}