Refactor NavigationAnimator

lib/android/app/src/main/java/com/reactnativenavigation/anim/BaseAnimator.java

@@ -5,7 +5,6 @@ import android.animation.AnimatorSet;
 import android.animation.ObjectAnimator;
 import android.content.Context;
 import android.support.annotation.NonNull;
-import android.support.annotation.RestrictTo;
 import android.view.View;
 import android.view.animation.AccelerateInterpolator;
 import android.view.animation.DecelerateInterpolator;
@@ -15,12 +14,12 @@ import com.reactnativenavigation.utils.UiUtils;
 
 class BaseAnimator {
 
-    protected AnimationsOptions options = new AnimationsOptions();
-
     private static final int DURATION = 300;
     private static final DecelerateInterpolator DECELERATE_INTERPOLATOR = new DecelerateInterpolator();
     private static final AccelerateInterpolator ACCELERATE_INTERPOLATOR = new AccelerateInterpolator();
 
+    protected AnimationsOptions options = new AnimationsOptions();
+
     private float translationY;
 
     BaseAnimator(Context context) {

lib/android/app/src/main/java/com/reactnativenavigation/anim/NavigationAnimator.java

@@ -4,7 +4,6 @@ import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
 import android.animation.AnimatorSet;
 import android.content.Context;
-import android.support.annotation.Nullable;
 import android.view.View;
 
 import com.reactnativenavigation.parse.AnimationsOptions;
@@ -21,14 +20,9 @@ public class NavigationAnimator extends BaseAnimator {
         this.options = options;
     }
 
-    public void animatePush(final View view, @Nullable final AnimationListener animationListener) {
+    public void push(final View view, AnimationListener animationListener) {
         view.setVisibility(View.INVISIBLE);
-        AnimatorSet set;
-        if (options.push.content.hasValue()) {
-            set = options.push.content.getAnimation(view);
-        } else {
-            set = getDefaultPushAnimation(view);
-        }
+        AnimatorSet set = options.push.content.getAnimation(view, getDefaultPushAnimation(view));
         set.addListener(new AnimatorListenerAdapter() {
             @Override
             public void onAnimationStart(Animator animation) {
@@ -37,35 +31,26 @@ public class NavigationAnimator extends BaseAnimator {
 
             @Override
             public void onAnimationEnd(Animator animation) {
-                if (animationListener != null) {
-                    animationListener.onAnimationEnd();
-                }
+                animationListener.onAnimationEnd();
             }
         });
         set.start();
     }
 
-    public void animatePop(View view, @Nullable final AnimationListener animationListener) {
-        AnimatorSet set;
-        if (options.pop.content.hasValue()) {
-            set = options.pop.content.getAnimation(view);
-        } else {
-            set = getDefaultPopAnimation(view);
-        }
+    public void pop(View view, AnimationListener animationListener) {
+        AnimatorSet set = options.pop.content.getAnimation(view, getDefaultPopAnimation(view));
         set.addListener(new AnimatorListenerAdapter() {
             @Override
             public void onAnimationEnd(Animator animation) {
-                if (animationListener != null) {
-                    animationListener.onAnimationEnd();
-                }
+                animationListener.onAnimationEnd();
             }
         });
         set.start();
     }
 
-    public void animateStartApp(View view, @Nullable final AnimationListener animationListener) {
+    public void animateStartApp(View view, AnimationListener animationListener) {
         view.setVisibility(View.INVISIBLE);
-        AnimatorSet set = options.startApp.getAnimation(view);
+        AnimatorSet set = options.startApp.getAnimation(view, null);
         set.addListener(new AnimatorListenerAdapter() {
             @Override
             public void onAnimationStart(Animator animation) {

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

@@ -3,7 +3,6 @@ package com.reactnativenavigation.parse;
 
 import android.animation.Animator;
 import android.animation.AnimatorSet;
-import android.util.Log;
 import android.util.Property;
 import android.view.View;
 
@@ -62,7 +61,8 @@ public class AnimationOptions {
         return hasValue;
     }
 
-    public AnimatorSet getAnimation(View view) {
+    public AnimatorSet getAnimation(View view, AnimatorSet defaultAnimation) {
+        if (!hasValue()) return defaultAnimation;
         AnimatorSet animationSet = new AnimatorSet();
         List<Animator> animators = new ArrayList<>();
         for (ValueAnimationOptions options : valueOptions) {

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

@@ -97,7 +97,7 @@ public class StackController extends ParentController<StackLayout> {
 
         if (toRemove != null) {
             if (child.options.animated.isTrueOrUndefined()) {
-                animator.animatePush(child.getView(), () -> {
+                animator.push(child.getView(), () -> {
                     getView().removeView(toRemove.getView());
                     listener.onSuccess(child.getId());
                 });
@@ -143,7 +143,7 @@ public class StackController extends ParentController<StackLayout> {
         );
 
         if (disappearing.options.animated.isTrueOrUndefined()) {
-            animator.animatePop(
+            animator.pop(
                     disappearing.getView(),
                     () -> finishPopping(disappearing, listener)
             );

lib/android/app/src/test/java/com/reactnativenavigation/mocks/TestNavigationAnimator.java

@@ -13,12 +13,12 @@ public class TestNavigationAnimator extends NavigationAnimator {
     }
 
     @Override
-    public void animatePush(final View enteringView, AnimationListener animationListener) {
+    public void push(final View enteringView, AnimationListener animationListener) {
         if (animationListener != null) animationListener.onAnimationEnd();
     }
 
     @Override
-    public void animatePop(final View enteringView, AnimationListener animationListener) {
+    public void pop(final View enteringView, AnimationListener animationListener) {
         if (animationListener != null) animationListener.onAnimationEnd();
     }
 }

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

@@ -328,9 +328,9 @@ public class StackControllerTest extends BaseTest {
                 uut.popTo(child2, new CommandListenerAdapter() {
                     @Override
                     public void onSuccess(String childId) {
-                        verify(animator, times(0)).animatePop(eq(child1.getView()), any());
-                        verify(animator, times(0)).animatePop(eq(child2.getView()), any());
-                        verify(animator, times(1)).animatePop(eq(child4.getView()), any());
+                        verify(animator, times(0)).pop(eq(child1.getView()), any());
+                        verify(animator, times(0)).pop(eq(child2.getView()), any());
+                        verify(animator, times(1)).pop(eq(child4.getView()), any());
                     }
                 });
             }
@@ -376,7 +376,7 @@ public class StackControllerTest extends BaseTest {
                 uut.popToRoot(new CommandListenerAdapter() {
                     @Override
                     public void onSuccess(String childId) {
-                        verify(animator, times(1)).animatePop(eq(child3.getView()), any());
+                        verify(animator, times(1)).pop(eq(child3.getView()), any());
                     }
                 });
             }