Merge branch 'v2' of https://github.com/wix/react-native-navigation into v2

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

@@ -3,20 +3,24 @@ package com.reactnativenavigation.anim;
 
 import android.animation.AnimatorSet;
 import android.animation.ObjectAnimator;
+import android.animation.TimeInterpolator;
 import android.content.Context;
 import android.support.annotation.NonNull;
 import android.view.View;
-import android.view.animation.AccelerateInterpolator;
+import android.view.animation.AccelerateDecelerateInterpolator;
 import android.view.animation.DecelerateInterpolator;
 
 import com.reactnativenavigation.parse.AnimationsOptions;
 import com.reactnativenavigation.utils.UiUtils;
 
+import static android.view.View.ALPHA;
+import static android.view.View.TRANSLATION_Y;
+
 class BaseAnimator {
 
     private static final int DURATION = 300;
-    private static final DecelerateInterpolator DECELERATE_INTERPOLATOR = new DecelerateInterpolator();
-    private static final AccelerateInterpolator ACCELERATE_INTERPOLATOR = new AccelerateInterpolator();
+    private static final TimeInterpolator DECELERATE = new DecelerateInterpolator();
+    private static final TimeInterpolator ACCELERATE_DECELERATE = new AccelerateDecelerateInterpolator();
 
     protected AnimationsOptions options = new AnimationsOptions();
 
@@ -28,13 +32,11 @@ class BaseAnimator {
 
     @NonNull
     AnimatorSet getDefaultPushAnimation(View view) {
-        ObjectAnimator alpha = ObjectAnimator.ofFloat(view, View.ALPHA, 0, 1);
-        alpha.setInterpolator(DECELERATE_INTERPOLATOR);
-
         AnimatorSet set = new AnimatorSet();
-        ObjectAnimator translationY = ObjectAnimator.ofFloat(view, View.TRANSLATION_Y, this.translationY, 0);
-        set.setInterpolator(DECELERATE_INTERPOLATOR);
+        set.setInterpolator(DECELERATE);
         set.setDuration(DURATION);
+        ObjectAnimator translationY = ObjectAnimator.ofFloat(view, TRANSLATION_Y, this.translationY, 0);
+        ObjectAnimator alpha = ObjectAnimator.ofFloat(view, ALPHA, 0, 1);
         set.playTogether(translationY, alpha);
         return set;
     }
@@ -43,14 +45,10 @@ class BaseAnimator {
     @NonNull
     AnimatorSet getDefaultPopAnimation(View view) {
         AnimatorSet set = new AnimatorSet();
-
-        ObjectAnimator alpha = ObjectAnimator.ofFloat(view, View.ALPHA, 1, 0);
-        alpha.setInterpolator(ACCELERATE_INTERPOLATOR);
-
-        ObjectAnimator translationY = ObjectAnimator.ofFloat(view, View.TRANSLATION_Y, 0, this.translationY);
-        translationY.setInterpolator(ACCELERATE_INTERPOLATOR);
-        translationY.setDuration(DURATION);
-        alpha.setDuration(DURATION);
+        set.setInterpolator(ACCELERATE_DECELERATE);
+        set.setDuration(DURATION);
+        ObjectAnimator translationY = ObjectAnimator.ofFloat(view, TRANSLATION_Y, 0, this.translationY);
+        ObjectAnimator alpha = ObjectAnimator.ofFloat(view, ALPHA, 1, 0);
         set.playTogether(translationY, alpha);
         return set;
     }

lib/android/app/src/main/java/com/reactnativenavigation/anim/ModalAnimator2.java → lib/android/app/src/main/java/com/reactnativenavigation/anim/ModalAnimator.java

@@ -8,11 +8,11 @@ import android.view.View;
 
 import com.reactnativenavigation.parse.AnimationOptions;
 
-public class ModalAnimator2 extends BaseAnimator {
+public class ModalAnimator extends BaseAnimator {
 
     private Animator animator;
 
-    public ModalAnimator2(Context context) {
+    public ModalAnimator(Context context) {
         super(context);
     }
 

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

@@ -7,6 +7,7 @@ import android.animation.AnimatorSet;
 import android.animation.ObjectAnimator;
 import android.animation.TimeInterpolator;
 import android.view.View;
+import android.view.animation.AccelerateDecelerateInterpolator;
 import android.view.animation.DecelerateInterpolator;
 import android.view.animation.LinearInterpolator;
 
@@ -15,12 +16,15 @@ import com.reactnativenavigation.views.topbar.TopBar;
 
 import javax.annotation.Nullable;
 
+import static android.view.View.TRANSLATION_Y;
+
 public class TopBarAnimator {
 
     private static final int DEFAULT_COLLAPSE_DURATION = 100;
-    private static final int DURATION_TOPBAR = 300;
-    private final DecelerateInterpolator decelerateInterpolator = new DecelerateInterpolator();
-    private final LinearInterpolator linearInterpolator = new LinearInterpolator();
+    private static final int DURATION = 300;
+    private static final TimeInterpolator DECELERATE = new DecelerateInterpolator();
+    private static final TimeInterpolator LINEAR = new LinearInterpolator();
+    private static final TimeInterpolator ACCELERATE_DECELERATE = new AccelerateDecelerateInterpolator();
 
     private TopBar topBar;
     private String stackId;
@@ -40,13 +44,13 @@ public class TopBarAnimator {
         if (options.hasValue() && (!options.id.hasValue() || options.id.get().equals(stackId))) {
             showAnimator = options.getAnimation(topBar);
         } else {
-            showAnimator = getDefaultShowAnimator(-1 * topBar.getMeasuredHeight(), decelerateInterpolator, DURATION_TOPBAR);
+            showAnimator = getDefaultShowAnimator(-1 * topBar.getMeasuredHeight(), DECELERATE, DURATION);
         }
         show();
     }
 
     public void show(float startTranslation) {
-        showAnimator = getDefaultShowAnimator(startTranslation, linearInterpolator, DEFAULT_COLLAPSE_DURATION);
+        showAnimator = getDefaultShowAnimator(startTranslation, LINEAR, DEFAULT_COLLAPSE_DURATION);
         show();
     }
 
@@ -62,7 +66,7 @@ public class TopBarAnimator {
     }
 
     private AnimatorSet getDefaultShowAnimator(float startTranslation, TimeInterpolator interpolator, int duration) {
-        ObjectAnimator showAnimator = ObjectAnimator.ofFloat(topBar, View.TRANSLATION_Y, startTranslation, 0);
+        ObjectAnimator showAnimator = ObjectAnimator.ofFloat(topBar, TRANSLATION_Y, startTranslation, 0);
         showAnimator.setInterpolator(interpolator);
         showAnimator.setDuration(duration);
         AnimatorSet set = new AnimatorSet();
@@ -74,13 +78,13 @@ public class TopBarAnimator {
         if (options.hasValue() && (!options.id.hasValue() || options.id.get().equals(stackId))) {
             hideAnimator = options.getAnimation(topBar);
         } else {
-            hideAnimator = getDefaultHideAnimator(0, linearInterpolator, DURATION_TOPBAR);
+            hideAnimator = getDefaultHideAnimator(0, ACCELERATE_DECELERATE, DURATION);
         }
         hide(onAnimationEnd);
     }
 
     void hide(float startTranslation) {
-        hideAnimator = getDefaultHideAnimator(startTranslation, linearInterpolator, DEFAULT_COLLAPSE_DURATION);
+        hideAnimator = getDefaultHideAnimator(startTranslation, LINEAR, DEFAULT_COLLAPSE_DURATION);
         hide(() -> {});
     }
 
@@ -96,7 +100,7 @@ public class TopBarAnimator {
     }
 
     private Animator getDefaultHideAnimator(float startTranslation, TimeInterpolator interpolator, int duration) {
-        ObjectAnimator hideAnimator = ObjectAnimator.ofFloat(topBar, View.TRANSLATION_Y, startTranslation, -1 * topBar.getMeasuredHeight());
+        ObjectAnimator hideAnimator = ObjectAnimator.ofFloat(topBar, TRANSLATION_Y, startTranslation, -1 * topBar.getMeasuredHeight());
         hideAnimator.setInterpolator(interpolator);
         hideAnimator.setDuration(duration);
         return hideAnimator;

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

@@ -9,7 +9,7 @@ import android.view.ViewGroup;
 import android.widget.FrameLayout;
 
 import com.facebook.react.bridge.Promise;
-import com.reactnativenavigation.anim.ModalAnimator2;
+import com.reactnativenavigation.anim.ModalAnimator;
 import com.reactnativenavigation.anim.NavigationAnimator;
 import com.reactnativenavigation.parse.Options;
 import com.reactnativenavigation.presentation.NavigationOptionsListener;
@@ -17,7 +17,7 @@ import com.reactnativenavigation.presentation.OverlayManager;
 import com.reactnativenavigation.utils.CommandListenerAdapter;
 import com.reactnativenavigation.utils.CompatUtils;
 import com.reactnativenavigation.viewcontrollers.modal.ModalPresenter;
-import com.reactnativenavigation.viewcontrollers.modal.ModalStack2;
+import com.reactnativenavigation.viewcontrollers.modal.ModalStack;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -30,7 +30,7 @@ public class Navigator extends ParentController {
         void onError(String message);
     }
 
-    private final ModalStack2 modalStack;
+    private final ModalStack modalStack;
     private ViewController root;
     private FrameLayout rootLayout;
     private FrameLayout contentLayout;
@@ -39,7 +39,7 @@ public class Navigator extends ParentController {
 
     public Navigator(final Activity activity) {
         super(activity, "navigator" + CompatUtils.generateViewId(), new Options());
-        modalStack = new ModalStack2(new ModalPresenter(new ModalAnimator2(activity)));
+        modalStack = new ModalStack(new ModalPresenter(new ModalAnimator(activity)));
     }
 
     public FrameLayout getContentLayout() {
@@ -87,7 +87,6 @@ public class Navigator extends ParentController {
         }
 
         root = viewController;
-
         contentLayout.addView(viewController.getView());
         if (viewController.options.animations.startApp.hasValue()) {
             new NavigationAnimator(viewController.getActivity(), viewController.options.animations)
@@ -184,18 +183,8 @@ public class Navigator extends ParentController {
     }
 
     public void dismissModal(final String componentId, CommandListener listener) {
-        modalStack.dismissModal(componentId, new CommandListener() {
-            @Override
-            public void onSuccess(String childId) {
-                if (modalStack.size() == 0) contentLayout.addView(root.getView());
-                listener.onSuccess(childId);
-            }
-
-            @Override
-            public void onError(String message) {
-                listener.onError(message);
-            }
-        });
+        if (modalStack.size() == 1) contentLayout.addView(root.getView());
+        modalStack.dismissModal(componentId, listener);
     }
 
     public void dismissAllModals(CommandListener listener) {

lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/modal/ModalPresenter.java

@@ -4,7 +4,7 @@ import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
 import android.view.ViewGroup;
 
-import com.reactnativenavigation.anim.ModalAnimator2;
+import com.reactnativenavigation.anim.ModalAnimator;
 import com.reactnativenavigation.viewcontrollers.Navigator.CommandListener;
 import com.reactnativenavigation.viewcontrollers.ViewController;
 
@@ -13,9 +13,9 @@ import javax.annotation.Nullable;
 public class ModalPresenter {
 
     private ViewGroup content;
-    private ModalAnimator2 animator;
+    private ModalAnimator animator;
 
-    public ModalPresenter(ModalAnimator2 animator) {
+    public ModalPresenter(ModalAnimator animator) {
         this.animator = animator;
     }
 

lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/modal/ModalStack2.java → lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/modal/ModalStack.java

@@ -11,11 +11,11 @@ import java.util.List;
 
 import javax.annotation.Nullable;
 
-public class ModalStack2 {
+public class ModalStack {
     private List<ViewController> modals = new ArrayList<>();
     private final ModalPresenter presenter;
 
-    public ModalStack2(ModalPresenter presenter) {
+    public ModalStack(ModalPresenter presenter) {
         this.presenter = presenter;
     }
 

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

@@ -412,6 +412,22 @@ public class NavigatorTest extends BaseTest {
         verify(parentController, times(2)).onViewAppeared();
     }
 
+    @Test
+    public void dismissModal_rootIsAttachedBeforeModalIsDismissed() {
+        disableShowModalAnimation(child1, child2);
+        disableDismissModalAnimation(child2);
+
+        uut.setRoot(parentController, new MockPromise());
+        uut.showModal(child1, new CommandListenerAdapter());
+        uut.showModal(child2, new CommandListenerAdapter());
+
+        uut.dismissModal(child2.getId(), new CommandListenerAdapter());
+        assertThat(parentController.getView().getParent()).isNull();
+
+        uut.dismissModal(child1.getId(), new CommandListenerAdapter());
+        assertThat(parentController.getView().getParent()).isNotNull();
+    }
+
     @Test
     public void dismissAllModals_onViewAppearedInvokedOnRoot() {
         disableShowModalAnimation(child1);

lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/modal/ModalAnimatorMock.java

@@ -4,10 +4,10 @@ import android.animation.AnimatorListenerAdapter;
 import android.content.Context;
 import android.view.View;
 
-import com.reactnativenavigation.anim.ModalAnimator2;
+import com.reactnativenavigation.anim.ModalAnimator;
 import com.reactnativenavigation.parse.AnimationOptions;
 
-public class ModalAnimatorMock extends ModalAnimator2 {
+public class ModalAnimatorMock extends ModalAnimator {
 
     ModalAnimatorMock(Context context) {
         super(context);

lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/modal/ModalPresenterTest.java

@@ -4,7 +4,7 @@ import android.app.Activity;
 import android.widget.FrameLayout;
 
 import com.reactnativenavigation.BaseTest;
-import com.reactnativenavigation.anim.ModalAnimator2;
+import com.reactnativenavigation.anim.ModalAnimator;
 import com.reactnativenavigation.mocks.SimpleViewController;
 import com.reactnativenavigation.parse.Options;
 import com.reactnativenavigation.utils.CommandListenerAdapter;
@@ -28,12 +28,12 @@ public class ModalPresenterTest extends BaseTest {
     private ViewController modal2;
     private ModalPresenter uut;
     private FrameLayout contentLayout;
-    private ModalAnimator2 animator;
+    private ModalAnimator animator;
 
     @Override
     public void beforeEach() {
         Activity activity = newActivity();
-        animator = spy(new ModalAnimator2(activity));
+        animator = spy(new ModalAnimator(activity));
         uut = new ModalPresenter(animator);
         contentLayout = new FrameLayout(activity);
         activity.setContentView(contentLayout);

lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/modal/ModalStackTest2.java

@@ -5,7 +5,7 @@ import android.view.ViewGroup;
 import android.widget.FrameLayout;
 
 import com.reactnativenavigation.BaseTest;
-import com.reactnativenavigation.anim.ModalAnimator2;
+import com.reactnativenavigation.anim.ModalAnimator;
 import com.reactnativenavigation.mocks.SimpleViewController;
 import com.reactnativenavigation.parse.Options;
 import com.reactnativenavigation.utils.CommandListenerAdapter;
@@ -31,13 +31,13 @@ public class ModalStackTest2 extends BaseTest {
     private static final String MODAL_ID_2 = "modalId2";
     private static final String MODAL_ID_3 = "modalId3";
 
-    private ModalStack2 uut;
+    private ModalStack uut;
     private ViewController modal1;
     private ViewController modal2;
     private ViewController modal3;
     private Activity activity;
     private ModalPresenter presenter;
-    private ModalAnimator2 animator;
+    private ModalAnimator animator;
 
     @Override
     public void beforeEach() {
@@ -46,7 +46,7 @@ public class ModalStackTest2 extends BaseTest {
         activity.setContentView(root);
         animator = spy(new ModalAnimatorMock(activity));
         presenter = spy(new ModalPresenter(animator));
-        uut = new ModalStack2(presenter);
+        uut = new ModalStack(presenter);
         uut.setContentLayout(root);
         modal1 = spy(new SimpleViewController(activity, MODAL_ID_1, new Options()));
         modal2 = spy(new SimpleViewController(activity, MODAL_ID_2, new Options()));