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

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

@@ -0,0 +1,63 @@
+package com.reactnativenavigation.anim;
+
+
+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;
+
+import com.reactnativenavigation.parse.AnimationsOptions;
+import com.reactnativenavigation.utils.UiUtils;
+
+class BaseAnimator {
+
+    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();
+
+    private float translationY;
+
+    BaseAnimator(Context context) {
+        translationY = UiUtils.getWindowHeight(context);
+    }
+
+    @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);
+        translationY.setInterpolator(DECELERATE_INTERPOLATOR);
+        translationY.setDuration(DURATION);
+        alpha.setDuration(DURATION);
+        set.playTogether(translationY, alpha);
+        return set;
+    }
+
+
+    @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.playTogether(translationY, alpha);
+        return set;
+    }
+
+    public void setOptions(AnimationsOptions options) {
+        this.options = options;
+    }
+}

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

@@ -0,0 +1,40 @@
+package com.reactnativenavigation.anim;
+
+
+import android.animation.AnimatorListenerAdapter;
+import android.animation.AnimatorSet;
+import android.content.Context;
+import android.view.View;
+
+import com.reactnativenavigation.parse.AnimationOptions;
+import com.reactnativenavigation.parse.AnimationsOptions;
+
+public class ModalAnimator extends BaseAnimator {
+
+    public ModalAnimator(Context context, AnimationsOptions options) {
+        super(context);
+        this.options = options;
+    }
+
+    public void animateShow(View contentView, AnimatorListenerAdapter listener) {
+        AnimatorSet animatorSet;
+        if (options.showModal.hasValue()) {
+            animatorSet = options.showModal.getAnimation(contentView);
+        } else {
+            animatorSet = getDefaultPushAnimation(contentView);
+        }
+        animatorSet.addListener(listener);
+        animatorSet.start();
+    }
+
+    public void animateDismiss(View contentView, AnimatorListenerAdapter listener) {
+        AnimatorSet animatorSet;
+        if (options.dismissModal.hasValue()) {
+            animatorSet = options.dismissModal.getAnimation(contentView);
+        } else {
+            animatorSet = getDefaultPopAnimation(contentView);
+        }
+        animatorSet.addListener(listener);
+        animatorSet.start();
+    }
+}

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

@@ -15,17 +15,10 @@ import com.reactnativenavigation.parse.AnimationsOptions;
 import com.reactnativenavigation.utils.UiUtils;
 
 @SuppressWarnings("ResourceType")
-public class NavigationAnimator {
-
-    private 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();
-    private float translationY;
+public class NavigationAnimator extends BaseAnimator {
 
     public NavigationAnimator(Context context) {
-        translationY = UiUtils.getWindowHeight(context);
+        super(context);
     }
 
     public void animatePush(final View view, @Nullable final AnimationListener animationListener) {
@@ -52,20 +45,6 @@ public class NavigationAnimator {
         set.start();
     }
 
-    @NonNull
-    private 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);
-        translationY.setInterpolator(DECELERATE_INTERPOLATOR);
-        translationY.setDuration(DURATION);
-        alpha.setDuration(DURATION);
-        set.playTogether(translationY, alpha);
-        return set;
-    }
-
     public void animatePop(View view, @Nullable final AnimationListener animationListener) {
         AnimatorSet set;
         if (options.pop.hasValue()) {
@@ -83,23 +62,4 @@ public class NavigationAnimator {
         });
         set.start();
     }
-
-    @NonNull
-    private 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.playTogether(translationY, alpha);
-        return set;
-    }
-
-    public void setOptions(AnimationsOptions options) {
-        this.options = options;
-    }
 }

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

@@ -3,6 +3,7 @@ package com.reactnativenavigation.parse;
 
 import android.animation.Animator;
 import android.animation.AnimatorSet;
+import android.util.Log;
 import android.util.Property;
 import android.view.View;
 

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

@@ -1,6 +1,8 @@
 package com.reactnativenavigation.parse;
 
 
+import android.util.Log;
+
 import org.json.JSONObject;
 
 public class AnimationsOptions {

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

@@ -17,7 +17,7 @@ public class Options implements DEFAULT_VALUES {
     @NonNull
     public static Options parse(TypefaceLoader typefaceManager, JSONObject json, @NonNull Options defaultOptions) {
         Options result = new Options();
-        if (json == null) return result;
+        if (json == null) return result.withDefaultOptions(defaultOptions);
 
         result.orientationOptions = OrientationOptions.parse(json);
         result.topBarOptions = TopBarOptions.parse(typefaceManager, json.optJSONObject("topBar"));

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

@@ -14,7 +14,7 @@ import java.util.List;
 
 class ModalStack implements ModalListener {
 
-	private List<Modal> modals = new ArrayList<>();
+    private List<Modal> modals = new ArrayList<>();
     private ModalCreator creator;
     private ModalListener modalListener;
 
@@ -26,25 +26,20 @@ class ModalStack implements ModalListener {
     void showModal(final ViewController viewController, Promise promise) {
         Modal modal = creator.create(viewController, this);
         modals.add(modal);
-		modal.show();
+        modal.show();
         promise.resolve(viewController.getId());
-	}
-
-	void dismissModal(final String componentId, Promise promise) {
-		Modal modal = findModalByComponentId(componentId);
-		if (modal != null) {
-			modal.dismiss(promise);
-		} else {
-			Navigator.rejectPromise(promise);
-		}
-	}
-
-	void dismissAll(Promise promise) {
-		for (Modal modal : modals) {
-			modal.dismiss(size() == 1 ? promise : new NoOpPromise());
-		}
-		modals.clear();
-	}
+    }
+
+    void dismissModal(final String componentId, Promise promise) {
+        applyOnModal(componentId, (modal) -> modal.dismiss(promise), () -> Navigator.rejectPromise(promise));
+    }
+
+    void dismissAll(Promise promise) {
+        for (Modal modal : modals) {
+            modal.dismiss(size() == 1 ? promise : new NoOpPromise());
+        }
+        modals.clear();
+    }
 
     boolean isEmpty() {
         return modals.isEmpty();
@@ -54,17 +49,17 @@ class ModalStack implements ModalListener {
         return modals.size();
     }
 
-	@Nullable
+    @Nullable
     Modal findModalByComponentId(String componentId) {
-		for (Modal modal : modals) {
-			if (modal.containsDeepComponentId(componentId)) {
-				return modal;
-			}
-		}
-		return null;
-	}
-
-	@Nullable
+        for (Modal modal : modals) {
+            if (modal.containsDeepComponentId(componentId)) {
+                return modal;
+            }
+        }
+        return null;
+    }
+
+    @Nullable
     ViewController findControllerById(String id) {
         Modal modal = findModalByComponentId(id);
         return modal != null ? modal.viewController.findControllerById(id) : null;
@@ -74,7 +69,7 @@ class ModalStack implements ModalListener {
     public void onModalDismiss(Modal modal) {
         if (peek() == modal) {
             modals.remove(modal);
-            performOnModal(peek(), peek -> peek.viewController.onViewAppeared());
+            applyOnModal(peek(), peek -> peek.viewController.onViewAppeared(), null);
         } else {
             modals.remove(modal);
         }
@@ -90,11 +85,24 @@ class ModalStack implements ModalListener {
         return isEmpty() ? null : modals.get(modals.size() - 1);
     }
 
-    private void performOnModal(@Nullable Modal modal, Task<Modal> task) {
-        if (modal != null) task.run(modal);
-    }
-
     public boolean handleBack() {
         return !modals.isEmpty() && peek().handleBack();
     }
+
+    private void applyOnModal(String componentId, Task<Modal> accept, Runnable reject) {
+        Modal modal = findModalByComponentId(componentId);
+        if (modal != null) {
+            if (accept != null) accept.run(modal);
+        } else {
+            if (reject != null) reject.run();
+        }
+    }
+
+    private void applyOnModal(Modal modal, Task<Modal> accept, Runnable reject) {
+        if (modal != null) {
+            if (accept != null) accept.run(modal);
+        } else {
+            if (reject != null) reject.run();
+        }
+    }
 }

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

@@ -1,5 +1,7 @@
 package com.reactnativenavigation.viewcontrollers.modal;
 
+import android.animation.Animator;
+import android.animation.AnimatorListenerAdapter;
 import android.app.Dialog;
 import android.content.DialogInterface;
 import android.support.annotation.Nullable;
@@ -8,6 +10,7 @@ import android.view.View;
 
 import com.facebook.react.bridge.Promise;
 import com.reactnativenavigation.R;
+import com.reactnativenavigation.anim.ModalAnimator;
 import com.reactnativenavigation.viewcontrollers.ViewController;
 
 import static android.view.View.MeasureSpec.EXACTLY;
@@ -19,6 +22,8 @@ public class Modal implements DialogInterface.OnKeyListener, DialogInterface.OnD
     private ModalListener modalListener;
     @Nullable private Promise dismissPromise;
 
+    private ModalAnimator animator;
+
     public Modal(final ViewController viewController, ModalListener modalListener) {
         this.viewController = viewController;
         dialog = new Dialog(viewController.getActivity(), R.style.Modal);
@@ -26,17 +31,29 @@ public class Modal implements DialogInterface.OnKeyListener, DialogInterface.OnD
         dialog.setOnKeyListener(this);
         dialog.setOnDismissListener(this);
         dialog.setOnShowListener(this);
+        animator = new ModalAnimator(viewController.getActivity(), viewController.options.animationsOptions);
     }
 
     public void show() {
         preMeasureView();
-        dialog.setContentView(viewController.getView());
+        final View contentView = viewController.getView();
         dialog.show();
+        animator.animateShow(contentView, new AnimatorListenerAdapter() {
+            @Override
+            public void onAnimationStart(Animator animation) {
+                dialog.setContentView(contentView);
+            }
+        });
     }
 
     public void dismiss(Promise promise) {
         dismissPromise = promise;
-        dialog.dismiss();
+        animator.animateDismiss(viewController.getView(), new AnimatorListenerAdapter() {
+            @Override
+            public void onAnimationEnd(Animator animation) {
+                dialog.dismiss();
+            }
+        });
     }
 
     public boolean containsDeepComponentId(String componentId) {

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

@@ -3,10 +3,11 @@
 
     <style name="Modal" parent="Theme.AppCompat.Light.NoActionBar">
         <item name="android:windowAnimationStyle">@style/modalAnimations</item>
+        <item name="android:windowBackground">@android:color/transparent</item>
     </style>
 
     <style name="modalAnimations">
-        <item name="android:windowEnterAnimation">@anim/slide_up</item>
-        <item name="android:windowExitAnimation">@anim/slide_down</item>
+        <item name="android:windowEnterAnimation">@null</item>
+        <item name="android:windowExitAnimation">@null</item>
     </style>
 </resources>

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

@@ -103,8 +103,12 @@ public class ModalStackTest extends BaseTest {
     public void onDismiss() throws Exception {
         uut.showModal(viewController, new MockPromise());
         uut.showModal(new SimpleViewController(newActivity(), "otherComponent", new Options()), new MockPromise());
-        uut.dismissAll(new MockPromise());
-        verify(uut, times(2)).onModalDismiss(any());
+        uut.dismissAll(new MockPromise() {
+            @Override
+            public void resolve(@Nullable Object value) {
+                verify(uut, times(2)).onModalDismiss(any());
+            }
+        });
     }
 
     @Test