V2 options applying refactoring (#1881)

* presenter skeleton

* test fix

* rm presentation

* options presenter

* test refactoring

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

@@ -0,0 +1,26 @@
+package com.reactnativenavigation.presentation;
+
+import com.reactnativenavigation.parse.NavigationOptions;
+import com.reactnativenavigation.viewcontrollers.StackController;
+
+/**
+ * Created by romanko on 9/14/17.
+ */
+
+public class OptionsPresenter {
+
+	private StackController controller;
+
+	public OptionsPresenter(StackController controller) {
+		this.controller = controller;
+	}
+
+	public void applyOptions(NavigationOptions options) {
+		if (controller != null) {
+			controller.getTopBar().setTitle(options.title);
+			controller.getTopBar().setBackgroundColor(options.topBarBackgroundColor);
+			controller.getTopBar().setTitleTextColor(options.topBarTextColor);
+			controller.getTopBar().setTitleFontSize(options.topBarTextFontSize);
+		}
+	}
+}

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

@@ -5,6 +5,7 @@ import android.support.annotation.NonNull;
 import android.view.View;
 
 import com.reactnativenavigation.parse.NavigationOptions;
+import com.reactnativenavigation.presentation.OptionsPresenter;
 
 public class ContainerViewController extends ViewController {
 
@@ -28,16 +29,17 @@ public class ContainerViewController extends ViewController {
 	}
 
 	private final String containerName;
+	private OptionsPresenter optionsPresenter;
 
 	private final ContainerViewCreator viewCreator;
 	private final NavigationOptions navigationOptions;
 	private ContainerView containerView;
 
 	public ContainerViewController(final Activity activity,
-	                               final String id,
-	                               final String containerName,
-	                               final ContainerViewCreator viewCreator,
-	                               final NavigationOptions initialNavigationOptions) {
+								   final String id,
+								   final String containerName,
+								   final ContainerViewCreator viewCreator,
+								   final NavigationOptions initialNavigationOptions) {
 		super(activity, id);
 		this.containerName = containerName;
 		this.viewCreator = viewCreator;
@@ -55,7 +57,7 @@ public class ContainerViewController extends ViewController {
 	public void onViewAppeared() {
 		super.onViewAppeared();
 		ensureViewIsCreated();
-		applyNavigationOptions();
+		applyOptions();
 		containerView.sendContainerStart();
 	}
 
@@ -79,19 +81,15 @@ public class ContainerViewController extends ViewController {
 
 	public void mergeNavigationOptions(final NavigationOptions options) {
 		navigationOptions.mergeWith(options);
-		applyNavigationOptions();
-	}
-
-	private void applyNavigationOptions() {
-		if (getParentStackController() != null) {
-			getParentStackController().getTopBar().setTitle(navigationOptions.title);
-			getParentStackController().getTopBar().setBackgroundColor(navigationOptions.topBarBackgroundColor);
-			getParentStackController().getTopBar().setTitleTextColor(navigationOptions.topBarTextColor);
-			getParentStackController().getTopBar().setTitleFontSize(navigationOptions.topBarTextFontSize);
-		}
+		applyOptions();
 	}
 
 	public NavigationOptions getNavigationOptions() {
 		return navigationOptions;
 	}
+
+	private void applyOptions() {
+		OptionsPresenter presenter = new OptionsPresenter(getParentStackController());
+		presenter.applyOptions(navigationOptions);
+	}
 }

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

@@ -7,6 +7,7 @@ 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;
 
@@ -17,23 +18,20 @@ import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 public class ContainerViewControllerTest extends BaseTest {
-	private Activity activity;
 	private ContainerViewController uut;
 	private ContainerViewController.ContainerView view;
-	private NavigationOptions initialNavigationOptions;
 
 	@Override
 	public void beforeEach() {
 		super.beforeEach();
-		activity = newActivity();
-		initialNavigationOptions = new NavigationOptions();
+		Activity activity = newActivity();
 		view = spy(new TestContainerView(activity));
 		uut = new ContainerViewController(activity, "containerId1", "containerName", new ContainerViewController.ContainerViewCreator() {
 			@Override
 			public ContainerViewController.ContainerView create(final Activity activity1, final String containerId, final String containerName) {
 				return view;
 			}
-		}, initialNavigationOptions);
+		}, new NavigationOptions());
 	}
 
 	@Test
@@ -71,95 +69,4 @@ public class ContainerViewControllerTest extends BaseTest {
 		when(view.isReady()).thenReturn(true);
 		assertThat(uut.isViewShown()).isTrue();
 	}
-
-	@Test
-	public void applyNavigationOptionsHandlesNoParentStack() throws Exception {
-		assertThat(uut.getParentStackController()).isNull();
-		uut.onViewAppeared();
-		assertThat(uut.getParentStackController()).isNull();
-	}
-
-	@Test
-	public void initialOptionsAppliedOnAppear() throws Exception {
-		assertThat(uut.getNavigationOptions()).isSameAs(initialNavigationOptions);
-		initialNavigationOptions.title = "the title";
-		StackController stackController = new StackController(activity, "stackId");
-		stackController.push(uut);
-		assertThat(stackController.getTopBar().getTitle()).isEmpty();
-
-		uut.onViewAppeared();
-		assertThat(stackController.getTopBar().getTitle()).isEqualTo("the title");
-	}
-
-	@Test
-	public void mergeNavigationOptionsUpdatesCurrentOptions() throws Exception {
-		assertThat(uut.getNavigationOptions().title).isEmpty();
-		NavigationOptions options = new NavigationOptions();
-		options.title = "new title";
-		uut.mergeNavigationOptions(options);
-		assertThat(uut.getNavigationOptions().title).isEqualTo("new title");
-		assertThat(uut.getNavigationOptions()).isSameAs(initialNavigationOptions);
-	}
-
-	@Test
-	public void reappliesOptionsOnMerge() throws Exception {
-		StackController stackController = new StackController(activity, "stackId");
-		stackController.push(uut);
-		assertThat(stackController.getTopBar().getTitle()).isEmpty();
-
-		NavigationOptions opts = new NavigationOptions();
-		opts.title = "the new title";
-		uut.mergeNavigationOptions(opts);
-
-		assertThat(stackController.getTopBar().getTitle()).isEqualTo("the new title");
-	}
-
-	@Test
-	public void appliesTopBackBackgroundColor() throws Exception {
-		StackController stackController = new StackController(activity, "stackId");
-		stackController.push(uut);
-		assertThat(((ColorDrawable) stackController.getTopBar().getBackground()).getColor()).isNotEqualTo(0xffff0000);
-
-		NavigationOptions opts = new NavigationOptions();
-		opts.topBarBackgroundColor = Color.RED;
-		uut.mergeNavigationOptions(opts);
-
-		assertThat(((ColorDrawable) stackController.getTopBar().getBackground()).getColor()).isEqualTo(0xffff0000);
-	}
-
-	@Test
-	public void appliesTopBarTextColor() throws Exception {
-		assertThat(uut.getNavigationOptions()).isSameAs(initialNavigationOptions);
-		initialNavigationOptions.title = "the title";
-		StackController stackController = new StackController(activity, "stackId");
-		stackController.push(uut);
-		uut.onViewAppeared();
-		assertThat(stackController.getTopBar().getTitleTextView().getCurrentTextColor()).isNotEqualTo(Color.RED);
-
-		NavigationOptions opts = new NavigationOptions();
-		opts.title = "the title";
-		opts.topBarTextColor = Color.RED;
-		uut.mergeNavigationOptions(opts);
-
-		assertThat(stackController.getTopBar().getTitleTextView()).isNotEqualTo(null);
-		assertThat(stackController.getTopBar().getTitleTextView().getCurrentTextColor()).isEqualTo(Color.RED);
-	}
-
-	@Test
-	public void appliesTopBarTextSize() throws Exception {
-		assertThat(uut.getNavigationOptions()).isSameAs(initialNavigationOptions);
-		initialNavigationOptions.title = "the title";
-		StackController stackController = new StackController(activity, "stackId");
-		stackController.push(uut);
-		uut.onViewAppeared();
-		assertThat(stackController.getTopBar().getTitleTextView().getTextSize()).isNotEqualTo(18);
-
-		NavigationOptions opts = new NavigationOptions();
-		opts.title = "the title";
-		opts.topBarTextFontSize = 18;
-		uut.mergeNavigationOptions(opts);
-
-		assertThat(stackController.getTopBar().getTitleTextView()).isNotEqualTo(null);
-		assertThat(stackController.getTopBar().getTitleTextView().getTextSize()).isEqualTo(18);
-	}
 }

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

@@ -0,0 +1,129 @@
+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 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 NavigationOptions initialNavigationOptions;
+
+	@Override
+	public void beforeEach() {
+		super.beforeEach();
+		activity = newActivity();
+		initialNavigationOptions = new NavigationOptions();
+		view = spy(new TestContainerView(activity));
+		uut = new ContainerViewController(activity, "containerId1", "containerName", new ContainerViewController.ContainerViewCreator() {
+			@Override
+			public ContainerViewController.ContainerView create(final Activity activity1, final String containerId, final String containerName) {
+				return view;
+			}
+		}, initialNavigationOptions);
+	}
+
+	@Test
+	public void applyNavigationOptionsHandlesNoParentStack() throws Exception {
+		assertThat(uut.getParentStackController()).isNull();
+		uut.onViewAppeared();
+		assertThat(uut.getParentStackController()).isNull();
+	}
+
+	@Test
+	public void initialOptionsAppliedOnAppear() throws Exception {
+		assertThat(uut.getNavigationOptions()).isSameAs(initialNavigationOptions);
+		initialNavigationOptions.title = "the title";
+		StackController stackController = new StackController(activity, "stackId");
+		stackController.push(uut);
+		assertThat(stackController.getTopBar().getTitle()).isEmpty();
+
+		uut.onViewAppeared();
+		assertThat(stackController.getTopBar().getTitle()).isEqualTo("the title");
+	}
+
+	@Test
+	public void mergeNavigationOptionsUpdatesCurrentOptions() throws Exception {
+		assertThat(uut.getNavigationOptions().title).isEmpty();
+		NavigationOptions options = new NavigationOptions();
+		options.title = "new title";
+		uut.mergeNavigationOptions(options);
+		assertThat(uut.getNavigationOptions().title).isEqualTo("new title");
+		assertThat(uut.getNavigationOptions()).isSameAs(initialNavigationOptions);
+	}
+
+	@Test
+	public void reappliesOptionsOnMerge() throws Exception {
+		StackController stackController = new StackController(activity, "stackId");
+		stackController.push(uut);
+		assertThat(stackController.getTopBar().getTitle()).isEmpty();
+
+		NavigationOptions opts = new NavigationOptions();
+		opts.title = "the new title";
+		uut.mergeNavigationOptions(opts);
+
+		assertThat(stackController.getTopBar().getTitle()).isEqualTo("the new title");
+	}
+
+	@Test
+	public void appliesTopBackBackgroundColor() throws Exception {
+		StackController stackController = new StackController(activity, "stackId");
+		stackController.push(uut);
+		assertThat(((ColorDrawable) stackController.getTopBar().getBackground()).getColor()).isNotEqualTo(Color.RED);
+
+		NavigationOptions opts = new NavigationOptions();
+		opts.topBarBackgroundColor = Color.RED;
+		uut.mergeNavigationOptions(opts);
+
+		assertThat(((ColorDrawable) stackController.getTopBar().getBackground()).getColor()).isEqualTo(Color.RED);
+	}
+
+	@Test
+	public void appliesTopBarTextColor() throws Exception {
+		assertThat(uut.getNavigationOptions()).isSameAs(initialNavigationOptions);
+		initialNavigationOptions.title = "the title";
+		StackController stackController = new StackController(activity, "stackId");
+		stackController.push(uut);
+		uut.onViewAppeared();
+		assertThat(stackController.getTopBar().getTitleTextView().getCurrentTextColor()).isNotEqualTo(Color.RED);
+
+		NavigationOptions opts = new NavigationOptions();
+		opts.title = "the title";
+		opts.topBarTextColor = Color.RED;
+		uut.mergeNavigationOptions(opts);
+
+		assertThat(stackController.getTopBar().getTitleTextView()).isNotEqualTo(null);
+		assertThat(stackController.getTopBar().getTitleTextView().getCurrentTextColor()).isEqualTo(Color.RED);
+	}
+
+	@Test
+	public void appliesTopBarTextSize() throws Exception {
+		assertThat(uut.getNavigationOptions()).isSameAs(initialNavigationOptions);
+		initialNavigationOptions.title = "the title";
+		StackController stackController = new StackController(activity, "stackId");
+		stackController.push(uut);
+		uut.onViewAppeared();
+		assertThat(stackController.getTopBar().getTitleTextView().getTextSize()).isNotEqualTo(18);
+
+		NavigationOptions opts = new NavigationOptions();
+		opts.title = "the title";
+		opts.topBarTextFontSize = 18;
+		uut.mergeNavigationOptions(opts);
+
+		assertThat(stackController.getTopBar().getTitleTextView()).isNotEqualTo(null);
+		assertThat(stackController.getTopBar().getTitleTextView().getTextSize()).isEqualTo(18);
+	}
+}