FIx e2e on Android

* applyOptions is applied in correct order

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

@@ -70,4 +70,14 @@ public class Options implements DEFAULT_VALUES {
         bottomTabsOptions.mergeWithDefault(other.bottomTabsOptions);
         return this;
     }
+
+    public Options clearTopBarOptions() {
+        topBarOptions = new TopBarOptions();
+        return this;
+    }
+
+    public Options clearBottomTabsOptions() {
+        bottomTabsOptions = new BottomTabsOptions();
+        return this;
+    }
 }

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

@@ -58,6 +58,9 @@ public class BottomTabsController extends ParentController implements AHBottomNa
         super.applyOptions(options, childComponent);
         int tabIndex = findTabContainingComponent(childComponent);
         if (tabIndex >= 0) new BottomTabOptionsPresenter(bottomTabs).present(options, tabIndex);
+        applyOnParentController(parentController ->
+                ((ParentController) parentController).applyOptions(this.options.copy().clearBottomTabsOptions(), childComponent)
+        );
     }
 
     @Override

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

@@ -59,7 +59,6 @@ public abstract class ParentController<T extends ViewGroup> extends ViewControll
     @CallSuper
     public void applyOptions(Options options, ReactComponent childComponent) {
         mergeChildOptions(options);
-        applyOnParentController(parentController -> ((ParentController) parentController).applyOptions(this.options, childComponent));
     }
 
     private void mergeChildOptions(Options options) {

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

@@ -8,6 +8,7 @@ import android.view.View;
 import android.view.ViewGroup;
 
 import com.reactnativenavigation.parse.Options;
+import com.reactnativenavigation.views.ReactComponent;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -41,7 +42,15 @@ public class SideMenuController extends ParentController {
 		return children;
 	}
 
-	public void setCenterController(ViewController centerController) {
+    @Override
+    public void applyOptions(Options options, ReactComponent childComponent) {
+        super.applyOptions(options, childComponent);
+        applyOnParentController(parentController ->
+                ((ParentController) parentController).applyOptions(this.options, childComponent)
+        );
+    }
+
+    public void setCenterController(ViewController centerController) {
 		this.centerController = centerController;
 		View childView = centerController.getView();
 		getView().addView(childView);

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

@@ -38,6 +38,9 @@ public class StackController extends ParentController <StackLayout> {
     public void applyOptions(Options options, ReactComponent component) {
         super.applyOptions(options, component);
         stackLayout.applyOptions(this.options, component);
+        applyOnParentController(parentController ->
+                ((ParentController) parentController).applyOptions(this.options, component)
+        );
     }
 
     @Override

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

@@ -70,6 +70,9 @@ public class TopTabsController extends ParentController<TopTabsViewPager> implem
     @Override
     public void applyOptions(Options options, ReactComponent childComponent) {
         super.applyOptions(options, childComponent);
+        applyOnParentController(parentController ->
+                ((ParentController) parentController).applyOptions(this.options, childComponent)
+        );
     }
 
     @Override

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

@@ -166,4 +166,26 @@ public class OptionsTest extends BaseTest {
         assertThat(uut.topBarOptions.visible.isFalseOrUndefined()).isTrue();
         assertThat(uut.topBarOptions.animateHide.isTrueOrUndefined()).isTrue();
     }
+
+    @Test
+    public void clear_topBarOptions() throws Exception {
+        Options uut = new Options();
+        uut.topBarOptions.title = new Text("some title");
+        uut.clearTopBarOptions();
+        assertThat(uut.topBarOptions.title.hasValue()).isFalse();
+    }
+
+    @Test
+    public void clear_bottomTabsOptions() throws Exception {
+        Options uut = new Options();
+        uut.bottomTabsOptions.color = new Color(android.graphics.Color.RED);
+        uut.clearBottomTabsOptions();
+        assertThat(uut.bottomTabsOptions.color.hasValue()).isFalse();
+    }
+
+//    topBarOptions.mergeWithDefault(other.topBarOptions);
+//        topTabOptions.mergeWithDefault(other.topTabOptions);
+//        topTabsOptions.mergeWithDefault(other.topTabsOptions);
+//        bottomTabOptions.mergeWithDefault(other.bottomTabOptions);
+//        bottomTabsOptions.mergeWithDefault(other.bottomTabsOptions);
 }

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

@@ -8,12 +8,15 @@ import com.reactnativenavigation.BaseTest;
 import com.reactnativenavigation.mocks.ImageLoaderMock;
 import com.reactnativenavigation.mocks.MockPromise;
 import com.reactnativenavigation.mocks.SimpleViewController;
+import com.reactnativenavigation.parse.Color;
 import com.reactnativenavigation.parse.Options;
 import com.reactnativenavigation.utils.ImageLoader;
 import com.reactnativenavigation.utils.OptionHelper;
 import com.reactnativenavigation.views.BottomTabs;
+import com.reactnativenavigation.views.ReactComponent;
 
 import org.junit.Test;
+import org.mockito.ArgumentCaptor;
 
 import java.util.Arrays;
 import java.util.Collections;
@@ -118,6 +121,25 @@ public class BottomTabsControllerTest extends BaseTest {
         verify(spy, times(1)).handleBack();
     }
 
+    @Test
+    public void applyOptions_bottomTabsOptionsAreClearedAfterApply() throws Exception {
+        List<ViewController> tabs = createTabs();
+        child1.options.bottomTabsOptions.color = new Color(android.graphics.Color.RED);
+        uut.setTabs(tabs);
+        uut.ensureViewIsCreated();
+
+        StackController stack = spy(new StackController(activity, "stack", new Options()));
+        stack.ensureViewIsCreated();
+        stack.push(uut, new MockPromise());
+
+        child1.onViewAppeared();
+        ArgumentCaptor<Options> optionsCaptor = ArgumentCaptor.forClass(Options.class);
+        ArgumentCaptor<ReactComponent> viewCaptor = ArgumentCaptor.forClass(ReactComponent.class);
+        verify(stack, times(1)).applyOptions(optionsCaptor.capture(), viewCaptor.capture());
+        assertThat(viewCaptor.getValue()).isEqualTo(child1.getView());
+        assertThat(optionsCaptor.getValue().bottomTabsOptions.color.hasValue()).isFalse();
+    }
+
     @NonNull
     private List<ViewController> createTabs() {
         return Arrays.asList(child1, child2, child3, child4, child5);

playground/src/screens/OptionsScreen.js

@@ -1,7 +1,7 @@
 const React = require('react');
 const { Component } = require('react');
 
-const { View, Text, Button } = require('react-native');
+const { View, Text, Button, Platform } = require('react-native');
 
 const { Navigation } = require('react-native-navigation');
 const testIDs = require('../testIDs');
@@ -16,7 +16,10 @@ class OptionsScreen extends Component {
       topBar: {
         title: 'Static Title',
         textColor: 'black',
-        drawBehind: false,
+        ...Platform.select({
+          android: { drawBehind: true },
+          ios: { drawBehind: false, }
+        }),
         largeTitle: false,
         visible: true,
         textFontSize: 16,