removed unneeded mocks, fixed unit tests

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);
-		app().activityLifecycleDelegate.onActivityCreated(this);
+		app().activityLifecycle.onActivityCreated(this);
 	}
 
 	@Override
 	protected void onResume() {
 		super.onResume();
-		app().activityLifecycleDelegate.onActivityResumed(this, this);
+		app().activityLifecycle.onActivityResumed(this);
 	}
 
 	@Override
 	protected void onPause() {
 		super.onPause();
-		app().activityLifecycleDelegate.onActivityPaused(this);
+		app().activityLifecycle.onActivityPaused(this);
 	}
 
 	@Override
 	protected void onDestroy() {
 		super.onDestroy();
-		app().activityLifecycleDelegate.onActivityDestroyed(this);
+		app().activityLifecycle.onActivityDestroyed(this);
 	}
 
 	@Override

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

@@ -7,14 +7,13 @@ 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.DevPermissionRequest;
 import com.reactnativenavigation.react.NavigationReactNativeHost;
-import com.reactnativenavigation.react.ReactRootViewCreatorImpl;
 
 public abstract class NavigationApplication extends Application implements ReactApplication {
 
 	NavigationReactNativeHost reactNativeHost;
-	ActivityLifecycleDelegate activityLifecycleDelegate;
+	ActivityLifecycleDelegate activityLifecycle;
 
 	@Override
 	public void onCreate() {
@@ -30,12 +29,11 @@ public abstract class NavigationApplication extends Application implements React
 	public abstract boolean isDebug();
 
 	void init() {
-		ReactRootViewCreatorImpl reactRootViewCreator = new ReactRootViewCreatorImpl();
-		CommandsHandler commandsHandler = new CommandsHandler(reactRootViewCreator);
+		CommandsHandler commandsHandler = new CommandsHandler(this);
 		reactNativeHost = new NavigationReactNativeHost(this, isDebug(), commandsHandler);
 
 		ReactInstanceManager reactInstanceManager = reactNativeHost.getReactInstanceManager();
-		DevPermissionRequestImpl devPermissionRequest = new DevPermissionRequestImpl(this, isDebug());
-		activityLifecycleDelegate = new ActivityLifecycleDelegate(reactInstanceManager, devPermissionRequest);
+		DevPermissionRequest devPermissionRequest = new DevPermissionRequest(this, isDebug());
+		activityLifecycle = new ActivityLifecycleDelegate(reactInstanceManager, devPermissionRequest);
 	}
 }

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

@@ -1,10 +1,8 @@
 package com.reactnativenavigation.controllers;
 
-import android.app.Activity;
-
 import com.facebook.react.ReactInstanceManager;
 import com.facebook.react.bridge.ReactContext;
-import com.facebook.react.modules.core.DefaultHardwareBackBtnHandler;
+import com.reactnativenavigation.NavigationActivity;
 import com.reactnativenavigation.react.DevPermissionRequest;
 import com.reactnativenavigation.react.NavigationEventEmitter;
 
@@ -21,26 +19,26 @@ public class ActivityLifecycleDelegate {
 		this.devPermissionRequest = devPermissionRequest;
 	}
 
-	public void onActivityCreated(Activity activity) {
+	public void onActivityCreated(NavigationActivity activity) {
 		appLaunchEmitted.set(false);
 	}
 
-	public void onActivityResumed(Activity activity, DefaultHardwareBackBtnHandler backBtnHandler) {
+	public void onActivityResumed(NavigationActivity activity) {
 		if (devPermissionRequest.shouldAskPermission()) {
 			devPermissionRequest.askPermission();
 		} else {
-			reactInstanceManager.onHostResume(activity, backBtnHandler);
+			reactInstanceManager.onHostResume(activity, activity);
 			prepareReactApp();
 		}
 	}
 
-	public void onActivityPaused(Activity activity) {
+	public void onActivityPaused(NavigationActivity activity) {
 		if (reactInstanceManager.hasStartedCreatingInitialContext()) {
 			reactInstanceManager.onHostPause(activity);
 		}
 	}
 
-	public void onActivityDestroyed(Activity activity) {
+	public void onActivityDestroyed(NavigationActivity activity) {
 		if (reactInstanceManager.hasStartedCreatingInitialContext()) {
 			reactInstanceManager.onHostDestroy(activity);
 		}

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

@@ -3,31 +3,31 @@ 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.react.ReactRootViewCreator;
 
 import org.json.JSONObject;
 
 public class CommandsHandler {
 
-	private final ReactRootViewCreator reactRootViewCreator;
+	private final NavigationApplication application;
 
-	public CommandsHandler(ReactRootViewCreator reactRootViewCreator) {
-		this.reactRootViewCreator = reactRootViewCreator;
+	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, reactRootViewCreator);
+		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, reactRootViewCreator);
+		LayoutFactory factory = new LayoutFactory(activity, application.getReactNativeHost());
 		final View rootView = factory.create(layoutNode);
 		((StackLayout) activity.getContentView()).push(rootView);
 	}

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

@@ -1,23 +1,34 @@
 package com.reactnativenavigation.layout;
 
 import android.app.Activity;
+import android.os.Bundle;
+import android.view.View;
 import android.widget.FrameLayout;
 
+import com.facebook.react.ReactNativeHost;
+import com.facebook.react.ReactRootView;
 import com.reactnativenavigation.NavigationApplication;
 import com.reactnativenavigation.react.NavigationEventEmitter;
-import com.reactnativenavigation.react.ReactRootViewCreator;
 
 public class Container extends FrameLayout {
+	private final ReactNativeHost reactNativeHost;
 	private final String id;
+	private final String name;
 
-	public Container(Activity activity, ReactRootViewCreator reactRootViewCreator, String id, String name) {
+	public Container(Activity activity, ReactNativeHost reactNativeHost, String id, String name) {
 		super(activity);
+		this.reactNativeHost = reactNativeHost;
 		this.id = id;
-		addView(reactRootViewCreator.create(activity, id, name));
+		this.name = name;
+		addView(createReactRootView());
 	}
 
-	public String getContainerId() {
-		return id;
+	private View createReactRootView() {
+		ReactRootView rootView = new ReactRootView(getContext());
+		Bundle opts = new Bundle();
+		opts.putString("id", id);
+		rootView.startReactApplication(reactNativeHost.getReactInstanceManager(), name, opts);
+		return rootView;
 	}
 
 	//    @Override

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

@@ -6,9 +6,9 @@ import android.view.Gravity;
 import android.view.View;
 import android.view.ViewGroup.LayoutParams;
 
-import com.reactnativenavigation.layout.bottomtabs.BottomTabsCreator;
+import com.facebook.react.ReactNativeHost;
+import com.reactnativenavigation.layout.bottomtabs.BottomTabs;
 import com.reactnativenavigation.layout.bottomtabs.BottomTabsLayout;
-import com.reactnativenavigation.react.ReactRootViewCreator;
 import com.reactnativenavigation.utils.CompatUtils;
 
 import java.util.List;
@@ -16,13 +16,11 @@ import java.util.List;
 public class LayoutFactory {
 
 	private final Activity activity;
-	private final ReactRootViewCreator reactRootViewCreator;
-	private final BottomTabsCreator bottomTabsCreator; // TODO: revisit this, may not be needed
+	private ReactNativeHost reactNativeHost;
 
-	public LayoutFactory(Activity activity, ReactRootViewCreator reactRootViewCreator) {
+	public LayoutFactory(Activity activity, ReactNativeHost reactNativeHost) {
 		this.activity = activity;
-		this.reactRootViewCreator = reactRootViewCreator;
-		this.bottomTabsCreator = new BottomTabsCreator();
+		this.reactNativeHost = reactNativeHost;
 	}
 
 	public View create(LayoutNode node) {
@@ -78,7 +76,7 @@ public class LayoutFactory {
 
 	private View createContainerView(LayoutNode node) {
 		final String name = node.data.optString("name");
-		Container container = new Container(activity, reactRootViewCreator, node.id, name);
+		Container container = new Container(activity, reactNativeHost, node.id, name);
 		container.setId(CompatUtils.generateViewId());
 		return container;
 
@@ -92,7 +90,7 @@ public class LayoutFactory {
 	}
 
 	private View createBottomTabs(LayoutNode node) {
-		final BottomTabsLayout tabsContainer = new BottomTabsLayout(activity, bottomTabsCreator.create());
+		final BottomTabsLayout tabsContainer = new BottomTabsLayout(activity, new BottomTabs());
 		for (int i = 0; i < node.children.size(); i++) {
 			final View tabContent = create(node.children.get(i));
 			tabsContainer.addTabContent("#" + i, tabContent);

lib/android/app/src/main/java/com/reactnativenavigation/layout/bottomtabs/BottomTabsCreator.java

@@ -1,8 +0,0 @@
-package com.reactnativenavigation.layout.bottomtabs;
-
-public class BottomTabsCreator {
-
-	public BottomTabs create() {
-		return new BottomTabs();
-	}
-}

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

@@ -1,8 +1,42 @@
 package com.reactnativenavigation.react;
 
-public interface DevPermissionRequest {
+import android.annotation.TargetApi;
+import android.app.Application;
+import android.content.Intent;
+import android.os.Build;
+import android.provider.Settings;
+import android.util.Log;
+import android.widget.Toast;
 
-	boolean shouldAskPermission();
+import com.facebook.react.common.ReactConstants;
 
-	void askPermission();
+public class DevPermissionRequest {
+
+	private final Application application;
+	private final boolean isDebug;
+
+	public DevPermissionRequest(Application application, boolean isDebug) {
+		this.application = application;
+		this.isDebug = isDebug;
+	}
+
+	public boolean shouldAskPermission() {
+		return isDebug &&
+				Build.VERSION.SDK_INT >= 23 &&
+				!Settings.canDrawOverlays(application);
+	}
+
+	@TargetApi(23)
+	public void askPermission() {
+		if (shouldAskPermission()) {
+			Intent serviceIntent = new Intent(Settings.ACTION_MANAGE_OVERLAY_PERMISSION);
+			serviceIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+			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(application, msg, Toast.LENGTH_LONG).show();
+		}
+	}
 }

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

@@ -1,43 +0,0 @@
-package com.reactnativenavigation.react;
-
-import android.annotation.TargetApi;
-import android.app.Application;
-import android.content.Intent;
-import android.os.Build;
-import android.provider.Settings;
-import android.util.Log;
-import android.widget.Toast;
-
-import com.facebook.react.common.ReactConstants;
-
-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 isDebug &&
-				Build.VERSION.SDK_INT >= 23 &&
-				!Settings.canDrawOverlays(application);
-	}
-
-	@Override
-	@TargetApi(23)
-	public void askPermission() {
-		if (shouldAskPermission()) {
-			Intent serviceIntent = new Intent(Settings.ACTION_MANAGE_OVERLAY_PERMISSION);
-			serviceIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-			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(application, msg, Toast.LENGTH_LONG).show();
-		}
-	}
-}

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

@@ -1,8 +0,0 @@
-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/main/java/com/reactnativenavigation/react/ReactRootViewCreatorImpl.java

@@ -1,23 +0,0 @@
-package com.reactnativenavigation.react;
-
-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 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);
-		//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/TestApplication.java

@@ -15,6 +15,6 @@ public class TestApplication extends NavigationApplication {
 	@Override
 	protected void init() {
 		reactNativeHost = mock(NavigationReactNativeHost.class);
-		activityLifecycleDelegate = mock(ActivityLifecycleDelegate.class);
+		activityLifecycle = mock(ActivityLifecycleDelegate.class);
 	}
 }

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

@@ -1,20 +0,0 @@
-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, CommandsHandler commandsHandler) {
-		super(application, isDebug, commandsHandler);
-	}
-
-	@Override
-	protected ReactInstanceManager createReactInstanceManager() {
-		return mock(ReactInstanceManager.class);
-	}
-}