Refactor OptionsPresenter

It's now created once and child component is passed as argument in applyChildOptions

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

@@ -16,21 +16,15 @@ import java.util.ArrayList;
 
 public class OptionsPresenter {
     private TopBar topBar;
-    private Component component;
-
-    public OptionsPresenter(TopBar topBar, Component component) {
-        this.topBar = topBar;
-        this.component = component;
-    }
 
     public OptionsPresenter(TopBar topBar) {
         this.topBar = topBar;
     }
 
-    public void applyOptions(Options options) {
+    public void applyChildOptions(Options options, Component child) {
         applyOrientation(options.orientationOptions);
         applyButtons(options.topBarOptions.leftButtons, options.topBarOptions.rightButtons);
-        applyTopBarOptions(options.topBarOptions);
+        applyTopBarOptions(options.topBarOptions, child);
         applyTopTabsOptions(options.topTabsOptions);
         applyTopTabOptions(options.topTabOptions);
     }
@@ -39,7 +33,7 @@ public class OptionsPresenter {
         ((Activity) topBar.getContext()).setRequestedOrientation(options.getValue());
     }
 
-    private void applyTopBarOptions(TopBarOptions options) {
+    private void applyTopBarOptions(TopBarOptions options, Component component) {
         if (options.title.text.hasValue()) topBar.setTitle(options.title.text.get());
         if (options.title.component.hasValue()) topBar.setComponent(options.title.component.get(), options.title.alignment);
         topBar.setBackgroundColor(options.background.color);
@@ -59,7 +53,6 @@ public class OptionsPresenter {
         } else if (options.drawBehind.isFalseOrUndefined()) {
             component.drawBelowTopBar(topBar);
         }
-
         if (options.hideOnScroll.isTrue()) {
             if (component instanceof IReactView) {
                 topBar.enableCollapse(((IReactView) component).getScrollEventListener());

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

@@ -38,13 +38,13 @@ public class StackController extends ParentController <StackLayout> {
 
     public void applyOptions(Options options) {
         super.applyOptions(options);
-        getView().applyOptions(options);
+        getView().applyChildOptions(options);
     }
 
     @Override
     public void applyChildOptions(Options options, Component child) {
         super.applyChildOptions(options, child);
-        getView().applyOptions(this.options, child);
+        getView().applyChildOptions(this.options, child);
         applyOnParentController(parentController ->
                 ((ParentController) parentController).applyChildOptions(this.options.copy().clearTopBarOptions(), child)
         );

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

@@ -19,21 +19,27 @@ import static android.view.ViewGroup.LayoutParams.WRAP_CONTENT;
 @SuppressLint("ViewConstructor")
 public class StackLayout extends RelativeLayout {
     private TopBar topBar;
+    private final OptionsPresenter optionsPresenter;
 
     public StackLayout(Context context, ReactViewCreator topBarButtonCreator, TitleBarReactViewCreator titleBarReactViewCreator, TopBarButtonController.OnClickListener topBarButtonClickListener) {
         super(context);
-        topBar = new TopBar(context, topBarButtonCreator, titleBarReactViewCreator, topBarButtonClickListener, this);
+        createLayout(topBarButtonCreator, titleBarReactViewCreator, topBarButtonClickListener);
+        optionsPresenter = new OptionsPresenter(topBar);
+        setContentDescription("StackLayout");
+    }
+
+    private void createLayout(ReactViewCreator topBarButtonCreator, TitleBarReactViewCreator titleBarReactViewCreator, TopBarButtonController.OnClickListener topBarButtonClickListener) {
+        topBar = new TopBar(getContext(), topBarButtonCreator, titleBarReactViewCreator, topBarButtonClickListener, this);
         topBar.setId(CompatUtils.generateViewId());
         addView(topBar, MATCH_PARENT, WRAP_CONTENT);
-        setContentDescription("StackLayout");
     }
 
-    public void applyOptions(Options options) {
-        new OptionsPresenter(topBar).applyOrientation(options.orientationOptions);
+    public void applyChildOptions(Options options) {
+        optionsPresenter.applyOrientation(options.orientationOptions);
     }
 
-    public void applyOptions(Options options, Component component) {
-        new OptionsPresenter(topBar, component).applyOptions(options);
+    public void applyChildOptions(Options options, Component child) {
+        optionsPresenter.applyChildOptions(options, child);
     }
 
     public void onChildWillDisappear(Options disappearing, Options appearing) {
@@ -56,9 +62,4 @@ public class StackLayout extends RelativeLayout {
     public TopBar getTopBar() {
         return topBar;
     }
-
-    @RestrictTo(RestrictTo.Scope.TESTS)
-    public void setTopBar(TopBar topBar) {
-        this.topBar = topBar;
-    }
 }

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

@@ -352,7 +352,6 @@ public class StackControllerTest extends BaseTest {
     @Test
     public void pop_animatesTopBarIfNeeded() throws Exception {
         uut.ensureViewIsCreated();
-        uut.getView().setTopBar(spy(uut.getTopBar()));
 
         child1.options.topBarOptions.visible = new Bool(false);
         child1.options.topBarOptions.animate = new Bool(false);