Removed NavigationOptionsListener

This commit removes NavigationOptionsListener as it was not needed anymore.
As a result, it uncovered a few issues which this commit also aims to fix.

* Set SideMenuController as parent of left, right and centre controllers
* Select tab by id with tabSelector interface
* mergeOptions now also applies options after merge - in ViewController base class
* Pull presentation logic from ComponentLayout to ComponentViewController

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

@@ -72,24 +72,25 @@ public class LayoutFactory {
 	}
 
     private ViewController createSideMenuRoot(LayoutNode node) {
-        SideMenuController sideMenuLayout = new SideMenuController(activity, node.id, getOptions(node));
+        SideMenuController sideMenuController = new SideMenuController(activity, node.id, getOptions(node));
 		for (LayoutNode child : node.children) {
-			ViewController childLayout = create(child);
+			ViewController childController = create(child);
+            childController.setParentController(sideMenuController);
 			switch (child.type) {
 				case SideMenuCenter:
-					sideMenuLayout.setCenterController(childLayout);
+					sideMenuController.setCenterController(childController);
 					break;
 				case SideMenuLeft:
-					sideMenuLayout.setLeftController(childLayout);
+					sideMenuController.setLeftController(childController);
 					break;
 				case SideMenuRight:
-					sideMenuLayout.setRightController(childLayout);
+					sideMenuController.setRightController(childController);
 					break;
 				default:
 					throw new IllegalArgumentException("Invalid node type in sideMenu: " + node.type);
 			}
-		}
-		return sideMenuLayout;
+        }
+		return sideMenuController;
 	}
 
 	private ViewController createSideMenuContent(LayoutNode node) {

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

@@ -27,6 +27,7 @@ public class BottomTabsOptionsPresenter {
     }
 
     public void present(Options options, int tabIndex) {
+        applyBottomTabsOptions(options.bottomTabsOptions, options.animations);
         applyBottomTabOptions(options.bottomTabOptions, tabIndex);
     }
 
@@ -55,7 +56,7 @@ public class BottomTabsOptionsPresenter {
         }
         if (options.currentTabId.hasValue()) {
             int tabIndex = bottomTabFinder.findByControllerId(options.currentTabId.get());
-            if (tabIndex >= 0) bottomTabs.setCurrentItem(tabIndex);
+            if (tabIndex >= 0) tabSelector.selectTab(tabIndex);
         }
         if (options.visible.isTrueOrUndefined()) {
             if (options.animate.isTrueOrUndefined()) {

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

@@ -1,31 +0,0 @@
-package com.reactnativenavigation.presentation;
-
-import android.app.Activity;
-import android.view.View;
-
-import com.reactnativenavigation.parse.Options;
-import com.reactnativenavigation.parse.OrientationOptions;
-
-public class ComponentOptionsPresenter {
-    private View component;
-
-    public ComponentOptionsPresenter(View component) {
-        this.component = component;
-    }
-
-    public void present(Options options) {
-        applyOrientation(options.orientationOptions);
-        applyOtherOptions(options);
-    }
-
-    private void applyOrientation(OrientationOptions options) {
-        ((Activity) component.getContext()).setRequestedOrientation(options.getValue());
-    }
-
-    private void applyOtherOptions(Options options) {
-        if (options.screenBackgroundColor.hasValue()) {
-            component.setBackgroundColor(options.screenBackgroundColor.get());
-        }
-    }
-
-}

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

@@ -1,8 +0,0 @@
-package com.reactnativenavigation.presentation;
-
-
-import com.reactnativenavigation.parse.Options;
-
-public interface NavigationOptionsListener {
-	void mergeOptions(Options options);
-}

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

@@ -1,187 +1,32 @@
 package com.reactnativenavigation.presentation;
 
 import android.app.Activity;
-import android.graphics.Color;
+import android.view.View;
 
-import com.reactnativenavigation.parse.AnimationsOptions;
 import com.reactnativenavigation.parse.Options;
 import com.reactnativenavigation.parse.OrientationOptions;
-import com.reactnativenavigation.parse.TopBarOptions;
-import com.reactnativenavigation.parse.TopTabOptions;
-import com.reactnativenavigation.parse.TopTabsOptions;
-import com.reactnativenavigation.parse.params.Button;
-import com.reactnativenavigation.utils.UiUtils;
-import com.reactnativenavigation.viewcontrollers.IReactView;
-import com.reactnativenavigation.views.Component;
-import com.reactnativenavigation.views.topbar.TopBar;
-
-import java.util.ArrayList;
 
 public class OptionsPresenter {
-    private static final int DEFAULT_TITLE_COLOR = Color.BLACK;
-    private static final int DEFAULT_SUBTITLE_COLOR = Color.GRAY;
-    private final float defaultTitleFontSize;
-    private final float defaultSubtitleFontSize;
 
-    private TopBar topBar;
+    private Activity activity;
 
-    public OptionsPresenter(TopBar topBar) {
-        this.topBar = topBar;
-        defaultTitleFontSize = UiUtils.dpToSp(topBar.getContext(), 18);
-        defaultSubtitleFontSize = UiUtils.dpToSp(topBar.getContext(), 14);
+    public OptionsPresenter(Activity activity) {
+        this.activity = activity;
     }
 
-    public void applyChildOptions(Options options, Component child) {
+    public void present(View view, Options options) {
         applyOrientation(options.orientationOptions);
-        applyButtons(options.topBar.leftButtons, options.topBar.rightButtons);
-        applyTopBarOptions(options.topBar, options.animations, child, options);
-        applyTopTabsOptions(options.topTabsOptions);
-        applyTopTabOptions(options.topTabOptions);
+        applyViewOptions(view, options);
     }
 
-    public void applyOrientation(OrientationOptions options) {
-        ((Activity) topBar.getContext()).setRequestedOrientation(options.getValue());
+    private void applyOrientation(OrientationOptions options) {
+        activity.setRequestedOrientation(options.getValue());
     }
 
-    private void applyTopBarOptions(TopBarOptions options, AnimationsOptions animationOptions, Component component, Options componentOptions) {
-        topBar.setTitle(options.title.text.get(""));
-        if (options.title.component.hasValue()) topBar.setTitleComponent(options.title.component);
-        topBar.setTitleFontSize(options.title.fontSize.get(defaultTitleFontSize));
-        topBar.setTitleTextColor(options.title.color.get(DEFAULT_TITLE_COLOR));
-        topBar.setTitleTypeface(options.title.fontFamily);
-        topBar.setTitleAlignment(options.title.alignment);
-
-        topBar.setSubtitle(options.subtitle.text.get(""));
-        topBar.setSubtitleFontSize(options.subtitle.fontSize.get(defaultSubtitleFontSize));
-        topBar.setSubtitleColor(options.subtitle.color.get(DEFAULT_SUBTITLE_COLOR));
-        topBar.setSubtitleFontFamily(options.subtitle.fontFamily);
-        topBar.setSubtitleAlignment(options.subtitle.alignment);
-
-        topBar.setBackgroundColor(options.background.color);
-        topBar.setBackgroundComponent(options.background.component);
-        if (options.testId.hasValue()) topBar.setTestId(options.testId.get());
-
-        if (options.visible.isFalse()) {
-            if (options.animate.isTrueOrUndefined() && componentOptions.animations.push.enable.isTrueOrUndefined()) {
-                topBar.hideAnimate(animationOptions.pop.topBar);
-            } else {
-                topBar.hide();
-            }
-        }
-        if (options.visible.isTrueOrUndefined()) {
-            if (options.animate.isTrueOrUndefined() && componentOptions.animations.push.enable.isTrueOrUndefined()) {
-                topBar.showAnimate(animationOptions.push.topBar);
-            } else {
-                topBar.show();
-            }
-        }
-        if (options.drawBehind.isTrue()) {
-            component.drawBehindTopBar();
-        } else if (options.drawBehind.isFalseOrUndefined()) {
-            component.drawBelowTopBar(topBar);
-        }
-        if (options.hideOnScroll.isTrue()) {
-            if (component instanceof IReactView) {
-                topBar.enableCollapse(((IReactView) component).getScrollEventListener());
-            }
-        } else if (options.hideOnScroll.isFalseOrUndefined()) {
-            topBar.disableCollapse();
+    private void applyViewOptions(View view, Options options) {
+        if (options.screenBackgroundColor.hasValue()) {
+            view.setBackgroundColor(options.screenBackgroundColor.get());
         }
     }
 
-    private void applyButtons(ArrayList<Button> leftButtons, ArrayList<Button> rightButtons) {
-        topBar.setLeftButtons(leftButtons);
-        topBar.setRightButtons(rightButtons);
-    }
-
-    private void applyTopTabsOptions(TopTabsOptions options) {
-        topBar.applyTopTabsColors(options.selectedTabColor, options.unselectedTabColor);
-        topBar.applyTopTabsFontSize(options.fontSize);
-        topBar.setTopTabsVisible(options.visible.isTrueOrUndefined());
-    }
-
-    private void applyTopTabOptions(TopTabOptions topTabOptions) {
-        if (topTabOptions.fontFamily != null) topBar.setTopTabFontFamily(topTabOptions.tabIndex, topTabOptions.fontFamily);
-    }
-
-    public void onChildWillAppear(Options appearing, Options disappearing) {
-        if (disappearing.topBar.visible.isTrueOrUndefined() && appearing.topBar.visible.isFalse()) {
-            if (disappearing.topBar.animate.isTrueOrUndefined() && disappearing.animations.pop.enable.isTrueOrUndefined()) {
-                topBar.hideAnimate(disappearing.animations.pop.topBar);
-            } else {
-                topBar.hide();
-            }
-        }
-    }
-
-    public void mergeChildOptions(Options options, Component child) {
-        mergeOrientation(options.orientationOptions);
-        mergeButtons(options.topBar.leftButtons, options.topBar.rightButtons);
-        mergeTopBarOptions(options.topBar, options.animations, child);
-        mergeTopTabsOptions(options.topTabsOptions);
-        mergeTopTabOptions(options.topTabOptions);
-    }
-
-    private void mergeOrientation(OrientationOptions orientationOptions) {
-        if (orientationOptions.hasValue()) applyOrientation(orientationOptions);
-    }
-
-    private void mergeButtons(ArrayList<Button> leftButtons, ArrayList<Button> rightButtons) {
-        if (leftButtons != null) topBar.setLeftButtons(leftButtons);
-        if (rightButtons != null) topBar.setRightButtons(rightButtons);
-    }
-
-    private void mergeTopBarOptions(TopBarOptions options, AnimationsOptions animationsOptions, Component component) {
-        if (options.title.text.hasValue()) topBar.setTitle(options.title.text.get());
-        if (options.title.component.hasValue()) topBar.setTitleComponent(options.title.component);
-        if (options.title.color.hasValue()) topBar.setTitleTextColor(options.title.color.get());
-        if (options.title.fontSize.hasValue()) topBar.setTitleFontSize(options.title.fontSize.get());
-        if (options.title.fontFamily != null) topBar.setTitleTypeface(options.title.fontFamily);
-
-        if (options.subtitle.text.hasValue()) topBar.setSubtitle(options.subtitle.text.get());
-        if (options.subtitle.color.hasValue()) topBar.setSubtitleColor(options.subtitle.color.get());
-        if (options.subtitle.fontSize.hasValue()) topBar.setSubtitleFontSize(options.subtitle.fontSize.get());
-        if (options.subtitle.fontFamily != null) topBar.setSubtitleFontFamily(options.subtitle.fontFamily);
-
-        if (options.background.color.hasValue()) topBar.setBackgroundColor(options.background.color);
-
-        if (options.testId.hasValue()) topBar.setTestId(options.testId.get());
-
-        if (options.visible.isFalse()) {
-            if (options.animate.isTrueOrUndefined()) {
-                topBar.hideAnimate(animationsOptions.pop.topBar);
-            } else {
-                topBar.hide();
-            }
-        }
-        if (options.visible.isTrue()) {
-            if (options.animate.isTrueOrUndefined()) {
-                topBar.showAnimate(animationsOptions.push.topBar);
-            } else {
-                topBar.show();
-            }
-        }
-        if (options.drawBehind.isTrue()) {
-            component.drawBehindTopBar();
-        }
-        if (options.drawBehind.isFalse()) {
-            component.drawBelowTopBar(topBar);
-        }
-        if (options.hideOnScroll.isTrue() && component instanceof IReactView) {
-            topBar.enableCollapse(((IReactView) component).getScrollEventListener());
-        }
-        if (options.hideOnScroll.isFalse()) {
-            topBar.disableCollapse();
-        }
-    }
-
-    private void mergeTopTabsOptions(TopTabsOptions options) {
-        if (options.selectedTabColor.hasValue() && options.unselectedTabColor.hasValue()) topBar.applyTopTabsColors(options.selectedTabColor, options.unselectedTabColor);
-        if (options.fontSize.hasValue()) topBar.applyTopTabsFontSize(options.fontSize);
-        if (options.visible.hasValue()) topBar.setTopTabsVisible(options.visible.isTrue());
-    }
-
-    private void mergeTopTabOptions(TopTabOptions topTabOptions) {
-        if (topTabOptions.fontFamily != null) topBar.setTopTabFontFamily(topTabOptions.tabIndex, topTabOptions.fontFamily);
-    }
 }

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

@@ -0,0 +1,187 @@
+package com.reactnativenavigation.presentation;
+
+import android.app.Activity;
+import android.graphics.Color;
+
+import com.reactnativenavigation.parse.AnimationsOptions;
+import com.reactnativenavigation.parse.Options;
+import com.reactnativenavigation.parse.OrientationOptions;
+import com.reactnativenavigation.parse.TopBarOptions;
+import com.reactnativenavigation.parse.TopTabOptions;
+import com.reactnativenavigation.parse.TopTabsOptions;
+import com.reactnativenavigation.parse.params.Button;
+import com.reactnativenavigation.utils.UiUtils;
+import com.reactnativenavigation.viewcontrollers.IReactView;
+import com.reactnativenavigation.views.Component;
+import com.reactnativenavigation.views.topbar.TopBar;
+
+import java.util.ArrayList;
+
+public class StackOptionsPresenter {
+    private static final int DEFAULT_TITLE_COLOR = Color.BLACK;
+    private static final int DEFAULT_SUBTITLE_COLOR = Color.GRAY;
+    private final float defaultTitleFontSize;
+    private final float defaultSubtitleFontSize;
+
+    private TopBar topBar;
+
+    public StackOptionsPresenter(TopBar topBar) {
+        this.topBar = topBar;
+        defaultTitleFontSize = UiUtils.dpToSp(topBar.getContext(), 18);
+        defaultSubtitleFontSize = UiUtils.dpToSp(topBar.getContext(), 14);
+    }
+
+    public void applyChildOptions(Options options, Component child) {
+        applyOrientation(options.orientationOptions);
+        applyButtons(options.topBar.leftButtons, options.topBar.rightButtons);
+        applyTopBarOptions(options.topBar, options.animations, child, options);
+        applyTopTabsOptions(options.topTabsOptions);
+        applyTopTabOptions(options.topTabOptions);
+    }
+
+    public void applyOrientation(OrientationOptions options) {
+        ((Activity) topBar.getContext()).setRequestedOrientation(options.getValue());
+    }
+
+    private void applyTopBarOptions(TopBarOptions options, AnimationsOptions animationOptions, Component component, Options componentOptions) {
+        topBar.setTitle(options.title.text.get(""));
+        if (options.title.component.hasValue()) topBar.setTitleComponent(options.title.component);
+        topBar.setTitleFontSize(options.title.fontSize.get(defaultTitleFontSize));
+        topBar.setTitleTextColor(options.title.color.get(DEFAULT_TITLE_COLOR));
+        topBar.setTitleTypeface(options.title.fontFamily);
+        topBar.setTitleAlignment(options.title.alignment);
+
+        topBar.setSubtitle(options.subtitle.text.get(""));
+        topBar.setSubtitleFontSize(options.subtitle.fontSize.get(defaultSubtitleFontSize));
+        topBar.setSubtitleColor(options.subtitle.color.get(DEFAULT_SUBTITLE_COLOR));
+        topBar.setSubtitleFontFamily(options.subtitle.fontFamily);
+        topBar.setSubtitleAlignment(options.subtitle.alignment);
+
+        topBar.setBackgroundColor(options.background.color);
+        topBar.setBackgroundComponent(options.background.component);
+        if (options.testId.hasValue()) topBar.setTestId(options.testId.get());
+
+        if (options.visible.isFalse()) {
+            if (options.animate.isTrueOrUndefined() && componentOptions.animations.push.enable.isTrueOrUndefined()) {
+                topBar.hideAnimate(animationOptions.pop.topBar);
+            } else {
+                topBar.hide();
+            }
+        }
+        if (options.visible.isTrueOrUndefined()) {
+            if (options.animate.isTrueOrUndefined() && componentOptions.animations.push.enable.isTrueOrUndefined()) {
+                topBar.showAnimate(animationOptions.push.topBar);
+            } else {
+                topBar.show();
+            }
+        }
+        if (options.drawBehind.isTrue()) {
+            component.drawBehindTopBar();
+        } else if (options.drawBehind.isFalseOrUndefined()) {
+            component.drawBelowTopBar(topBar);
+        }
+        if (options.hideOnScroll.isTrue()) {
+            if (component instanceof IReactView) {
+                topBar.enableCollapse(((IReactView) component).getScrollEventListener());
+            }
+        } else if (options.hideOnScroll.isFalseOrUndefined()) {
+            topBar.disableCollapse();
+        }
+    }
+
+    private void applyButtons(ArrayList<Button> leftButtons, ArrayList<Button> rightButtons) {
+        topBar.setLeftButtons(leftButtons);
+        topBar.setRightButtons(rightButtons);
+    }
+
+    private void applyTopTabsOptions(TopTabsOptions options) {
+        topBar.applyTopTabsColors(options.selectedTabColor, options.unselectedTabColor);
+        topBar.applyTopTabsFontSize(options.fontSize);
+        topBar.setTopTabsVisible(options.visible.isTrueOrUndefined());
+    }
+
+    private void applyTopTabOptions(TopTabOptions topTabOptions) {
+        if (topTabOptions.fontFamily != null) topBar.setTopTabFontFamily(topTabOptions.tabIndex, topTabOptions.fontFamily);
+    }
+
+    public void onChildWillAppear(Options appearing, Options disappearing) {
+        if (disappearing.topBar.visible.isTrueOrUndefined() && appearing.topBar.visible.isFalse()) {
+            if (disappearing.topBar.animate.isTrueOrUndefined() && disappearing.animations.pop.enable.isTrueOrUndefined()) {
+                topBar.hideAnimate(disappearing.animations.pop.topBar);
+            } else {
+                topBar.hide();
+            }
+        }
+    }
+
+    public void mergeChildOptions(Options options, Component child) {
+        mergeOrientation(options.orientationOptions);
+        mergeButtons(options.topBar.leftButtons, options.topBar.rightButtons);
+        mergeTopBarOptions(options.topBar, options.animations, child);
+        mergeTopTabsOptions(options.topTabsOptions);
+        mergeTopTabOptions(options.topTabOptions);
+    }
+
+    private void mergeOrientation(OrientationOptions orientationOptions) {
+        if (orientationOptions.hasValue()) applyOrientation(orientationOptions);
+    }
+
+    private void mergeButtons(ArrayList<Button> leftButtons, ArrayList<Button> rightButtons) {
+        if (leftButtons != null) topBar.setLeftButtons(leftButtons);
+        if (rightButtons != null) topBar.setRightButtons(rightButtons);
+    }
+
+    private void mergeTopBarOptions(TopBarOptions options, AnimationsOptions animationsOptions, Component component) {
+        if (options.title.text.hasValue()) topBar.setTitle(options.title.text.get());
+        if (options.title.component.hasValue()) topBar.setTitleComponent(options.title.component);
+        if (options.title.color.hasValue()) topBar.setTitleTextColor(options.title.color.get());
+        if (options.title.fontSize.hasValue()) topBar.setTitleFontSize(options.title.fontSize.get());
+        if (options.title.fontFamily != null) topBar.setTitleTypeface(options.title.fontFamily);
+
+        if (options.subtitle.text.hasValue()) topBar.setSubtitle(options.subtitle.text.get());
+        if (options.subtitle.color.hasValue()) topBar.setSubtitleColor(options.subtitle.color.get());
+        if (options.subtitle.fontSize.hasValue()) topBar.setSubtitleFontSize(options.subtitle.fontSize.get());
+        if (options.subtitle.fontFamily != null) topBar.setSubtitleFontFamily(options.subtitle.fontFamily);
+
+        if (options.background.color.hasValue()) topBar.setBackgroundColor(options.background.color);
+
+        if (options.testId.hasValue()) topBar.setTestId(options.testId.get());
+
+        if (options.visible.isFalse()) {
+            if (options.animate.isTrueOrUndefined()) {
+                topBar.hideAnimate(animationsOptions.pop.topBar);
+            } else {
+                topBar.hide();
+            }
+        }
+        if (options.visible.isTrue()) {
+            if (options.animate.isTrueOrUndefined()) {
+                topBar.showAnimate(animationsOptions.push.topBar);
+            } else {
+                topBar.show();
+            }
+        }
+        if (options.drawBehind.isTrue()) {
+            component.drawBehindTopBar();
+        }
+        if (options.drawBehind.isFalse()) {
+            component.drawBelowTopBar(topBar);
+        }
+        if (options.hideOnScroll.isTrue() && component instanceof IReactView) {
+            topBar.enableCollapse(((IReactView) component).getScrollEventListener());
+        }
+        if (options.hideOnScroll.isFalse()) {
+            topBar.disableCollapse();
+        }
+    }
+
+    private void mergeTopTabsOptions(TopTabsOptions options) {
+        if (options.selectedTabColor.hasValue() && options.unselectedTabColor.hasValue()) topBar.applyTopTabsColors(options.selectedTabColor, options.unselectedTabColor);
+        if (options.fontSize.hasValue()) topBar.applyTopTabsFontSize(options.fontSize);
+        if (options.visible.hasValue()) topBar.setTopTabsVisible(options.visible.isTrue());
+    }
+
+    private void mergeTopTabOptions(TopTabOptions topTabOptions) {
+        if (topTabOptions.fontFamily != null) topBar.setTopTabFontFamily(topTabOptions.tabIndex, topTabOptions.fontFamily);
+    }
+}

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

@@ -4,11 +4,10 @@ import android.app.Activity;
 import android.support.annotation.NonNull;
 
 import com.reactnativenavigation.parse.Options;
-import com.reactnativenavigation.presentation.NavigationOptionsListener;
 import com.reactnativenavigation.views.ComponentLayout;
 import com.reactnativenavigation.views.ReactComponent;
 
-public class ComponentViewController extends ViewController<ComponentLayout> implements NavigationOptionsListener {
+public class ComponentViewController extends ViewController<ComponentLayout> {
 
     private final String componentName;
 
@@ -43,6 +42,7 @@ public class ComponentViewController extends ViewController<ComponentLayout> imp
 
     @Override
     public void applyOptions(Options options) {
+        super.applyOptions(options);
         view.applyOptions(options);
     }
 
@@ -60,9 +60,8 @@ public class ComponentViewController extends ViewController<ComponentLayout> imp
 
     @Override
     public void mergeOptions(Options options) {
-        view.applyOptions(options);
         applyOnParentController(parentController -> parentController.mergeChildOptions(options, view));
-        this.options = this.options.mergeWith(options);
+        super.mergeOptions(options);
     }
 
     ReactComponent getComponent() {

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

@@ -11,7 +11,6 @@ import android.widget.FrameLayout;
 import com.reactnativenavigation.anim.ModalAnimator;
 import com.reactnativenavigation.anim.NavigationAnimator;
 import com.reactnativenavigation.parse.Options;
-import com.reactnativenavigation.presentation.NavigationOptionsListener;
 import com.reactnativenavigation.presentation.OverlayManager;
 import com.reactnativenavigation.react.JsDevReloadHandler;
 import com.reactnativenavigation.utils.CommandListener;
@@ -119,11 +118,8 @@ public class Navigator extends ParentController implements JsDevReloadHandler.Re
 
     public void mergeOptions(final String componentId, Options options) {
         ViewController target = findControllerById(componentId);
-        if (target instanceof NavigationOptionsListener) {
-            ((NavigationOptionsListener) target).mergeOptions(options);
-        }
-        if (root instanceof NavigationOptionsListener) {
-            ((NavigationOptionsListener) root).mergeOptions(options);
+        if (target != null) {
+            target.mergeOptions(options);
         }
     }
 

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

@@ -8,7 +8,6 @@ import android.view.Gravity;
 import android.view.View;
 
 import com.reactnativenavigation.parse.Options;
-import com.reactnativenavigation.presentation.NavigationOptionsListener;
 import com.reactnativenavigation.presentation.SideMenuOptionsPresenter;
 import com.reactnativenavigation.views.Component;
 
@@ -17,7 +16,7 @@ import java.util.Collection;
 
 import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;
 
-public class SideMenuController extends ParentController<DrawerLayout> implements NavigationOptionsListener {
+public class SideMenuController extends ParentController<DrawerLayout> {
 
 	private ViewController centerController;
 	private ViewController leftController;
@@ -56,11 +55,19 @@ public class SideMenuController extends ParentController<DrawerLayout> implement
         );
     }
 
+    @Override
+    public void mergeChildOptions(Options options, Component child) {
+        super.mergeChildOptions(options, child);
+        new SideMenuOptionsPresenter(getView()).present(options.sideMenuRootOptions);
+        applyOnParentController(parentController ->
+                ((ParentController) parentController).mergeChildOptions(options.copy().clearSideMenuOptions(), child)
+        );
+    }
+
     @Override
     public void mergeOptions(Options options) {
-        this.options = this.options.mergeWith(options);
+        super.mergeOptions(options);
         new SideMenuOptionsPresenter(getView()).present(this.options.sideMenuRootOptions);
-        this.options = this.options.copy().clearSideMenuOptions();
     }
 
     public void setCenterController(ViewController centerController) {

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

@@ -40,11 +40,6 @@ public class StackController extends ParentController<StackLayout> {
         this.animator = animator;
     }
 
-    public void applyOptions(Options options) {
-        super.applyOptions(options);
-        getView().applyChildOptions(options);
-    }
-
     @Override
     public void applyChildOptions(Options options, Component child) {
         super.applyChildOptions(options, child);

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

@@ -12,6 +12,7 @@ import android.view.ViewTreeObserver;
 
 import com.reactnativenavigation.parse.Options;
 import com.reactnativenavigation.presentation.FabOptionsPresenter;
+import com.reactnativenavigation.presentation.OptionsPresenter;
 import com.reactnativenavigation.utils.CommandListener;
 import com.reactnativenavigation.utils.StringUtils;
 import com.reactnativenavigation.utils.Task;
@@ -42,11 +43,13 @@ public abstract class ViewController<T extends ViewGroup> implements ViewTreeObs
     private boolean isShown;
     private boolean isDestroyed;
     private ViewVisibilityListener viewVisibilityListener = new ViewVisibilityListenerAdapter();
+    private OptionsPresenter presenter;
     FabOptionsPresenter fabOptionsPresenter;
 
     public ViewController(Activity activity, String id, Options initialOptions) {
         this.activity = activity;
         this.id = id;
+        presenter = new OptionsPresenter(activity);
         fabOptionsPresenter = new FabOptionsPresenter();
         this.initialOptions = initialOptions;
         options = initialOptions.copy();
@@ -67,8 +70,16 @@ public abstract class ViewController<T extends ViewGroup> implements ViewTreeObs
         return false;
     }
 
-    public void applyOptions(Options options) {
+    @CallSuper
+    public void mergeOptions(Options options) {
+        this.options = this.options.mergeWith(options);
+        applyOptions(this.options);
+        this.options.clearOneTimeOptions();
+    }
 
+    @CallSuper
+    public void applyOptions(Options options) {
+        presenter.present(getView(), options);
     }
 
     public Activity getActivity() {

lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/bottomtabs/BottomTabsController.java

@@ -11,7 +11,6 @@ import com.aurelhubert.ahbottomnavigation.AHBottomNavigationItem;
 import com.reactnativenavigation.parse.BottomTabOptions;
 import com.reactnativenavigation.parse.Options;
 import com.reactnativenavigation.presentation.BottomTabsOptionsPresenter;
-import com.reactnativenavigation.presentation.NavigationOptionsListener;
 import com.reactnativenavigation.react.EventEmitter;
 import com.reactnativenavigation.utils.CommandListener;
 import com.reactnativenavigation.utils.ImageLoader;
@@ -28,7 +27,7 @@ import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;
 import static android.view.ViewGroup.LayoutParams.WRAP_CONTENT;
 import static android.widget.RelativeLayout.ALIGN_PARENT_BOTTOM;
 
-public class BottomTabsController extends ParentController implements AHBottomNavigation.OnTabSelectedListener, NavigationOptionsListener, TabSelector {
+public class BottomTabsController extends ParentController implements AHBottomNavigation.OnTabSelectedListener, TabSelector {
 
 	private BottomTabs bottomTabs;
 	private List<ViewController> tabs = new ArrayList<>();
@@ -147,12 +146,6 @@ public class BottomTabsController extends ParentController implements AHBottomNa
 		return tabs;
 	}
 
-	@Override
-	public void mergeOptions(Options options) {
-        this.options = this.options.mergeWith(options);
-        presenter.present(this.options);
-    }
-
     @Override
     public void selectTab(final int newIndex) {
         getView().removeView(getCurrentView());

lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/externalcomponent/ExternalComponentViewController.java

@@ -21,11 +21,6 @@ public class ExternalComponentViewController extends ViewController<ExternalComp
         this.reactInstanceManager = reactInstanceManager;
     }
 
-    @Override
-    public void applyOptions(Options options) {
-        getView().applyOptions(options);
-    }
-
     @Override
     protected ExternalComponentLayout createView() {
         ExternalComponentLayout content = new ExternalComponentLayout(getActivity());

lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/toptabs/TopTabsController.java

@@ -5,7 +5,6 @@ import android.support.annotation.NonNull;
 import android.view.View;
 
 import com.reactnativenavigation.parse.Options;
-import com.reactnativenavigation.presentation.NavigationOptionsListener;
 import com.reactnativenavigation.utils.Task;
 import com.reactnativenavigation.viewcontrollers.ParentController;
 import com.reactnativenavigation.viewcontrollers.ViewController;
@@ -17,7 +16,7 @@ import com.reactnativenavigation.views.toptabs.TopTabsViewPager;
 import java.util.Collection;
 import java.util.List;
 
-public class TopTabsController extends ParentController<TopTabsViewPager> implements NavigationOptionsListener {
+public class TopTabsController extends ParentController<TopTabsViewPager> {
 
     private List<ViewController> tabs;
     private TopTabsLayoutCreator viewCreator;
@@ -88,11 +87,6 @@ public class TopTabsController extends ParentController<TopTabsViewPager> implem
         );
     }
 
-    @Override
-    public void mergeOptions(Options options) {
-
-    }
-
     public void switchToTab(int index) {
         getView().switchToTab(index);
     }

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

@@ -1,11 +1,8 @@
 package com.reactnativenavigation.views;
 
-import com.reactnativenavigation.parse.Options;
 import com.reactnativenavigation.views.topbar.TopBar;
 
 public interface Component {
-    void applyOptions(Options options);
-
     void drawBehindTopBar();
 
     void drawBelowTopBar(TopBar topBar);

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

@@ -9,7 +9,6 @@ import android.widget.RelativeLayout;
 
 import com.reactnativenavigation.interfaces.ScrollEventListener;
 import com.reactnativenavigation.parse.Options;
-import com.reactnativenavigation.presentation.ComponentOptionsPresenter;
 import com.reactnativenavigation.viewcontrollers.IReactView;
 import com.reactnativenavigation.viewcontrollers.TopBarButtonController;
 import com.reactnativenavigation.views.topbar.TopBar;
@@ -22,7 +21,6 @@ public class ComponentLayout extends FrameLayout implements ReactComponent, TopB
 
     private IReactView reactView;
     private final OverlayTouchDelegate touchDelegate;
-    private final ComponentOptionsPresenter optionsPresenter;
 
     public ComponentLayout(Context context, IReactView reactView) {
 		super(context);
@@ -30,7 +28,6 @@ public class ComponentLayout extends FrameLayout implements ReactComponent, TopB
         addView(reactView.asView(), MATCH_PARENT, MATCH_PARENT);
         setContentDescription("ComponentLayout");
         touchDelegate = new OverlayTouchDelegate(reactView);
-        optionsPresenter = new ComponentOptionsPresenter(this);
     }
 
     @Override
@@ -58,9 +55,7 @@ public class ComponentLayout extends FrameLayout implements ReactComponent, TopB
 		reactView.sendComponentStop();
 	}
 
-    @Override
     public void applyOptions(Options options) {
-        optionsPresenter.present(options);
         touchDelegate.setInterceptTouchOutside(options.overlayOptions.interceptTouchOutside.isTrue());
     }
 

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

@@ -5,8 +5,6 @@ import android.content.Context;
 import android.widget.FrameLayout;
 import android.widget.RelativeLayout;
 
-import com.reactnativenavigation.parse.Options;
-import com.reactnativenavigation.presentation.ComponentOptionsPresenter;
 import com.reactnativenavigation.views.topbar.TopBar;
 
 import static android.widget.RelativeLayout.BELOW;
@@ -18,11 +16,6 @@ public class ExternalComponentLayout extends FrameLayout implements Component {
         setContentDescription("ExternalComponentLayout");
     }
 
-    @Override
-    public void applyOptions(Options options) {
-        new ComponentOptionsPresenter(this).present(options);
-    }
-
     @Override
     public void drawBehindTopBar() {
         if (getParent() instanceof RelativeLayout) {

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

@@ -5,7 +5,7 @@ import android.content.Context;
 import android.widget.RelativeLayout;
 
 import com.reactnativenavigation.parse.Options;
-import com.reactnativenavigation.presentation.OptionsPresenter;
+import com.reactnativenavigation.presentation.StackOptionsPresenter;
 import com.reactnativenavigation.viewcontrollers.ReactViewCreator;
 import com.reactnativenavigation.viewcontrollers.TopBarButtonController;
 import com.reactnativenavigation.viewcontrollers.ViewController;
@@ -19,13 +19,13 @@ import static android.view.ViewGroup.LayoutParams.WRAP_CONTENT;
 @SuppressLint("ViewConstructor")
 public class StackLayout extends RelativeLayout {
     private String stackId;
-    private final OptionsPresenter optionsPresenter;
+    private final StackOptionsPresenter optionsPresenter;
 
     public StackLayout(Context context, ReactViewCreator topBarButtonCreator, TitleBarReactViewCreator titleBarReactViewCreator, TopBarBackgroundViewController topBarBackgroundViewController, TopBarController topBarController, TopBarButtonController.OnClickListener topBarButtonClickListener, String stackId) {
         super(context);
         this.stackId = stackId;
         createLayout(topBarButtonCreator, titleBarReactViewCreator, topBarBackgroundViewController, topBarController, topBarButtonClickListener);
-        optionsPresenter = new OptionsPresenter(topBarController.getView());
+        optionsPresenter = new StackOptionsPresenter(topBarController.getView());
         setContentDescription("StackLayout");
     }
 

lib/android/app/src/main/java/com/reactnativenavigation/views/toptabs/TopTabsViewPager.java

@@ -41,11 +41,6 @@ public class TopTabsViewPager extends ViewPager implements Component, TopBarButt
         addOnPageChangeListener(adapter);
     }
 
-    @Override
-    public void applyOptions(Options options) {
-
-    }
-
     @Override
     public void drawBehindTopBar() {
         RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) getLayoutParams();
@@ -83,4 +78,8 @@ public class TopTabsViewPager extends ViewPager implements Component, TopBarButt
         }
         return false;
     }
+
+    public void applyOptions(Options options) {
+
+    }
 }

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

@@ -10,6 +10,7 @@ import android.widget.FrameLayout;
 import com.reactnativenavigation.interfaces.ScrollEventListener;
 import com.reactnativenavigation.parse.Options;
 import com.reactnativenavigation.viewcontrollers.ViewController;
+import com.reactnativenavigation.views.Component;
 import com.reactnativenavigation.views.ReactComponent;
 import com.reactnativenavigation.views.topbar.TopBar;
 
@@ -37,17 +38,18 @@ public class SimpleViewController extends ViewController<FrameLayout> {
         return "SimpleViewController " + getId();
     }
 
-    public class SimpleView extends FrameLayout implements ReactComponent {
+    @Override
+    public void mergeOptions(Options options) {
+        applyOnParentController(parentController -> parentController.mergeChildOptions(options, (Component) view));
+        super.mergeOptions(options);
+    }
+
+    public static class SimpleView extends FrameLayout implements ReactComponent {
 
         public SimpleView(@NonNull Context context) {
             super(context);
         }
 
-        @Override
-        public void applyOptions(Options options) {
-
-        }
-
         @Override
         public void drawBehindTopBar() {
 

lib/android/app/src/test/java/com/reactnativenavigation/parse/OptionsTest.java

@@ -91,8 +91,6 @@ public class OptionsTest extends BaseTest {
         assertThat(result.topBar.hideOnScroll.get()).isEqualTo(TOP_BAR_HIDE_ON_SCROLL.get());
         assertThat(result.bottomTabsOptions.animate.get()).isEqualTo(BOTTOM_TABS_ANIMATE.get());
         assertThat(result.bottomTabsOptions.visible.get()).isEqualTo(BOTTOM_TABS_VISIBLE.get());
-        assertThat(result.bottomTabsOptions.currentTabId.get()).isEqualTo(BOTTOM_TABS_CURRENT_TAB_ID);
-        assertThat(result.bottomTabsOptions.currentTabIndex.get()).isEqualTo(BOTTOM_TABS_CURRENT_TAB_INDEX.get());
         assertThat(result.fabOptions.id.get()).isEqualTo(FAB_ID);
         assertThat(result.fabOptions.backgroundColor.get()).isEqualTo(FAB_BACKGROUND_COLOR);
         assertThat(result.fabOptions.clickColor.get()).isEqualTo(FAB_CLICK_COLOR);

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

@@ -53,7 +53,6 @@ public class BottomTabsControllerTest extends BaseTest {
 
     @Override
     public void beforeEach() {
-        super.beforeEach();
         activity = newActivity();
         eventEmitter = Mockito.mock(EventEmitter.class);
         uut = spy(new BottomTabsController(activity, eventEmitter, imageLoaderMock, "uut", new Options()));
@@ -90,6 +89,7 @@ public class BottomTabsControllerTest extends BaseTest {
     public void setTabs_AddAllViews() {
         List<ViewController> tabs = createTabs();
         uut.setTabs(tabs);
+        uut.onViewAppeared();
         assertThat(uut.getView().getChildCount()).isEqualTo(2);
         assertThat(((ViewController) ((List) uut.getChildControllers()).get(0)).getView().getParent()).isNotNull();
     }
@@ -178,6 +178,21 @@ public class BottomTabsControllerTest extends BaseTest {
         verify(eventEmitter, times(0)).emitBottomTabSelected(any(Integer.class), any(Integer.class));
     }
 
+    @Test
+    public void child_mergeOptions_currentTabIndex() {
+        List<ViewController> tabs = createTabs();
+        uut.setTabs(tabs);
+        uut.ensureViewIsCreated();
+
+        assertThat(uut.getSelectedIndex()).isZero();
+
+        Options options = new Options();
+        options.bottomTabsOptions.currentTabIndex = new Number(1);
+        child1.mergeOptions(options);
+
+        assertThat(uut.getSelectedIndex()).isOne();
+    }
+
     @Test
     public void buttonPressInvokedOnCurrentTab() {
         uut.setTabs(createTabs());

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

@@ -15,7 +15,7 @@ import com.reactnativenavigation.parse.params.Color;
 import com.reactnativenavigation.parse.params.Fraction;
 import com.reactnativenavigation.parse.params.Number;
 import com.reactnativenavigation.parse.params.Text;
-import com.reactnativenavigation.presentation.OptionsPresenter;
+import com.reactnativenavigation.presentation.StackOptionsPresenter;
 import com.reactnativenavigation.views.topbar.TopBar;
 
 import org.json.JSONObject;
@@ -35,7 +35,7 @@ import static org.mockito.Mockito.when;
 
 public class OptionsMergingTest extends BaseTest {
 
-    private OptionsPresenter uut;
+    private StackOptionsPresenter uut;
     private TestComponentLayout child;
     private Activity activity;
     private TopBar topBar;
@@ -44,7 +44,7 @@ public class OptionsMergingTest extends BaseTest {
     public void beforeEach() {
         activity = spy(newActivity());
         topBar = mockTopBar();
-        uut = spy(new OptionsPresenter(topBar));
+        uut = spy(new StackOptionsPresenter(topBar));
         child = spy(new TestComponentLayout(activity, new TestReactView(activity)));
     }
 

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

@@ -23,7 +23,7 @@ public class SideMenuControllerTest extends BaseTest {
     }
 
     @Test
-    public void mergeOptions_openLeftSideMenu() throws Exception {
+    public void mergeOptions_openLeftSideMenu() {
         uut.setLeftController(new SimpleComponentViewController(activity, "left", new Options()));
 
         Options options = new Options();
@@ -34,7 +34,7 @@ public class SideMenuControllerTest extends BaseTest {
     }
 
     @Test
-    public void mergeOptions_openRightSideMenu() throws Exception {
+    public void mergeOptions_openRightSideMenu() {
         uut.setRightController(new SimpleComponentViewController(activity, "right", new Options()));
 
         Options options = new Options();
@@ -45,7 +45,7 @@ public class SideMenuControllerTest extends BaseTest {
     }
 
     @Test
-    public void mergeOptions_optionsAreClearedAfterMerge() throws Exception {
+    public void mergeOptions_optionsAreClearedAfterMerge() {
         Options initialOptions = uut.options;
         Options options = new Options();
         uut.mergeOptions(options);

playground/src/screens/TextScreen.js

@@ -6,8 +6,6 @@ const { View, Text, Button } = require('react-native');
 const { Navigation } = require('react-native-navigation');
 const testIDs = require('../testIDs');
 
-let globalFirstComponentID;
-
 class TextScreen extends Component {
   static get options() {
     return {
@@ -20,11 +18,6 @@ class TextScreen extends Component {
     };
   }
 
-  constructor(props) {
-    super(props);
-    globalFirstComponentID = (props.text === 'This is tab 1') ? props.componentId : globalFirstComponentID;
-  }
-
   render() {
     return (
       <View style={styles.root}>
@@ -79,7 +72,7 @@ class TextScreen extends Component {
   onClickSwitchToTabByComponentID() {
     Navigation.mergeOptions(this.props.componentId, {
       bottomTabs: {
-        currentTabId: globalFirstComponentID
+        currentTabId: 'TAB1_ID'
       }
     });
   }

playground/src/screens/WelcomeScreen.js

@@ -50,6 +50,7 @@ class WelcomeScreen extends Component {
         children: [
           {
             stack: {
+              id: 'TAB1_ID',
               children: [
                 {
                   component: {