Rename ContainerView related classes (#2328)

* Rename ContainerView related classes

* fix test

* rename ContainerViewCreator

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

@@ -10,7 +10,7 @@ import com.reactnativenavigation.viewcontrollers.SideMenuController;
 import com.reactnativenavigation.viewcontrollers.StackController;
 import com.reactnativenavigation.viewcontrollers.ViewController;
 import com.reactnativenavigation.viewcontrollers.overlay.DialogViewController;
-import com.reactnativenavigation.views.TopbarContainerViewCreator;
+import com.reactnativenavigation.views.ContainerViewCreator;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -87,8 +87,7 @@ public class LayoutFactory {
 		String id = node.id;
 		String name = node.data.optString("name");
 		NavigationOptions navigationOptions = NavigationOptions.parse(node.data.optJSONObject("navigationOptions"), defaultOptions);
-		return new ContainerViewController(activity, id, name,
-				new TopbarContainerViewCreator(new ReactContainerViewCreator(reactInstanceManager)), navigationOptions);
+		return new ContainerViewController(activity, id, name, new ContainerViewCreator(new ReactContainerViewCreator(reactInstanceManager)), navigationOptions);
 	}
 
 	private ViewController createContainerStack(LayoutNode node) {

lib/android/app/src/main/java/com/reactnativenavigation/presentation/OptionsPresenter.java

@@ -6,7 +6,7 @@ import com.reactnativenavigation.anim.StackAnimator;
 import com.reactnativenavigation.parse.NavigationOptions;
 import com.reactnativenavigation.utils.TypefaceLoader;
 import com.reactnativenavigation.viewcontrollers.ContainerViewController;
-import com.reactnativenavigation.views.TopbarContainerView;
+import com.reactnativenavigation.views.ContainerView;
 
 public class OptionsPresenter {
 
@@ -26,38 +26,38 @@ public class OptionsPresenter {
 			controller.getTopBar().setTitleFontSize(options.topBarOptions.textFontSize);
 			TypefaceLoader typefaceLoader = new TypefaceLoader();
 			controller.getTopBar().setTitleTypeface(typefaceLoader.getTypeFace(controller.getActivity(), options.topBarOptions.textFontFamily));
-			applyTopbarHiddenOptions(options);
+			applyTopBarHiddenOptions(options);
 		}
 	}
 
-	private void applyTopbarHiddenOptions(NavigationOptions options) {
+	private void applyTopBarHiddenOptions(NavigationOptions options) {
 		if (options.topBarOptions.hidden == NavigationOptions.BooleanOptions.True) {
-			hideTopbar(options.topBarOptions.animateHide);
+			hideTopBar(options.topBarOptions.animateHide);
 		}
 		if (options.topBarOptions.hidden == NavigationOptions.BooleanOptions.False) {
-			showTopbar(options.topBarOptions.animateHide);
+			showTopBar(options.topBarOptions.animateHide);
 		}
 	}
 
-	private void showTopbar(NavigationOptions.BooleanOptions animated) {
+	private void showTopBar(NavigationOptions.BooleanOptions animated) {
 		if (controller.getTopBar().getVisibility() == View.VISIBLE) {
 			return;
 		}
 		if (animated == NavigationOptions.BooleanOptions.True) {
-			TopbarContainerView topbarContainerView = (TopbarContainerView) controller.getContainerView();
-			animator.animateShowTopBar(controller.getTopBar(), topbarContainerView.getContainerView().asView());
+			ContainerView topBarContainerView = (ContainerView) controller.getContainerView();
+			animator.animateShowTopBar(controller.getTopBar(), topBarContainerView.getReactView().asView());
 		} else {
 			controller.getTopBar().setVisibility(View.VISIBLE);
 		}
 	}
 
-	private void hideTopbar(NavigationOptions.BooleanOptions animated) {
+	private void hideTopBar(NavigationOptions.BooleanOptions animated) {
 		if (controller.getTopBar().getVisibility() == View.GONE) {
 			return;
 		}
 		if (animated == NavigationOptions.BooleanOptions.True) {
-			TopbarContainerView topbarContainerView = (TopbarContainerView) controller.getContainerView();
-			animator.animateHideTopBar(controller.getTopBar(), topbarContainerView.getContainerView().asView());
+			ContainerView topBarContainerView = (ContainerView) controller.getContainerView();
+			animator.animateHideTopBar(controller.getTopBar(), topBarContainerView.getReactView().asView());
 		} else {
 			controller.getTopBar().setVisibility(View.GONE);
 		}

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

@@ -4,9 +4,9 @@ import android.app.Activity;
 
 import com.facebook.react.ReactInstanceManager;
 import com.reactnativenavigation.viewcontrollers.ContainerViewController;
-import com.reactnativenavigation.viewcontrollers.ContainerViewController.ContainerViewCreator;
+import com.reactnativenavigation.viewcontrollers.ContainerViewController.ReactViewCreator;
 
-public class ReactContainerViewCreator implements ContainerViewCreator {
+public class ReactContainerViewCreator implements ReactViewCreator {
 	private ReactInstanceManager reactInstanceManager;
 
 	public ReactContainerViewCreator(final ReactInstanceManager reactInstanceManager) {
@@ -14,7 +14,7 @@ public class ReactContainerViewCreator implements ContainerViewCreator {
 	}
 
 	@Override
-	public ContainerViewController.ContainerView create(final Activity activity, final String containerId, final String containerName) {
-		return new ReactContainerView(activity, reactInstanceManager, containerId, containerName);
+	public ContainerViewController.IReactView create(final Activity activity, final String containerId, final String containerName) {
+		return new ReactView(activity, reactInstanceManager, containerId, containerName);
 	}
 }

lib/android/app/src/main/java/com/reactnativenavigation/react/ReactContainerView.java → lib/android/app/src/main/java/com/reactnativenavigation/react/ReactView.java

@@ -1,5 +1,6 @@
 package com.reactnativenavigation.react;
 
+import android.annotation.SuppressLint;
 import android.content.Context;
 import android.os.Bundle;
 import android.view.View;
@@ -8,14 +9,15 @@ import com.facebook.react.ReactInstanceManager;
 import com.facebook.react.ReactRootView;
 import com.reactnativenavigation.viewcontrollers.ContainerViewController;
 
-public class ReactContainerView extends ReactRootView implements ContainerViewController.ContainerView {
+@SuppressLint("ViewConstructor")
+public class ReactView extends ReactRootView implements ContainerViewController.IReactView {
 
 	private final ReactInstanceManager reactInstanceManager;
 	private final String containerId;
 	private final String containerName;
 	private boolean isAttachedToReactInstance = false;
 
-	public ReactContainerView(final Context context, ReactInstanceManager reactInstanceManager, String containerId, String containerName) {
+	public ReactView(final Context context, ReactInstanceManager reactInstanceManager, String containerId, String containerName) {
 		super(context);
 		this.reactInstanceManager = reactInstanceManager;
 		this.containerId = containerId;

lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/ContainerViewController.java

@@ -2,24 +2,22 @@ package com.reactnativenavigation.viewcontrollers;
 
 import android.app.Activity;
 import android.support.annotation.NonNull;
-import android.util.Log;
 import android.view.View;
 
-import com.reactnativenavigation.anim.StackAnimator;
 import com.reactnativenavigation.parse.NavigationOptions;
 import com.reactnativenavigation.presentation.NavigationOptionsListener;
 import com.reactnativenavigation.presentation.OptionsPresenter;
 import com.reactnativenavigation.views.TopBar;
-import com.reactnativenavigation.views.TopbarContainerView;
+import com.reactnativenavigation.views.ContainerView;
 
 public class ContainerViewController extends ViewController implements NavigationOptionsListener {
 
-	public interface ContainerViewCreator {
+	public interface ReactViewCreator {
 
-		ContainerView create(Activity activity, String containerId, String containerName);
+        IReactView create(Activity activity, String containerId, String containerName);
 	}
 
-	public interface ContainerView {
+	public interface IReactView {
 
 		boolean isReady();
 
@@ -35,16 +33,16 @@ public class ContainerViewController extends ViewController implements Navigatio
 
 	private final String containerName;
 
-	private final ContainerViewCreator viewCreator;
+	private final ReactViewCreator viewCreator;
 	private NavigationOptions navigationOptions;
-	private ContainerView containerView;
+	private IReactView containerView;
 
 	private TopBar topBar;
 
 	public ContainerViewController(final Activity activity,
 								   final String id,
 								   final String containerName,
-								   final ContainerViewCreator viewCreator,
+								   final ReactViewCreator viewCreator,
 								   final NavigationOptions initialNavigationOptions) {
 		super(activity, id);
 		this.containerName = containerName;
@@ -82,8 +80,8 @@ public class ContainerViewController extends ViewController implements Navigatio
 	@Override
 	protected View createView() {
 		containerView = viewCreator.create(getActivity(), getId(), containerName);
-		if (containerView instanceof TopbarContainerView) {
-			topBar = ((TopbarContainerView) containerView).getTopBar();
+		if (containerView instanceof ContainerView) {
+			topBar = ((ContainerView) containerView).getTopBar();
 		}
 		return containerView.asView();
 	}
@@ -107,7 +105,7 @@ public class ContainerViewController extends ViewController implements Navigatio
 		return topBar;
 	}
 
-	public ContainerView getContainerView() {
+	public IReactView getContainerView() {
 		return containerView;
 	}
 }

lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/overlay/DialogViewController.java

@@ -10,10 +10,10 @@ import com.reactnativenavigation.viewcontrollers.ViewController;
 
 public class DialogViewController extends ViewController {
 
-	private ContainerViewController.ContainerViewCreator viewCreator;
+	private ContainerViewController.ReactViewCreator viewCreator;
 	private String containerName;
 
-	public DialogViewController(Activity activity, String id, String containerName, ContainerViewController.ContainerViewCreator viewCreator) {
+	public DialogViewController(Activity activity, String id, String containerName, ContainerViewController.ReactViewCreator viewCreator) {
 		super(activity, id);
 		this.viewCreator = viewCreator;
 		this.containerName = containerName;

lib/android/app/src/main/java/com/reactnativenavigation/views/ContainerView.java

@@ -0,0 +1,63 @@
+package com.reactnativenavigation.views;
+
+import android.content.Context;
+import android.view.View;
+import android.widget.LinearLayout;
+
+import com.reactnativenavigation.viewcontrollers.ContainerViewController.IReactView;
+
+public class ContainerView extends LinearLayout implements IReactView {
+
+	private TopBar topBar;
+	private IReactView reactView;
+
+	public ContainerView(Context context, IReactView reactView) {
+		super(context);
+		this.topBar = new TopBar(context);
+		this.reactView = reactView;
+		initViews();
+	}
+
+	private void initViews() {
+	    setOrientation(VERTICAL);
+		addView(topBar);
+		addView(reactView.asView());
+	}
+
+	public ContainerView(Context context) {
+		super(context);
+	}
+
+	@Override
+	public boolean isReady() {
+		return reactView.isReady();
+	}
+
+	@Override
+	public View asView() {
+		return this;
+	}
+
+	@Override
+	public void destroy() {
+		reactView.destroy();
+	}
+
+	@Override
+	public void sendContainerStart() {
+		reactView.sendContainerStart();
+	}
+
+	@Override
+	public void sendContainerStop() {
+		reactView.sendContainerStop();
+	}
+
+	public TopBar getTopBar() {
+		return topBar;
+	}
+
+	public IReactView getReactView() {
+		return reactView;
+	}
+}

lib/android/app/src/main/java/com/reactnativenavigation/views/ContainerViewCreator.java

@@ -0,0 +1,19 @@
+package com.reactnativenavigation.views;
+
+import android.app.Activity;
+
+import com.reactnativenavigation.viewcontrollers.ContainerViewController;
+
+public class ContainerViewCreator implements ContainerViewController.ReactViewCreator {
+
+	private ContainerViewController.ReactViewCreator creator;
+
+	public ContainerViewCreator(ContainerViewController.ReactViewCreator creator) {
+		this.creator = creator;
+	}
+
+	@Override
+	public ContainerViewController.IReactView create(Activity activity, String containerId, String containerName) {
+        return new ContainerView(activity, creator.create(activity, containerId, containerName));
+	}
+}

lib/android/app/src/main/java/com/reactnativenavigation/views/TopBar.java

@@ -1,6 +1,5 @@
 package com.reactnativenavigation.views;
 
-import android.app.Activity;
 import android.content.Context;
 import android.graphics.Typeface;
 import android.support.annotation.ColorInt;

lib/android/app/src/main/java/com/reactnativenavigation/views/TopbarContainerView.java

@@ -1,65 +0,0 @@
-package com.reactnativenavigation.views;
-
-import android.content.Context;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.LinearLayout;
-
-import com.reactnativenavigation.viewcontrollers.ContainerViewController;
-
-public class TopbarContainerView extends LinearLayout implements ContainerViewController.ContainerView {
-
-	private TopBar topBar;
-	private ContainerViewController.ContainerView containerView;
-
-	public TopbarContainerView(Context context, ContainerViewController.ContainerView containerView) {
-		super(context);
-		this.topBar = new TopBar(context);
-		this.containerView = containerView;
-
-		initViews();
-	}
-
-	private void initViews() {
-		setOrientation(LinearLayout.VERTICAL);
-		addView(topBar);
-		addView(containerView.asView());
-	}
-
-	public TopbarContainerView(Context context) {
-		super(context);
-	}
-
-	@Override
-	public boolean isReady() {
-		return containerView.isReady();
-	}
-
-	@Override
-	public View asView() {
-		return this;
-	}
-
-	@Override
-	public void destroy() {
-		containerView.destroy();
-	}
-
-	@Override
-	public void sendContainerStart() {
-		containerView.sendContainerStart();
-	}
-
-	@Override
-	public void sendContainerStop() {
-		containerView.sendContainerStop();
-	}
-
-	public TopBar getTopBar() {
-		return topBar;
-	}
-
-	public ContainerViewController.ContainerView getContainerView() {
-		return containerView;
-	}
-}

lib/android/app/src/main/java/com/reactnativenavigation/views/TopbarContainerViewCreator.java

@@ -1,23 +0,0 @@
-package com.reactnativenavigation.views;
-
-import android.app.Activity;
-
-import com.reactnativenavigation.viewcontrollers.ContainerViewController;
-
-public class TopbarContainerViewCreator implements ContainerViewController.ContainerViewCreator {
-
-	private ContainerViewController.ContainerViewCreator creator;
-
-	public TopbarContainerViewCreator(ContainerViewController.ContainerViewCreator creator) {
-		this.creator = creator;
-	}
-
-	@Override
-	public ContainerViewController.ContainerView create(Activity activity, String containerId, String containerName) {
-		ContainerViewController.ContainerView containerView = creator.create(activity, containerId, containerName);
-
-		TopbarContainerView root = new TopbarContainerView(activity, containerView);
-		return root;
-
-	}
-}

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

@@ -4,10 +4,10 @@ import android.app.Activity;
 
 import com.reactnativenavigation.parse.NavigationOptions;
 import com.reactnativenavigation.viewcontrollers.ContainerViewController;
-import com.reactnativenavigation.views.TopbarContainerViewCreator;
+import com.reactnativenavigation.views.ContainerViewCreator;
 
 public class SimpleContainerViewController extends ContainerViewController {
 	public SimpleContainerViewController(final Activity activity, final String id) {
-		super(activity, id, "theContainerName", new TopbarContainerViewCreator(new TestContainerViewCreator()), new NavigationOptions());
+		super(activity, id, "theContainerName", new ContainerViewCreator(new TestContainerViewCreator()), new NavigationOptions());
 	}
 }

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

@@ -2,12 +2,11 @@ package com.reactnativenavigation.mocks;
 
 import android.content.Context;
 import android.view.View;
-import android.view.ViewGroup;
 
 import com.reactnativenavigation.viewcontrollers.ContainerViewController;
 import com.reactnativenavigation.views.TopBar;
 
-public class TestContainerView extends View implements ContainerViewController.ContainerView {
+public class TestContainerView extends View implements ContainerViewController.IReactView {
 
 	private TopBar topBar;
 

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

@@ -3,11 +3,11 @@ package com.reactnativenavigation.mocks;
 import android.app.Activity;
 
 import com.reactnativenavigation.viewcontrollers.ContainerViewController;
-import com.reactnativenavigation.viewcontrollers.ContainerViewController.ContainerViewCreator;
+import com.reactnativenavigation.viewcontrollers.ContainerViewController.ReactViewCreator;
 
-public class TestContainerViewCreator implements ContainerViewCreator {
+public class TestContainerViewCreator implements ReactViewCreator {
 	@Override
-	public ContainerViewController.ContainerView create(final Activity activity, final String containerId, final String containerName) {
+	public ContainerViewController.IReactView create(final Activity activity, final String containerId, final String containerName) {
 		return new TestContainerView(activity);
 	}
 }

lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/ContainerViewControllerTest.java

@@ -1,13 +1,10 @@
 package com.reactnativenavigation.viewcontrollers;
 
 import android.app.Activity;
-import android.graphics.Color;
-import android.graphics.drawable.ColorDrawable;
 
 import com.reactnativenavigation.BaseTest;
 import com.reactnativenavigation.mocks.TestContainerView;
 import com.reactnativenavigation.parse.NavigationOptions;
-import com.reactnativenavigation.presentation.OptionsPresenter;
 
 import org.junit.Test;
 
@@ -19,16 +16,16 @@ import static org.mockito.Mockito.when;
 
 public class ContainerViewControllerTest extends BaseTest {
 	private ContainerViewController uut;
-	private ContainerViewController.ContainerView view;
+	private ContainerViewController.IReactView view;
 
 	@Override
 	public void beforeEach() {
 		super.beforeEach();
 		Activity activity = newActivity();
 		view = spy(new TestContainerView(activity));
-		uut = new ContainerViewController(activity, "containerId1", "containerName", new ContainerViewController.ContainerViewCreator() {
+		uut = new ContainerViewController(activity, "containerId1", "containerName", new ContainerViewController.ReactViewCreator() {
 			@Override
-			public ContainerViewController.ContainerView create(final Activity activity1, final String containerId, final String containerName) {
+			public ContainerViewController.IReactView create(final Activity activity1, final String containerId, final String containerName) {
 				return view;
 			}
 		}, new NavigationOptions());

lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/OptionsApplyingTest.java

@@ -8,21 +8,18 @@ import android.view.View;
 import com.reactnativenavigation.BaseTest;
 import com.reactnativenavigation.mocks.TestContainerView;
 import com.reactnativenavigation.parse.NavigationOptions;
-import com.reactnativenavigation.views.TopbarContainerViewCreator;
+import com.reactnativenavigation.views.ContainerViewCreator;
 
-import org.json.JSONObject;
 import org.junit.Test;
 
 import static org.assertj.core.api.Java6Assertions.assertThat;
 import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
 
 public class OptionsApplyingTest extends BaseTest {
 	private Activity activity;
 	private ContainerViewController uut;
-	private ContainerViewController.ContainerView view;
+	private ContainerViewController.IReactView view;
 	private NavigationOptions initialNavigationOptions;
 
 	@Override
@@ -32,9 +29,9 @@ public class OptionsApplyingTest extends BaseTest {
 		initialNavigationOptions = new NavigationOptions();
 		view = spy(new TestContainerView(activity));
 		uut = new ContainerViewController(activity, "containerId1", "containerName",
-				new TopbarContainerViewCreator(new ContainerViewController.ContainerViewCreator() {
+				new ContainerViewCreator(new ContainerViewController.ReactViewCreator() {
 					@Override
-					public ContainerViewController.ContainerView create(final Activity activity1, final String containerId, final String containerName) {
+					public ContainerViewController.IReactView create(final Activity activity1, final String containerId, final String containerName) {
 						return view;
 					}
 				}), initialNavigationOptions);