Apply resolved options each time a child controller appears

This commit fixes #4045, which revealed a design flaw in the options applying logic.
Child options are applied when a ViewController.onViewAppeared is invoked.
A ViewController's appearance is determined from a GlobalLayoutListener.

Consider the following layout hierarchy:
BottomTabs > Stack > Component

onViewAppeared will be triggered for the BottomTabs first, then for the Stack and last for the component.
This means that if the Stack and the Component options will be applied consecutively which in some cases
might case flickering, mostly when drawBehind options are applied.

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

@@ -96,7 +96,7 @@ public abstract class ParentController<T extends ViewGroup> extends ChildControl
 
     @CallSuper
     public void applyChildOptions(Options options, Component child) {
-        this.options = this.initialOptions.mergeWith(options);
+        this.options = initialOptions.mergeWith(options);
         if (isRoot()) {
             presenter.applyRootOptions(getView(), options);
         }

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

@@ -91,9 +91,14 @@ public class BottomTabsController extends ParentController implements AHBottomNa
     @Override
     public void applyChildOptions(Options options, Component child) {
         super.applyChildOptions(options, child);
-        presenter.applyChildOptions(this.options, child);
+        presenter.applyChildOptions(resolveCurrentOptions(), child);
         performOnParentController(parentController ->
-                ((ParentController) parentController).applyChildOptions(this.options.copy().clearBottomTabsOptions().clearBottomTabOptions(), child)
+                ((ParentController) parentController).applyChildOptions(
+                        this.options.copy()
+                                .clearBottomTabsOptions()
+                                .clearBottomTabOptions(),
+                        child
+                )
         );
     }
 

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

@@ -11,8 +11,6 @@ import com.reactnativenavigation.BaseTest;
 import com.reactnativenavigation.TestUtils;
 import com.reactnativenavigation.mocks.ImageLoaderMock;
 import com.reactnativenavigation.mocks.SimpleViewController;
-import com.reactnativenavigation.mocks.TitleBarReactViewCreatorMock;
-import com.reactnativenavigation.mocks.TopBarButtonCreatorMock;
 import com.reactnativenavigation.parse.Options;
 import com.reactnativenavigation.parse.params.Bool;
 import com.reactnativenavigation.parse.params.Colour;
@@ -21,7 +19,6 @@ import com.reactnativenavigation.parse.params.Text;
 import com.reactnativenavigation.presentation.BottomTabOptionsPresenter;
 import com.reactnativenavigation.presentation.BottomTabsOptionsPresenter;
 import com.reactnativenavigation.presentation.OptionsPresenter;
-import com.reactnativenavigation.presentation.StackOptionsPresenter;
 import com.reactnativenavigation.react.EventEmitter;
 import com.reactnativenavigation.utils.CommandListenerAdapter;
 import com.reactnativenavigation.utils.ImageLoader;
@@ -36,9 +33,12 @@ import org.junit.Test;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Mockito;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
+import edu.emory.mathcs.backport.java.util.Collections;
+
 import static com.reactnativenavigation.TestUtils.hideBackButton;
 import static org.assertj.core.api.Java6Assertions.assertThat;
 import static org.mockito.ArgumentMatchers.any;
@@ -211,6 +211,37 @@ public class BottomTabsControllerTest extends BaseTest {
         assertThat(childLayoutParams(0).bottomMargin).isEqualTo(0);
     }
 
+    @Test
+    public void applyChildOptions_resolvedOptionsAreUsed() {
+        Options childOptions = new Options();
+        SimpleViewController pushedScreen = new SimpleViewController(activity, childRegistry, "child4.1", childOptions);
+        disablePushAnimation(pushedScreen);
+        child4 = createStack(pushedScreen);
+
+        tabs = new ArrayList<>(Collections.singletonList(child4));
+
+        initialOptions.bottomTabsOptions.currentTabIndex = new Number(3);
+        Options resolvedOptions = new Options();
+        uut = new BottomTabsController(activity,
+                tabs,
+                childRegistry,
+                eventEmitter,
+                imageLoaderMock,
+                "uut",
+                initialOptions,
+                new OptionsPresenter(activity, new Options()),
+                presenter,
+                new BottomTabOptionsPresenter(activity, tabs, new Options())) {
+            @Override
+            public Options resolveCurrentOptions() {
+                return resolvedOptions;
+            }
+        };
+
+        activity.setContentView(uut.getView());
+        verify(presenter, times(2)).applyChildOptions(eq(resolvedOptions), any());
+    }
+
     @Test
     public void child_mergeOptions_currentTabIndex() {
         uut.ensureViewIsCreated();
@@ -285,7 +316,13 @@ public class BottomTabsControllerTest extends BaseTest {
         return TestUtils.newStackController(activity)
                 .setId(id)
                 .setInitialOptions(tabOptions)
-                .setStackPresenter(new StackOptionsPresenter(activity, new TitleBarReactViewCreatorMock(), new TopBarButtonCreatorMock(), new ImageLoader(), new Options()))
+                .build();
+    }
+
+    private StackController createStack(ViewController initialChild) {
+        return TestUtils.newStackController(activity)
+                .setInitialOptions(tabOptions)
+                .setChildren(new ArrayList<>(Collections.singleton(initialChild)))
                 .build();
     }
 
@@ -293,7 +330,7 @@ public class BottomTabsControllerTest extends BaseTest {
         return (ViewGroup.MarginLayoutParams) tabs.get(index).getView().getLayoutParams();
     }
 
-    public BottomTabsController createBottomTabs() {
+    private BottomTabsController createBottomTabs() {
         return new BottomTabsController(activity,
                 tabs,
                 childRegistry,

playground/src/screens/ComplexLayout.js

@@ -64,7 +64,12 @@ class ComplexLayout extends Component {
                 children: [
                   {
                     component: {
-                      name: 'navigation.playground.TextScreen'
+                      name: 'navigation.playground.TextScreen',
+                      options: {
+                        topBar: {
+                          animate: false
+                        }
+                      }
                     }
                   }
                 ],
@@ -81,6 +86,11 @@ class ComplexLayout extends Component {
                 left: {
                   component: {
                     name: 'navigation.playground.SideMenuScreen',
+                    options: {
+                      topBar: {
+                        animate: false
+                      }
+                    },
                     passProps: {
                       side: 'left'
                     }

playground/src/screens/WelcomeScreen.js

@@ -79,6 +79,7 @@ class WelcomeScreen extends Component {
                       options: {
                         topBar: {
                           visible: true,
+                          animate: false,
                           title: {
                             text: 'React Native Navigation!'
                           }
@@ -130,7 +131,8 @@ class WelcomeScreen extends Component {
                 },
                 options: {
                   topBar: {
-                    visible: true
+                    visible: true,
+                    animate: false
                   },
                   bottomTab: {
                     text: 'Tab 3',