Refactor NavigationAnimator

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

@@ -1,6 +0,0 @@
-package com.reactnativenavigation.anim;
-
-
-public interface AnimationListener {
-    void onAnimationEnd();
-}

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

@@ -1,6 +1,7 @@
 package com.reactnativenavigation.anim;
 
 import android.animation.Animator;
+import android.animation.Animator.AnimatorListener;
 import android.animation.AnimatorListenerAdapter;
 import android.animation.AnimatorSet;
 import android.content.Context;
@@ -20,7 +21,7 @@ public class NavigationAnimator extends BaseAnimator {
         this.options = options;
     }
 
-    public void push(final View view, AnimationListener animationListener) {
+    public void push(final View view, Runnable onAnimationEnd) {
         view.setVisibility(View.INVISIBLE);
         AnimatorSet set = options.push.content.getAnimation(view, getDefaultPushAnimation(view));
         set.addListener(new AnimatorListenerAdapter() {
@@ -31,26 +32,26 @@ public class NavigationAnimator extends BaseAnimator {
 
             @Override
             public void onAnimationEnd(Animator animation) {
-                animationListener.onAnimationEnd();
+                onAnimationEnd.run();
             }
         });
         set.start();
     }
 
-    public void pop(View view, AnimationListener animationListener) {
+    public void pop(View view, Runnable onAnimationEnd) {
         AnimatorSet set = options.pop.content.getAnimation(view, getDefaultPopAnimation(view));
         set.addListener(new AnimatorListenerAdapter() {
             @Override
             public void onAnimationEnd(Animator animation) {
-                animationListener.onAnimationEnd();
+                onAnimationEnd.run();
             }
         });
         set.start();
     }
 
-    public void animateStartApp(View view, AnimationListener animationListener) {
+    public void animateStartApp(View view, AnimatorListener listener) {
         view.setVisibility(View.INVISIBLE);
-        AnimatorSet set = options.startApp.getAnimation(view, null);
+        AnimatorSet set = options.startApp.getAnimation(view);
         set.addListener(new AnimatorListenerAdapter() {
             @Override
             public void onAnimationStart(Animator animation) {
@@ -59,7 +60,7 @@ public class NavigationAnimator extends BaseAnimator {
 
             @Override
             public void onAnimationEnd(Animator animation) {
-                if (animationListener != null) animationListener.onAnimationEnd();
+                listener.onAnimationEnd(animation);
             }
         });
         set.start();

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

@@ -9,6 +9,7 @@ import android.animation.TimeInterpolator;
 import android.view.View;
 import android.view.animation.AccelerateInterpolator;
 import android.view.animation.DecelerateInterpolator;
+import android.view.animation.LinearInterpolator;
 
 import com.reactnativenavigation.parse.AnimationOptions;
 import com.reactnativenavigation.views.topbar.TopBar;
@@ -21,6 +22,7 @@ public class TopBarAnimator {
     private static final int DURATION_TOPBAR = 300;
     private final DecelerateInterpolator decelerateInterpolator = new DecelerateInterpolator();
     private final AccelerateInterpolator accelerateInterpolator = new AccelerateInterpolator();
+    private final LinearInterpolator linearInterpolator = new LinearInterpolator();
 
     private TopBar topBar;
     private String stackId;
@@ -46,7 +48,7 @@ public class TopBarAnimator {
     }
 
     public void show(float startTranslation) {
-        showAnimator = getDefaultShowAnimator(startTranslation, null, DEFAULT_COLLAPSE_DURATION);
+        showAnimator = getDefaultShowAnimator(startTranslation, linearInterpolator, DEFAULT_COLLAPSE_DURATION);
         show();
     }
 
@@ -69,26 +71,26 @@ public class TopBarAnimator {
         return set;
     }
 
-    public void hide(AnimationOptions options, AnimationListener listener) {
+    public void hide(AnimationOptions options, Runnable onAnimationEnd) {
         if (options.hasValue() && (!options.id.hasValue() || options.id.get().equals(stackId))) {
             hideAnimator = options.getAnimation(topBar);
         } else {
             hideAnimator = getDefaultHideAnimator(0, accelerateInterpolator, DURATION_TOPBAR);
         }
-        hide(listener);
+        hide(onAnimationEnd);
     }
 
     void hide(float startTranslation) {
         hideAnimator = getDefaultHideAnimator(startTranslation, null, DEFAULT_COLLAPSE_DURATION);
-        hide(null);
+        hide(() -> {});
     }
 
-    private void hide(AnimationListener listener) {
+    private void hide(Runnable onAnimationEnd) {
         hideAnimator.addListener(new AnimatorListenerAdapter() {
             @Override
             public void onAnimationEnd(Animator animation) {
                 topBar.setVisibility(View.GONE);
-                if (listener != null) listener.onAnimationEnd();
+                onAnimationEnd.run();
             }
         });
         hideAnimator.start();
@@ -102,8 +104,4 @@ public class TopBarAnimator {
         set.play(hideAnimator);
         return set;
     }
-
-    public boolean isRunning() {
-        return (hideAnimator != null && hideAnimator.isRunning()) || (showAnimator != null && showAnimator.isRunning());
-    }
 }

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

@@ -61,6 +61,10 @@ public class AnimationOptions {
         return hasValue;
     }
 
+    public AnimatorSet getAnimation(View view) {
+        return getAnimation(view, null);
+    }
+
     public AnimatorSet getAnimation(View view, AnimatorSet defaultAnimation) {
         if (!hasValue()) return defaultAnimation;
         AnimatorSet animationSet = new AnimatorSet();

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

@@ -2,7 +2,6 @@ package com.reactnativenavigation.presentation;
 
 import android.app.Activity;
 import android.graphics.Color;
-import android.support.annotation.NonNull;
 
 import com.reactnativenavigation.interfaces.ChildDisappearListener;
 import com.reactnativenavigation.parse.AnimationsOptions;
@@ -106,7 +105,7 @@ public class OptionsPresenter {
         if (topTabOptions.fontFamily != null) topBar.setTopTabFontFamily(topTabOptions.tabIndex, topTabOptions.fontFamily);
     }
 
-    public void onChildWillDisappear(Options disappearing, Options appearing, @NonNull ChildDisappearListener childDisappearListener) {
+    public void onChildWillDisappear(Options disappearing, Options appearing, ChildDisappearListener childDisappearListener) {
         if (disappearing.topBarOptions.visible.isTrueOrUndefined() && appearing.topBarOptions.visible.isFalse()) {
             if (disappearing.topBarOptions.animate.isTrueOrUndefined()) {
                 topBar.hideAnimate(disappearing.animationsOptions.pop.topBar, childDisappearListener::childDisappear);

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

@@ -1,5 +1,7 @@
 package com.reactnativenavigation.viewcontrollers;
 
+import android.animation.Animator;
+import android.animation.AnimatorListenerAdapter;
 import android.app.Activity;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
@@ -79,7 +81,12 @@ public class Navigator extends ParentController implements ModalListener {
         if (animationsOptions.startApp.hasValue()) {
             getView().addView(view);
             new NavigationAnimator(viewController.getActivity(), animationsOptions)
-                    .animateStartApp(view, () -> promise.resolve(viewController.getId()));
+                    .animateStartApp(view, new AnimatorListenerAdapter() {
+                        @Override
+                        public void onAnimationEnd(Animator animation) {
+                            promise.resolve(viewController.getId());
+                        }
+                    });
         } else {
             getView().addView(view);
             promise.resolve(viewController.getId());

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

@@ -143,10 +143,7 @@ public class StackController extends ParentController<StackLayout> {
         );
 
         if (disappearing.options.animated.isTrueOrUndefined()) {
-            animator.pop(
-                    disappearing.getView(),
-                    () -> finishPopping(disappearing, listener)
-            );
+            animator.pop(disappearing.getView(), () -> finishPopping(disappearing, listener));
         } else {
             finishPopping(disappearing, listener);
         }

lib/android/app/src/main/java/com/reactnativenavigation/views/topbar/TopBar.java

@@ -1,5 +1,6 @@
 package com.reactnativenavigation.views.topbar;
 
+import android.animation.Animator.AnimatorListener;
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.graphics.Typeface;
@@ -13,7 +14,6 @@ import android.view.View;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
-import com.reactnativenavigation.anim.AnimationListener;
 import com.reactnativenavigation.anim.TopBarAnimator;
 import com.reactnativenavigation.anim.TopBarCollapseBehavior;
 import com.reactnativenavigation.interfaces.ScrollEventListener;
@@ -198,11 +198,11 @@ public class TopBar extends AppBarLayout implements ScrollEventListener.ScrollAw
     }
 
     public void hideAnimate(AnimationOptions options) {
-        hideAnimate(options, null);
+        hideAnimate(options, () -> {});
     }
 
-    public void hideAnimate(AnimationOptions options, AnimationListener listener) {
-        animator.hide(options, listener);
+    public void hideAnimate(AnimationOptions options, Runnable onAnimationEnd) {
+        animator.hide(options, onAnimationEnd);
     }
 
     @Override

lib/android/app/src/test/java/com/reactnativenavigation/anim/ViewAnimationSetBuilderTest.java

@@ -22,12 +22,12 @@ public class ViewAnimationSetBuilderTest extends BaseTest {
     }
 
     @Test
-    public void implementsViewAnimationListener() throws Exception {
+    public void implementsViewAnimationListener() {
         assertThat(new ViewAnimationSetBuilder()).isInstanceOf(Animation.AnimationListener.class);
     }
 
     @Test
-    public void optionalCompletionListener() throws Exception {
+    public void optionalCompletionListener() {
         new ViewAnimationSetBuilder()
                 .add(someView(), someAnimation())
                 .start();
@@ -35,7 +35,7 @@ public class ViewAnimationSetBuilderTest extends BaseTest {
     }
 
     @Test
-    public void startsAllAnimations() throws Exception {
+    public void startsAllAnimations() {
         Animation anim1 = someAnimation();
         Animation anim2 = someAnimation();
         new ViewAnimationSetBuilder()
@@ -48,7 +48,7 @@ public class ViewAnimationSetBuilderTest extends BaseTest {
     }
 
     @Test
-    public void callsEndListenerOnlyAfterAllAnimationsFinish() throws Exception {
+    public void callsEndListenerOnlyAfterAllAnimationsFinish() {
         Animation anim1 = someAnimation();
         Animation anim2 = someAnimation();
         ViewAnimationSetBuilder uut = new ViewAnimationSetBuilder();
@@ -60,7 +60,7 @@ public class ViewAnimationSetBuilderTest extends BaseTest {
     }
 
     @Test
-    public void clearsAnimationFromViewsAfterFinished() throws Exception {
+    public void clearsAnimationFromViewsAfterFinished() {
         View v1 = someView();
         View v2 = someView();
         new ViewAnimationSetBuilder()

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

@@ -1,24 +0,0 @@
-package com.reactnativenavigation.mocks;
-
-import android.view.*;
-
-import com.reactnativenavigation.anim.*;
-
-import org.robolectric.*;
-
-public class TestNavigationAnimator extends NavigationAnimator {
-
-    public TestNavigationAnimator() {
-        super(RuntimeEnvironment.application);
-    }
-
-    @Override
-    public void push(final View enteringView, AnimationListener animationListener) {
-        if (animationListener != null) animationListener.onAnimationEnd();
-    }
-
-    @Override
-    public void pop(final View enteringView, AnimationListener animationListener) {
-        if (animationListener != null) animationListener.onAnimationEnd();
-    }
-}

lib/android/app/src/test/java/com/reactnativenavigation/views/TopBarTest.java

@@ -23,6 +23,8 @@ import org.junit.Test;
 import java.util.ArrayList;
 
 import static org.assertj.core.api.Java6Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
@@ -87,7 +89,7 @@ public class TopBarTest extends BaseTest {
     public void hide_animate() {
         AnimationOptions options = new AnimationOptions();
         uut.hideAnimate(options);
-        verify(animator, times(1)).hide(options, null);
+        verify(animator, times(1)).hide(eq(options), any());
     }
 
     @Test