Apply TopBar visibility options when adding initial child to stack

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

@@ -47,14 +47,15 @@ public class StackOptionsPresenter {
     }
 
     public void applyLayoutParamsOptions(Options options, View view) {
-        Options withDefaultOptions = options.copy().withDefaultOptions(defaultOptions);
+        Options withDefault = options.copy().withDefaultOptions(defaultOptions);
         if (view instanceof Component) {
-            if (withDefaultOptions.topBar.drawBehind.isTrue() && !withDefaultOptions.layout.topMargin.hasValue()) {
+            if (withDefault.topBar.drawBehind.isTrue() && !withDefault.layout.topMargin.hasValue()) {
                 ((Component) view).drawBehindTopBar();
             } else if (options.topBar.drawBehind.isFalseOrUndefined()) {
                 ((Component) view).drawBelowTopBar(topBar);
             }
         }
+        applyTopBarVisibility(withDefault.topBar, withDefault.animations, options);
     }
 
     public void applyChildOptions(Options options, Component child) {
@@ -95,7 +96,22 @@ public class StackOptionsPresenter {
         topBar.setBackgroundColor(options.background.color.get(Color.WHITE));
         topBar.setBackgroundComponent(options.background.component);
         if (options.testId.hasValue()) topBar.setTestId(options.testId.get());
+        applyTopBarVisibility(options, animationOptions, componentOptions);
+        if (options.drawBehind.isTrue() && !componentOptions.layout.topMargin.hasValue()) {
+            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 applyTopBarVisibility(TopBarOptions options, AnimationsOptions animationOptions, Options componentOptions) {
         if (options.visible.isFalse()) {
             if (options.animate.isTrueOrUndefined() && componentOptions.animations.push.enable.isTrueOrUndefined()) {
                 topBar.hideAnimate(animationOptions.pop.topBar);
@@ -110,18 +126,6 @@ public class StackOptionsPresenter {
                 topBar.show();
             }
         }
-        if (options.drawBehind.isTrue() && !componentOptions.layout.topMargin.hasValue()) {
-            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(TopBarButtons buttons) {

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

@@ -2,6 +2,7 @@ package com.reactnativenavigation.viewcontrollers;
 
 import android.app.Activity;
 import android.graphics.Typeface;
+import android.view.View;
 
 import com.reactnativenavigation.BaseTest;
 import com.reactnativenavigation.mocks.TestComponentLayout;
@@ -16,10 +17,12 @@ import com.reactnativenavigation.parse.params.Fraction;
 import com.reactnativenavigation.parse.params.Number;
 import com.reactnativenavigation.parse.params.Text;
 import com.reactnativenavigation.presentation.StackOptionsPresenter;
+import com.reactnativenavigation.views.Component;
 import com.reactnativenavigation.views.topbar.TopBar;
 
 import org.json.JSONObject;
 import org.junit.Test;
+import org.mockito.Mockito;
 
 import java.util.ArrayList;
 
@@ -142,6 +145,17 @@ public class StackOptionsPresenterTest extends BaseTest {
         verify(topBar, times(1)).setTopTabFontFamily(1, Typeface.DEFAULT_BOLD);
     }
 
+    @Test
+    public void applyLayoutParamsOptions() {
+        Options options = new Options();
+        options.topBar.visible = new Bool(false);
+        options.topBar.animate = new Bool(false);
+        View view = Mockito.mock(View.class, Mockito.withSettings().extraInterfaces(Component.class));
+
+        uut.applyLayoutParamsOptions(options, view);
+        verify(topBar).hide();
+    }
+
     private void assertTopBarOptions(Options options, int t) {
         if (options.topBar.title.component.hasValue()) {
             verify(topBar, times(0)).setTitle(any());

playground/src/screens/WelcomeScreen.js

@@ -24,7 +24,7 @@ class WelcomeScreen extends Component {
         },
         drawBehind: true,
         visible: false,
-        animate: true
+        animate: false
       }
     };
   }