Default screen animation (#2120)

* Support showing modals with the default screen push/pop animation

* Set navigation bar color before modal is displayed

* Implement screenAnimationType property

controls animation type of all screens including modals.

android/app/src/main/java/com/reactnativenavigation/controllers/Modal.java

@@ -24,6 +24,7 @@ import com.reactnativenavigation.params.TitleBarButtonParams;
 import com.reactnativenavigation.params.TitleBarLeftButtonParams;
 import com.reactnativenavigation.params.parsers.ModalAnimationFactory;
 import com.reactnativenavigation.screens.NavigationType;
+import com.reactnativenavigation.utils.NavigationBar;
 import com.reactnativenavigation.utils.StatusBar;
 
 import java.util.List;
@@ -115,6 +116,7 @@ class Modal extends Dialog implements DialogInterface.OnDismissListener, ScreenS
         createContent();
         setAnimation(screenParams);
         setStatusBarStyle(screenParams.styleParams);
+        setNavigationBarStyle(screenParams.styleParams);
     }
 
     private void setStatusBarStyle(StyleParams styleParams) {
@@ -124,6 +126,10 @@ class Modal extends Dialog implements DialogInterface.OnDismissListener, ScreenS
         StatusBar.setTextColorScheme(window.getDecorView(), styleParams.statusBarTextColorScheme);
     }
 
+    private void setNavigationBarStyle(StyleParams styleParams) {
+        NavigationBar.setColor(getWindow(), styleParams.navigationBarColor);
+    }
+
     public AppCompatActivity getActivity() {
         return activity;
     }

android/app/src/main/java/com/reactnativenavigation/params/StyleParams.java

@@ -80,6 +80,7 @@ public class StyleParams {
     }
 
     public Orientation orientation;
+    public String screenAnimationType;
     public StatusBarTextColorScheme statusBarTextColorScheme;
     public Color statusBarColor;
     public boolean statusBarHidden;

android/app/src/main/java/com/reactnativenavigation/params/parsers/ModalAnimationFactory.java

@@ -11,6 +11,8 @@ public class ModalAnimationFactory {
                 return R.style.ModalFadeAnimation;
             case "slide-horizontal":
                 return R.style.ModalSlideHorizontal;
+            case "screen":
+                return R.style.ModalScreenAnimations;
             default:
                 return R.style.ModalDefaultAnimations;
         }

android/app/src/main/java/com/reactnativenavigation/params/parsers/ScreenParamsParser.java

@@ -3,6 +3,7 @@ package com.reactnativenavigation.params.parsers;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 
+import com.reactnativenavigation.params.AppStyle;
 import com.reactnativenavigation.params.NavigationParams;
 import com.reactnativenavigation.params.PageParams;
 import com.reactnativenavigation.params.ScreenParams;
@@ -55,7 +56,7 @@ public class ScreenParamsParser extends Parser {
         result.animateScreenTransitions = new AnimationParser(params).parse();
         result.sharedElementsTransitions = getSharedElementsTransitions(params);
 
-        result.animationType = params.getString(ANIMATION_TYPE, "slide-up");
+        result.animationType = params.getString(ANIMATION_TYPE, AppStyle.appStyle.screenAnimationType);
 
         return result;
     }

android/app/src/main/java/com/reactnativenavigation/params/parsers/StyleParamsParser.java

@@ -28,6 +28,7 @@ public class StyleParamsParser {
 
         StyleParams result = new StyleParams(params);
         result.orientation = Orientation.fromString(params.getString("orientation", getDefaultOrientation()));
+        result.screenAnimationType = params.getString("screenAnimationType", getDefaultScreenAnimationType());
         result.statusBarColor = getColor("statusBarColor", getDefaultStatusBarColor());
         result.statusBarHidden = getBoolean("statusBarHidden", getDefaultStatusHidden());
         result.statusBarTextColorScheme = StatusBarTextColorScheme.fromString(params.getString("statusBarTextColorScheme"), getDefaultStatusBarTextColorScheme());
@@ -89,8 +90,7 @@ public class StyleParamsParser {
         result.bottomTabsHiddenOnScroll = getBoolean("bottomTabsHiddenOnScroll", getDefaultBottomTabsHiddenOnScroll());
         result.bottomTabsColor = getColor("bottomTabsColor", getDefaultBottomTabsColor());
         result.bottomTabsButtonColor = getColor("bottomTabsButtonColor", getDefaultBottomTabsButtonColor());
-        result.selectedBottomTabsButtonColor =
-                getColor("bottomTabsSelectedButtonColor", getDefaultSelectedBottomTabsButtonColor());
+        result.selectedBottomTabsButtonColor = getColor("bottomTabsSelectedButtonColor", getDefaultSelectedBottomTabsButtonColor());
         result.bottomTabBadgeTextColor = getColor("bottomTabBadgeTextColor", getBottomTabBadgeTextColor());
         result.bottomTabBadgeBackgroundColor = getColor("bottomTabBadgeBackgroundColor", getBottomTabBadgeBackgroundColor());
 
@@ -102,6 +102,10 @@ public class StyleParamsParser {
         return result;
     }
 
+    private String getDefaultScreenAnimationType() {
+        return AppStyle.appStyle == null ? "slide-up" : AppStyle.appStyle.screenAnimationType;
+    }
+
     private StatusBarTextColorScheme getDefaultStatusBarTextColorScheme() {
         return AppStyle.appStyle == null ? StatusBarTextColorScheme.Undefined : AppStyle.appStyle.statusBarTextColorScheme;
     }
@@ -121,6 +125,7 @@ public class StyleParamsParser {
         result.titleBarSubtitleFontFamily = new StyleParams.Font();
         result.titleBarButtonFontFamily = new StyleParams.Font();
         result.titleBarHeight = -1;
+        result.screenAnimationType = "slide-up";
         return result;
     }
 

android/app/src/main/java/com/reactnativenavigation/screens/Screen.java

@@ -1,13 +1,9 @@
 package com.reactnativenavigation.screens;
 
 import android.animation.LayoutTransition;
-import android.annotation.TargetApi;
 import android.content.res.Configuration;
-import android.graphics.Color;
-import android.os.Build;
 import android.os.Bundle;
 import android.support.v7.app.AppCompatActivity;
-import android.view.Window;
 import android.widget.RelativeLayout;
 
 import com.facebook.react.bridge.Callback;
@@ -28,6 +24,7 @@ import com.reactnativenavigation.params.StyleParams;
 import com.reactnativenavigation.params.TitleBarButtonParams;
 import com.reactnativenavigation.params.TitleBarLeftButtonParams;
 import com.reactnativenavigation.params.parsers.StyleParamsParser;
+import com.reactnativenavigation.utils.NavigationBar;
 import com.reactnativenavigation.utils.StatusBar;
 import com.reactnativenavigation.views.ContentView;
 import com.reactnativenavigation.views.LeftButtonOnClickListener;
@@ -181,16 +178,8 @@ public abstract class Screen extends RelativeLayout implements Subscriber {
         StatusBar.setTextColorScheme(this, textColorScheme);
     }
 
-    @TargetApi(Build.VERSION_CODES.LOLLIPOP)
     public void setNavigationBarColor(StyleParams.Color navigationBarColor) {
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) return;
-
-        final Window window = ((NavigationActivity) activity).getScreenWindow();
-        if (navigationBarColor.hasColor()) {
-            window.setNavigationBarColor(navigationBarColor.getColor());
-        } else {
-            window.setNavigationBarColor(Color.BLACK);
-        }
+        NavigationBar.setColor(((NavigationActivity) activity).getScreenWindow(), navigationBarColor);
     }
 
     public abstract void unmountReactView();

android/app/src/main/java/com/reactnativenavigation/screens/ScreenAnimator.java

@@ -8,7 +8,6 @@ import android.view.View;
 import android.view.animation.AccelerateDecelerateInterpolator;
 import android.view.animation.AccelerateInterpolator;
 import android.view.animation.DecelerateInterpolator;
-import android.view.animation.LinearInterpolator;
 
 import com.reactnativenavigation.NavigationApplication;
 import com.reactnativenavigation.utils.ViewUtils;
@@ -23,7 +22,6 @@ class ScreenAnimator {
     private static final int DURATION = 250;
     private static final int ALPHA_START_DELAY = 100;
     private static final int ALPHA_SHORT_DURATION = 150;
-    private static final LinearInterpolator LINEAR_INTERPOLATOR = new LinearInterpolator();
     private static final DecelerateInterpolator DECELERATE_INTERPOLATOR = new DecelerateInterpolator();
     private static final AccelerateDecelerateInterpolator ACCELERATE_DECELERATE_INTERPOLATOR = new AccelerateDecelerateInterpolator();
     private static final AccelerateInterpolator ACCELERATE_INTERPOLATOR = new AccelerateInterpolator();

android/app/src/main/java/com/reactnativenavigation/utils/NavigationBar.java

@@ -0,0 +1,22 @@
+package com.reactnativenavigation.utils;
+
+import android.annotation.TargetApi;
+import android.graphics.Color;
+import android.os.Build;
+import android.view.Window;
+
+import com.reactnativenavigation.params.StyleParams;
+
+
+public class NavigationBar {
+    @TargetApi(Build.VERSION_CODES.LOLLIPOP)
+    public static void setColor(Window window, StyleParams.Color navigationBarColor) {
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP || window == null) return;
+//        final Window window = ((NavigationActivity) activity).getScreenWindow();
+        if (navigationBarColor.hasColor()) {
+            window.setNavigationBarColor(navigationBarColor.getColor());
+        } else {
+            window.setNavigationBarColor(Color.BLACK);
+        }
+    }
+}

android/app/src/main/res/anim/pop.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+     android:interpolator="@android:anim/accelerate_interpolator"
+     android:shareInterpolator="true">
+    <translate
+        android:duration="250"
+        android:fromYDelta="0%"
+        android:toYDelta="8%"/>
+    <alpha
+        android:startOffset="100"
+        android:duration="150"
+        android:fromAlpha="1"
+        android:toAlpha="0"/>
+</set>

android/app/src/main/res/values/styles.xml

@@ -26,4 +26,8 @@
     <style name="ModalSlideHorizontal">
         <item name="android:windowExitAnimation">@anim/slide_out_right</item>
     </style>
+
+    <style name="ModalScreenAnimations">
+        <item name="android:windowExitAnimation">@anim/pop</item>
+    </style>
 </resources>

src/deprecated/platformSpecificDeprecated.android.js

@@ -138,6 +138,7 @@ function convertStyleParams(originalStyleObject) {
 
   let ret = {
     orientation: originalStyleObject.orientation,
+    screenAnimationType: originalStyleObject.screenAnimationType,
     statusBarColor: processColor(originalStyleObject.statusBarColor),
     statusBarHidden: originalStyleObject.statusBarHidden,
     statusBarTextColorScheme: originalStyleObject.statusBarTextColorScheme,