Fix rebase issues

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

@@ -1,8 +1,6 @@
 package com.reactnativenavigation.parse;
 
 
-import android.util.Log;
-
 import org.json.JSONObject;
 
 public class AnimationsOptions {

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

@@ -30,4 +30,8 @@ public class NestedAnimationsOptions {
         bottomTabs.mergeWithDefault(defaultOptions.bottomTabs);
         topBar.mergeWithDefault(defaultOptions.topBar);
     }
+
+    public boolean hasValue() {
+        return topBar.hasValue() || content.hasValue() || bottomTabs.hasValue();
+    }
 }

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

@@ -27,7 +27,7 @@ public class OptionsPresenter {
     public void applyChildOptions(Options options, Component child) {
         applyOrientation(options.orientationOptions);
         applyButtons(options.topBarOptions.leftButtons, options.topBarOptions.rightButtons);
-        applyTopBarOptions(options.topBarOptions, child, options.animationsOptions);
+        applyTopBarOptions(options.topBarOptions, options.animationsOptions, child);
         applyTopTabsOptions(options.topTabsOptions);
         applyTopTabOptions(options.topTabOptions);
     }
@@ -36,7 +36,7 @@ public class OptionsPresenter {
         ((Activity) topBar.getContext()).setRequestedOrientation(options.getValue());
     }
 
-    private void applyTopBarOptions(TopBarOptions options, Component component, AnimationsOptions animationOptions) {
+    private void applyTopBarOptions(TopBarOptions options, AnimationsOptions animationOptions, 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);
@@ -107,7 +107,7 @@ public class OptionsPresenter {
     public void mergeChildOptions(Options options, Component child) {
         mergeOrientation(options.orientationOptions);
         mergeButtons(options.topBarOptions.leftButtons, options.topBarOptions.rightButtons);
-        mergeTopBarOptions(options.topBarOptions, child);
+        mergeTopBarOptions(options.topBarOptions, options.animationsOptions, child);
         mergeTopTabsOptions(options.topTabsOptions);
         mergeTopTabOptions(options.topTabOptions);
     }
@@ -121,7 +121,7 @@ public class OptionsPresenter {
         if (rightButtons != null) topBar.setRightButtons(rightButtons);
     }
 
-    private void mergeTopBarOptions(TopBarOptions options, Component component) {
+    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.setComponent(options.title.component.get(), options.title.alignment);
         if (options.background.color.hasValue()) topBar.setBackgroundColor(options.background.color);
@@ -131,10 +131,18 @@ public class OptionsPresenter {
 
         if (options.title.fontFamily != null) topBar.setTitleTypeface(options.title.fontFamily);
         if (options.visible.isFalse()) {
-            topBar.hide(options.animate);
+            if (options.animate.isTrueOrUndefined()) {
+                topBar.hideAnimate(animationsOptions.pop.topBar);
+            } else {
+                topBar.hide();
+            }
         }
         if (options.visible.isTrue()) {
-            topBar.show(options.animate);
+            if (options.animate.isTrueOrUndefined()) {
+                topBar.showAnimate(animationsOptions.push.topBar);
+            } else {
+                topBar.show();
+            }
         }
         if (options.drawBehind.isTrue()) {
             component.drawBehindTopBar();

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

@@ -89,6 +89,7 @@ public class OptionsMergingTest extends BaseTest {
         options.topBarOptions.title = titleOptions;
         options.topBarOptions.background.color = new Color(0);
         options.topBarOptions.testId = new Text("test123");
+        options.topBarOptions.animate = new Bool(false);
         options.topBarOptions.visible = new Bool(false);
         options.topBarOptions.drawBehind = new Bool(false);
         options.topBarOptions.hideOnScroll = new Bool(false);
@@ -142,7 +143,7 @@ public class OptionsMergingTest extends BaseTest {
         verify(topBar, times(t)).setTitleFontSize(any());
         verify(topBar, times(t)).setTestId(any());
         verify(topBar, times(t)).setTitleTypeface(any());
-        verify(topBar, times(t)).hide(any());
+        verify(topBar, times(t)).hide();
         verify(child, times(t)).drawBelowTopBar(topBar);
         verify(child, times(0)).drawBehindTopBar();
     }

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

@@ -10,7 +10,7 @@ import com.reactnativenavigation.mocks.MockPromise;
 import com.reactnativenavigation.mocks.SimpleViewController;
 import com.reactnativenavigation.mocks.TitleBarReactViewCreatorMock;
 import com.reactnativenavigation.mocks.TopBarButtonCreatorMock;
-import com.reactnativenavigation.parse.AnimationOptions;
+import com.reactnativenavigation.parse.NestedAnimationsOptions;
 import com.reactnativenavigation.parse.Options;
 import com.reactnativenavigation.parse.params.Bool;
 import com.reactnativenavigation.parse.params.Text;
@@ -517,7 +517,7 @@ public class StackControllerTest extends BaseTest {
         ParentController parentController = Mockito.mock(ParentController.class);
         uut.setParentController(parentController);
         Options options = new Options();
-        options.animationsOptions.push = AnimationOptions.parse(new JSONObject());
+        options.animationsOptions.push = NestedAnimationsOptions.parse(new JSONObject());
         options.topBarOptions.testId = new Text("id");
         options.fabOptions.id = new Text("fabId");
         Component component = mock(Component.class);

playground/src/screens/OrientationDetectScreen.js

@@ -41,7 +41,8 @@ const styles = {
   root: {
     flexGrow: 1,
     justifyContent: 'center',
-    alignItems: 'center'
+    alignItems: 'center',
+    backgroundColor: 'white'
   },
   h1: {
     fontSize: 24,