Merge pull request yuyakaido#87 from katsuya-yamada-eureka/patch_2_overlay_alpha_animation

yuyakaido · web-flow · commit 877221c55f2a · 2018-03-14T19:39:22.000+09:00
overlay run with alpha animation
diff --git a/cardstackview/src/main/java/com/yuyakaido/android/cardstackview/CardStackView.java b/cardstackview/src/main/java/com/yuyakaido/android/cardstackview/CardStackView.java
@@ -261,20 +261,27 @@ public void performSwipe(Point point, final Animator.AnimatorListener listener)
                 .start();
     }
 
-    public void performSwipe(SwipeDirection direction, AnimatorSet set, final Animator.AnimatorListener listener) {
-        if (direction == SwipeDirection.Left) {
+    public void performSwipe(SwipeDirection direction, AnimatorSet set, AnimatorSet overlayAnimatorSet, final Animator.AnimatorListener listener) {
+        boolean showOverlay;
+        if (showOverlay = direction == SwipeDirection.Left) {
             getTopView().showLeftOverlay();
-            getTopView().setOverlayAlpha(1f);
-        } else if (direction == SwipeDirection.Right) {
+        } else if (showOverlay = direction == SwipeDirection.Right) {
             getTopView().showRightOverlay();
-            getTopView().setOverlayAlpha(1f);
-        } else if (direction == SwipeDirection.Bottom){
+        } else if (showOverlay = direction == SwipeDirection.Bottom){
             getTopView().showBottomOverlay();
-            getTopView().setOverlayAlpha(1f);
-        } else if (direction == SwipeDirection.Top){
+        } else if (showOverlay = direction == SwipeDirection.Top){
             getTopView().showTopOverlay();
-            getTopView().setOverlayAlpha(1f);
+        } else {
+            showOverlay = false;
+        }
+        if(showOverlay) {
+            if(overlayAnimatorSet != null) {
+                getTopView().setOverlayAlpha(overlayAnimatorSet);
+            } else {
+                getTopView().setOverlayAlpha(1f);
+            }
         }
+
         set.addListener(listener);
         set.setInterpolator(new TimeInterpolator() {
             @Override
@@ -476,8 +483,12 @@ public void onAnimationEnd(Animator animator) {
     }
 
     public void swipe(final SwipeDirection direction, AnimatorSet set) {
+        swipe(direction, set, null);
+    }
+
+    public void swipe(final SwipeDirection direction, AnimatorSet cardAnimatorSet, AnimatorSet overlayAnimatorSet) {
         executePreSwipeTask();
-        performSwipe(direction, set, new AnimatorListenerAdapter() {
+        performSwipe(direction, cardAnimatorSet, overlayAnimatorSet, new AnimatorListenerAdapter() {
             @Override
             public void onAnimationEnd(Animator animator) {
                 executePostSwipeTask(new Point(0, -2000), direction);
diff --git a/cardstackview/src/main/java/com/yuyakaido/android/cardstackview/internal/CardContainerView.java b/cardstackview/src/main/java/com/yuyakaido/android/cardstackview/internal/CardContainerView.java
@@ -1,5 +1,6 @@
 package com.yuyakaido.android.cardstackview.internal;
 
+import android.animation.AnimatorSet;
 import android.content.Context;
 import android.graphics.Point;
 import android.support.v4.view.MotionEventCompat;
@@ -306,6 +307,12 @@ public void setOverlay(int left, int right, int bottom, int top) {
         }
     }
 
+    public void setOverlayAlpha(AnimatorSet overlayAnimatorSet) {
+        if(overlayAnimatorSet != null) {
+            overlayAnimatorSet.start();
+        }
+    }
+
     public void setOverlayAlpha(float alpha) {
         ViewCompat.setAlpha(overlayContainer, alpha);
     }
diff --git a/sample/src/main/java/com/yuyakaido/android/cardstackview/sample/MainActivity.java b/sample/src/main/java/com/yuyakaido/android/cardstackview/sample/MainActivity.java
@@ -208,6 +208,7 @@ public void swipeLeft() {
         }
 
         View target = cardStackView.getTopView();
+        View targetOverlay = cardStackView.getTopView().getOverlayContainer();
 
         ValueAnimator rotation = ObjectAnimator.ofPropertyValuesHolder(
                 target, PropertyValuesHolder.ofFloat("rotation", -10f));
@@ -220,10 +221,15 @@ public void swipeLeft() {
         translateY.setStartDelay(100);
         translateX.setDuration(500);
         translateY.setDuration(500);
-        AnimatorSet set = new AnimatorSet();
-        set.playTogether(rotation, translateX, translateY);
+        AnimatorSet cardAnimationSet = new AnimatorSet();
+        cardAnimationSet.playTogether(rotation, translateX, translateY);
 
-        cardStackView.swipe(SwipeDirection.Left, set);
+        ObjectAnimator overlayAnimator = ObjectAnimator.ofFloat(targetOverlay, "alpha", 0f, 1f);
+        overlayAnimator.setDuration(200);
+        AnimatorSet overlayAnimationSet = new AnimatorSet();
+        overlayAnimationSet.playTogether(overlayAnimator);
+
+        cardStackView.swipe(SwipeDirection.Left, cardAnimationSet, overlayAnimationSet);
     }
 
     public void swipeRight() {
@@ -233,6 +239,7 @@ public void swipeRight() {
         }
 
         View target = cardStackView.getTopView();
+        View targetOverlay = cardStackView.getTopView().getOverlayContainer();
 
         ValueAnimator rotation = ObjectAnimator.ofPropertyValuesHolder(
                 target, PropertyValuesHolder.ofFloat("rotation", 10f));
@@ -245,10 +252,15 @@ public void swipeRight() {
         translateY.setStartDelay(100);
         translateX.setDuration(500);
         translateY.setDuration(500);
-        AnimatorSet set = new AnimatorSet();
-        set.playTogether(rotation, translateX, translateY);
+        AnimatorSet cardAnimationSet = new AnimatorSet();
+        cardAnimationSet.playTogether(rotation, translateX, translateY);
+
+        ObjectAnimator overlayAnimator = ObjectAnimator.ofFloat(targetOverlay, "alpha", 0f, 1f);
+        overlayAnimator.setDuration(200);
+        AnimatorSet overlayAnimationSet = new AnimatorSet();
+        overlayAnimationSet.playTogether(overlayAnimator);
 
-        cardStackView.swipe(SwipeDirection.Right, set);
+        cardStackView.swipe(SwipeDirection.Right, cardAnimationSet, overlayAnimationSet);
     }
 
     private void reverse() {

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`package com.yuyakaido.android.cardstackview.internal;`
`2`	`2`
	`3`	`+import android.animation.AnimatorSet;`
`3`	`4`	`import android.content.Context;`
`4`	`5`	`import android.graphics.Point;`
`5`	`6`	`import android.support.v4.view.MotionEventCompat;`
`@@ -306,6 +307,12 @@ public void setOverlay(int left, int right, int bottom, int top) {`
`306`	`307`	`}`
`307`	`308`	`}`
`308`	`309`
	`310`	`+ public void setOverlayAlpha(AnimatorSet overlayAnimatorSet) {`
	`311`	`+ if(overlayAnimatorSet != null) {`
	`312`	`+ overlayAnimatorSet.start();`
	`313`	`+ }`
	`314`	`+ }`
	`315`	`+`
`309`	`316`	`public void setOverlayAlpha(float alpha) {`
`310`	`317`	`ViewCompat.setAlpha(overlayContainer, alpha);`
`311`	`318`	`}`