bug fix, overlay not working when performSwipe arg3: overlayAnimatorSet is null

katsuya-yamada-eureka · katsuya-yamada-eureka · commit 53ed8fd068a3 · 2018-03-14T11:32:45.000+09:00
diff --git a/cardstackview/src/main/java/com/yuyakaido/android/cardstackview/CardStackView.java b/cardstackview/src/main/java/com/yuyakaido/android/cardstackview/CardStackView.java
@@ -262,19 +262,26 @@ public void performSwipe(Point point, final Animator.AnimatorListener listener)
     }
 
     public void performSwipe(SwipeDirection direction, AnimatorSet set, AnimatorSet overlayAnimatorSet, final Animator.AnimatorListener listener) {
-        if (direction == SwipeDirection.Left) {
+        boolean showOverlay;
+        if (showOverlay = direction == SwipeDirection.Left) {
             getTopView().showLeftOverlay();
-            getTopView().setOverlayAlpha(overlayAnimatorSet);
-        } else if (direction == SwipeDirection.Right) {
+        } else if (showOverlay = direction == SwipeDirection.Right) {
             getTopView().showRightOverlay();
-            getTopView().setOverlayAlpha(overlayAnimatorSet);
-        } else if (direction == SwipeDirection.Bottom){
+        } else if (showOverlay = direction == SwipeDirection.Bottom){
             getTopView().showBottomOverlay();
-            getTopView().setOverlayAlpha(overlayAnimatorSet);
-        } else if (direction == SwipeDirection.Top){
+        } else if (showOverlay = direction == SwipeDirection.Top){
             getTopView().showTopOverlay();
-            getTopView().setOverlayAlpha(overlayAnimatorSet);
+        } else {
+            showOverlay = false;
         }
+        if(showOverlay) {
+            if(overlayAnimatorSet != null) {
+                getTopView().setOverlayAlpha(overlayAnimatorSet);
+            } else {
+                getTopView().setOverlayAlpha(1f);
+            }
+        }
+
         set.addListener(listener);
         set.setInterpolator(new TimeInterpolator() {
             @Override
