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

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

@@ -1,57 +1,113 @@
 package com.reactnativenavigation.anim;
 
+import android.animation.Animator;
+import android.animation.AnimatorSet;
+import android.animation.ObjectAnimator;
+import android.app.Activity;
 import android.content.Context;
-import android.content.res.TypedArray;
 import android.support.annotation.Nullable;
+import android.util.DisplayMetrics;
 import android.view.View;
-import android.view.animation.Animation;
-import android.view.animation.AnimationUtils;
+import android.view.WindowManager;
+import android.view.animation.AccelerateInterpolator;
+import android.view.animation.DecelerateInterpolator;
 
 @SuppressWarnings("ResourceType")
 public class StackAnimator {
 
-	private static int androidOpenEnterAnimResId;
-	private static int androidOpenExitAnimResId;
-	private static int androidCloseEnterAnimResId;
-	private static int androidCloseExitAnimResId;
-	private final Context context;
+	public interface StackAnimationListener {
+		void onAnimationEnd();
+	}
+
+	private static final int DURATION = 300;
+	private static final int START_DELAY = 100;
+	private static final DecelerateInterpolator DECELERATE_INTERPOLATOR = new DecelerateInterpolator();
+	private static final AccelerateInterpolator ACCELERATE_INTERPOLATOR = new AccelerateInterpolator();
+	private float translationY;
 
 	public StackAnimator(Context context) {
-		this.context = context;
-		loadResIfNeeded(context);
+		translationY = getWindowHeight(context);
 	}
 
-	private void loadResIfNeeded(Context context) {
-		if (androidOpenEnterAnimResId > 0) return;
+	public void animatePush(final View view, @Nullable final StackAnimationListener animationListener) {
+		view.setVisibility(View.INVISIBLE);
+		ObjectAnimator alpha = ObjectAnimator.ofFloat(view, View.ALPHA, 0, 1);
+		alpha.setInterpolator(DECELERATE_INTERPOLATOR);
 
-		int[] attrs = {android.R.attr.activityOpenEnterAnimation, android.R.attr.activityOpenExitAnimation, android.R.attr.activityCloseEnterAnimation, android.R.attr.activityCloseExitAnimation};
-		TypedArray typedArray = context.obtainStyledAttributes(android.R.style.Animation_Activity, attrs);
-		androidOpenEnterAnimResId = typedArray.getResourceId(0, -1);
-		androidOpenExitAnimResId = typedArray.getResourceId(1, -1);
-		androidCloseEnterAnimResId = typedArray.getResourceId(2, -1);
-		androidCloseExitAnimResId = typedArray.getResourceId(3, -1);
-		typedArray.recycle();
-	}
+		AnimatorSet set = new AnimatorSet();
+		set.addListener(new Animator.AnimatorListener() {
+			@Override
+			public void onAnimationStart(Animator animation) {
+				view.setVisibility(View.VISIBLE);
+			}
+
+			@Override
+			public void onAnimationEnd(Animator animation) {
+				if (animationListener != null) {
+					animationListener.onAnimationEnd();
+				}
+			}
 
-	public void animatePush(final View enteringView, final View exitingView, @Nullable final Runnable onComplete) {
-		Animation enterAnim = AnimationUtils.loadAnimation(context, androidOpenEnterAnimResId);
-		Animation exitAnim = AnimationUtils.loadAnimation(context, androidOpenExitAnimResId);
+			@Override
+			public void onAnimationCancel(Animator animation) {
 
-		new ViewAnimationSetBuilder()
-				.withEndListener(onComplete)
-				.add(enteringView, enterAnim)
-				.add(exitingView, exitAnim)
-				.start();
+			}
+
+			@Override
+			public void onAnimationRepeat(Animator animation) {
+
+			}
+		});
+		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);
+		set.start();
 	}
 
-	public void animatePop(final View enteringView, final View exitingView, @Nullable final Runnable onComplete) {
-		Animation enterAnim = AnimationUtils.loadAnimation(context, androidCloseEnterAnimResId);
-		Animation exitAnim = AnimationUtils.loadAnimation(context, androidCloseExitAnimResId);
+	public void animatePop(View view, @Nullable final StackAnimationListener animationListener) {
+		ObjectAnimator alpha = ObjectAnimator.ofFloat(view, View.ALPHA, 1, 0);
+		alpha.setInterpolator(ACCELERATE_INTERPOLATOR);
+
+		AnimatorSet set = new AnimatorSet();
+		set.addListener(new Animator.AnimatorListener() {
+			@Override
+			public void onAnimationStart(Animator animation) {
+
+			}
 
-		new ViewAnimationSetBuilder()
-				.withEndListener(onComplete)
-				.add(enteringView, enterAnim)
-				.add(exitingView, exitAnim)
-				.start();
+			@Override
+			public void onAnimationEnd(Animator animation) {
+				if (animationListener != null) {
+					animationListener.onAnimationEnd();
+				}
+			}
+
+			@Override
+			public void onAnimationCancel(Animator animation) {
+
+			}
+
+			@Override
+			public void onAnimationRepeat(Animator animation) {
+
+			}
+		});
+		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);
+		set.start();
 	}
+
+	private float getWindowHeight(Context context) {
+		DisplayMetrics metrics = new DisplayMetrics();
+		WindowManager windowManager = (WindowManager) context.getSystemService(Context.WINDOW_SERVICE);
+		windowManager.getDefaultDisplay().getMetrics(metrics);
+		return metrics.heightPixels;
+	}
+
+
 }

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

@@ -1,21 +1,30 @@
 package com.reactnativenavigation.viewcontrollers;
 
+import android.animation.Animator;
 import android.app.Activity;
+import android.graphics.Color;
+import android.os.Handler;
+import android.os.Looper;
 import android.support.annotation.NonNull;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.FrameLayout;
 import android.widget.LinearLayout;
 
 import com.reactnativenavigation.anim.StackAnimator;
+import com.reactnativenavigation.react.ReactContainerView;
 import com.reactnativenavigation.utils.CompatUtils;
 import com.reactnativenavigation.views.TopBar;
 
 import java.util.Collection;
+import java.util.Random;
 
 public class StackController extends ParentController {
+
 	private final IdStack<ViewController> stack = new IdStack<>();
 	private final StackAnimator animator;
 	private TopBar topBar;
+	private FrameLayout container;
 
 	public StackController(final Activity activity, String id) {
 		this(activity, id, new StackAnimator(activity));
@@ -31,14 +40,15 @@ public class StackController extends ParentController {
 
 		child.setParentStackController(this);
 		stack.push(child.getId(), child);
+		View enteringView = child.getView();
+		getContainer().addView(enteringView);
 
-		getView().addView(child.getView());
-//TODO animate only when needed
+		//TODO animatePush only when needed
 		if (previousTop != null) {
-			animator.animatePush(child.getView(), previousTop.getView(), new Runnable() {
+			animator.animatePush(enteringView, new StackAnimator.StackAnimationListener() {
 				@Override
-				public void run() {
-					getView().removeView(previousTop.getView());
+				public void onAnimationEnd() {
+					getContainer().removeView(previousTop.getView());
 				}
 			});
 		}
@@ -54,19 +64,18 @@ public class StackController extends ParentController {
 		final ViewController poppedTop = stack.pop();
 		ViewController newTop = peek();
 
-		final View enteringView = newTop.getView();
+		View enteringView = newTop.getView();
 		final View exitingView = poppedTop.getView();
-
-		getView().addView(enteringView);
-
-		//TODO animate only when needed
-//		animator.animatePop(enteringView, exitingView, new Runnable() {
-//			@Override
-//			public void run() {
-		getView().removeView(exitingView);
-		poppedTop.destroy();
-//			}
-//		});
+		getContainer().addView(enteringView, getContainer().getChildCount() - 1);
+
+		//TODO animatePush only when needed
+		animator.animatePop(exitingView, new StackAnimator.StackAnimationListener() {
+			@Override
+			public void onAnimationEnd() {
+				getContainer().removeView(exitingView);
+				poppedTop.destroy();
+			}
+		});
 	}
 
 	public void popSpecific(final ViewController childController) {
@@ -123,6 +132,9 @@ public class StackController extends ParentController {
 		topBar = new TopBar(getActivity());
 		topBar.setId(CompatUtils.generateViewId());
 		root.addView(topBar);
+		container = new FrameLayout(getActivity());
+		container.setLayoutParams(new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT));
+		root.addView(container);
 		return root;
 	}
 
@@ -136,4 +148,11 @@ public class StackController extends ParentController {
 		ensureViewIsCreated();
 		return topBar;
 	}
+
+	private ViewGroup getContainer() {
+		if (container == null) {
+			getView();
+		}
+		return container;
+	}
 }

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

@@ -14,12 +14,12 @@ public class TestStackAnimator extends StackAnimator {
 	}
 
 	@Override
-	public void animatePush(final View enteringView, final View exitingView, final Runnable onComplete) {
-		if (onComplete != null) onComplete.run();
+	public void animatePush(final View enteringView, StackAnimationListener animationListener) {
+		if (animationListener != null) animationListener.onAnimationEnd();
 	}
 
 	@Override
-	public void animatePop(final View enteringView, final View exitingView, @Nullable final Runnable onComplete) {
-		if (onComplete != null) onComplete.run();
+	public void animatePop(final View enteringView, StackAnimationListener animationListener) {
+		if (animationListener != null) animationListener.onAnimationEnd();
 	}
 }