Tweaked screen and fab animation values

No major changes, just tweaked values a little bit.

* Fab animation duration changed to 120 (previously 200)
* Fab show animation: Scales from 0.6 to 1 (previously 0)
* Fab hide animation: Scales from 1 to 0.6 (previously 0)
* Removed alpha delay from screen animation
* TranslationY value changed from 8% to 5%

android/app/src/main/java/com/reactnativenavigation/layouts/BottomTabsLayout.java

@@ -369,9 +369,8 @@ public class BottomTabsLayout extends BaseLayout implements AHBottomNavigation.O
             @Override
             public void run(ScreenStack screenStack) {
                 screenStack.push(params, createScreenLayoutParams(params));
-                setStyleFromScreen(params.styleParams);
                 if (isCurrentStack(screenStack)) {
-                    alignSnackbarContainerWithBottomTabs((LayoutParams) snackbarAndFabContainer.getLayoutParams(), params.styleParams);
+                    setStyleFromScreen(params.styleParams);
                     EventBus.instance.post(new ScreenChangedEvent(params));
                 }
             }
@@ -387,7 +386,6 @@ public class BottomTabsLayout extends BaseLayout implements AHBottomNavigation.O
                     @Override
                     public void onScreenPopAnimationEnd() {
                         setBottomTabsStyleFromCurrentScreen();
-                        alignSnackbarContainerWithBottomTabs((LayoutParams) snackbarAndFabContainer.getLayoutParams(), params.styleParams);
                         EventBus.instance.post(new ScreenChangedEvent(getCurrentScreenStack().peek().getScreenParams()));
                     }
                 });

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

@@ -20,9 +20,9 @@ import javax.annotation.Nullable;
 
 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 int ALPHA_HIDE_DURATION = 100;
     private static final DecelerateInterpolator DECELERATE_INTERPOLATOR = new DecelerateInterpolator();
+    private static final DecelerateInterpolator DECELERATE_INTERPOLATOR_1x5 = new DecelerateInterpolator(1.5f);
     private static final AccelerateDecelerateInterpolator ACCELERATE_DECELERATE_INTERPOLATOR = new AccelerateDecelerateInterpolator();
     private static final AccelerateInterpolator ACCELERATE_INTERPOLATOR = new AccelerateInterpolator();
     private final float translationY;
@@ -31,7 +31,7 @@ class ScreenAnimator {
 
     ScreenAnimator(Screen screen) {
         this.screen = screen;
-        translationY = 0.08f * ViewUtils.getWindowHeight(screen.activity);
+        translationY = 0.05f * ViewUtils.getWindowHeight(screen.activity);
         translationX = ViewUtils.getWindowWidth(screen.activity);
     }
 
@@ -63,12 +63,12 @@ class ScreenAnimator {
 
     private Animator createShowAnimator(final @Nullable Runnable onAnimationEnd) {
         ObjectAnimator alpha = ObjectAnimator.ofFloat(screen, View.ALPHA, 0, 1);
-        alpha.setInterpolator(DECELERATE_INTERPOLATOR);
 
         AnimatorSet set = new AnimatorSet();
         switch (String.valueOf(this.screen.screenParams.animationType)) {
             case "fade": {
                 alpha.setDuration(DURATION);
+                alpha.setInterpolator(DECELERATE_INTERPOLATOR);
                 set.play(alpha);
                 break;
             }
@@ -81,9 +81,8 @@ class ScreenAnimator {
             }
             default: {
                 ObjectAnimator translationY = ObjectAnimator.ofFloat(screen, View.TRANSLATION_Y, this.translationY, 0);
-                translationY.setInterpolator(DECELERATE_INTERPOLATOR);
-                translationY.setDuration(DURATION);
-                alpha.setDuration(ALPHA_SHORT_DURATION);
+                set.setInterpolator(DECELERATE_INTERPOLATOR_1x5);
+                set.setDuration(DURATION);
                 set.playTogether(translationY, alpha);
                 break;
             }
@@ -107,12 +106,12 @@ class ScreenAnimator {
 
     private Animator createHideAnimator(final Runnable onAnimationEnd) {
         ObjectAnimator alpha = ObjectAnimator.ofFloat(screen, View.ALPHA, 0);
-        alpha.setInterpolator(DECELERATE_INTERPOLATOR);
 
         AnimatorSet set = new AnimatorSet();
         switch (String.valueOf(this.screen.screenParams.animationType)) {
             case "fade": {
                 alpha.setDuration(DURATION);
+                alpha.setInterpolator(DECELERATE_INTERPOLATOR);
                 set.play(alpha);
                 break;
             }
@@ -125,10 +124,9 @@ class ScreenAnimator {
             }
             default: {
                 ObjectAnimator translationY = ObjectAnimator.ofFloat(screen, View.TRANSLATION_Y, this.translationY);
-                translationY.setInterpolator(ACCELERATE_INTERPOLATOR);
                 translationY.setDuration(DURATION);
-                alpha.setStartDelay(ALPHA_START_DELAY);
-                alpha.setDuration(ALPHA_SHORT_DURATION);
+                alpha.setDuration(ALPHA_HIDE_DURATION);
+                set.setInterpolator(DECELERATE_INTERPOLATOR);
                 set.playTogether(translationY, alpha);
                 break;
             }

android/app/src/main/java/com/reactnativenavigation/views/FloatingActionButtonAnimator.java

@@ -4,43 +4,36 @@ import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
 import android.support.design.widget.FloatingActionButton;
 import android.view.View;
+import android.view.animation.DecelerateInterpolator;
 
 import java.util.List;
 
 public class FloatingActionButtonAnimator {
+    private static final int SHOW_DURATION = 120;
+    private static final int HIDE_DURATION = 120;
+    private static final float SCALE = 0.6f;
+    private static final int ANGLE = 90;
+    private static final DecelerateInterpolator DECELERATE_INTERPOLATOR = new DecelerateInterpolator(1.5f);
 
     private final FloatingActionButton collapsedFab;
     private final FloatingActionButton expendedFab;
-    private int crossFadeAnimationDuration;
 
-    private enum State{Showing, Idle, Removing}
-    private State state = State.Idle;
-
-    public FloatingActionButtonAnimator(FloatingActionButton collapsedFab, FloatingActionButton expendedFab, int crossFadeAnimationDuration) {
+    FloatingActionButtonAnimator(FloatingActionButton collapsedFab, FloatingActionButton expendedFab) {
         this.collapsedFab = collapsedFab;
         this.expendedFab = expendedFab;
-        this.crossFadeAnimationDuration = crossFadeAnimationDuration;
-    }
-
-    boolean isAnimating() {
-        return state == State.Showing || state == State.Removing;
     }
 
     void show() {
-        state = State.Showing;
-        collapsedFab.setScaleX(0);
-        collapsedFab.setScaleY(0);
+        collapsedFab.setScaleX(SCALE);
+        collapsedFab.setScaleY(SCALE);
+        collapsedFab.setAlpha(0.0f);
+        collapsedFab.setAlpha(0.0f);
         collapsedFab.animate()
                 .alpha(1)
                 .scaleX(1)
                 .scaleY(1)
-                .setListener(new AnimatorListenerAdapter() {
-                    @Override
-                    public void onAnimationEnd(Animator animation) {
-                        state = State.Idle;
-                    }
-                })
-                .setDuration(crossFadeAnimationDuration)
+                .setInterpolator(DECELERATE_INTERPOLATOR)
+                .setDuration(SHOW_DURATION)
                 .start();
     }
 
@@ -50,26 +43,26 @@ public class FloatingActionButtonAnimator {
     }
 
     void hideCollapsed() {
-        animateFab(collapsedFab, 0, 90);
+        animateFab(collapsedFab, 0, ANGLE);
     }
 
     void showExpended() {
         animateFab(expendedFab, 1, 0);
     }
 
-    void showCollapsed() {
+    private void showCollapsed() {
         animateFab(collapsedFab, 1, 0);
         collapsedFab.bringToFront();
     }
 
-    void hideExpended() {
-        animateFab(expendedFab, 0, -90);
+    private void hideExpended() {
+        animateFab(expendedFab, 0, -ANGLE);
     }
 
     private void animateFab(final FloatingActionButton fab, final int alpha, int rotation) {
         fab.animate()
                 .alpha(alpha)
-                .setDuration(crossFadeAnimationDuration)
+                .setDuration(HIDE_DURATION)
                 .rotation(rotation)
                 .setListener(new AnimatorListenerAdapter() {
                     @Override
@@ -91,12 +84,11 @@ public class FloatingActionButtonAnimator {
         if (fab == null) {
             return;
         }
-        state = State.Removing;
         fab.animate()
                 .alpha(0)
-                .scaleX(0)
-                .scaleY(0)
-                .setDuration(crossFadeAnimationDuration)
+                .scaleX(SCALE)
+                .scaleY(SCALE)
+                .setDuration(HIDE_DURATION)
                 .setListener(new AnimatorListenerAdapter() {
                     @Override
                     public void onAnimationEnd(Animator animation) {
@@ -114,7 +106,7 @@ public class FloatingActionButtonAnimator {
                     .alpha(0)
                     .scaleX(0)
                     .scaleY(0)
-                    .setDuration(crossFadeAnimationDuration)
+                    .setDuration(HIDE_DURATION)
                     .start();
         }
     }

android/app/src/main/java/com/reactnativenavigation/views/FloatingActionButtonCoordinator.java

@@ -30,7 +30,6 @@ class FloatingActionButtonCoordinator {
     private FabParams params;
     private FloatingActionButton collapsedFab;
     private FloatingActionButton expendedFab;
-    private final int crossFadeAnimationDuration;
     private final int actionSize;
     private final int margin = (int) ViewUtils.convertDpToPixel(16);
     private FloatingActionButtonAnimator fabAnimator;
@@ -39,7 +38,6 @@ class FloatingActionButtonCoordinator {
     FloatingActionButtonCoordinator(CoordinatorLayout parent) {
         this.parent = parent;
         actions = new ArrayList<>();
-        crossFadeAnimationDuration = parent.getResources().getInteger(android.R.integer.config_shortAnimTime);
         actionSize = (int) ViewUtils.convertDpToPixel(40);
     }
 
@@ -62,7 +60,7 @@ class FloatingActionButtonCoordinator {
         createCollapsedFab();
         createExpendedFab();
         setStyle();
-        fabAnimator = new FloatingActionButtonAnimator(collapsedFab, expendedFab, crossFadeAnimationDuration);
+        fabAnimator = new FloatingActionButtonAnimator(collapsedFab, expendedFab);
         fabAnimator.show();
     }
 

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

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