Merge pull request yuyakaido#233 from yuyakaido/issue/231

yuyakaido · web-flow · commit 27e89ecff1a2 · 2019-04-09T21:38:58.000+09:00
Add OverlayInterpolator to define the rate of change of alpha
diff --git a/cardstackview/src/main/java/com/yuyakaido/android/cardstackview/CardStackLayoutManager.java b/cardstackview/src/main/java/com/yuyakaido/android/cardstackview/CardStackLayoutManager.java
@@ -9,6 +9,7 @@
 import android.support.v7.widget.RecyclerView;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.animation.Interpolator;
 
 import com.yuyakaido.android.cardstackview.internal.CardStackSetting;
 import com.yuyakaido.android.cardstackview.internal.CardStackSmoothScroller;
@@ -472,25 +473,26 @@ private void updateOverlay(View view) {
             bottomOverlay.setAlpha(0.0f);
         }
         Direction direction = state.getDirection();
+        float alpha = setting.overlayInterpolator.getInterpolation(state.getRatio());
         switch (direction) {
             case Left:
                 if (leftOverlay != null) {
-                    leftOverlay.setAlpha(state.getRatio());
+                    leftOverlay.setAlpha(alpha);
                 }
                 break;
             case Right:
                 if (rightOverlay != null) {
-                    rightOverlay.setAlpha(state.getRatio());
+                    rightOverlay.setAlpha(alpha);
                 }
                 break;
             case Top:
                 if (topOverlay != null) {
-                    topOverlay.setAlpha(state.getRatio());
+                    topOverlay.setAlpha(alpha);
                 }
                 break;
             case Bottom:
                 if (bottomOverlay != null) {
-                    bottomOverlay.setAlpha(state.getRatio());
+                    bottomOverlay.setAlpha(alpha);
                 }
                 break;
         }
@@ -620,4 +622,8 @@ public void setRewindAnimationSetting(@NonNull RewindAnimationSetting rewindAnim
         setting.rewindAnimationSetting = rewindAnimationSetting;
     }
 
+    public void setOverlayInterpolator(@NonNull Interpolator overlayInterpolator) {
+        setting.overlayInterpolator = overlayInterpolator;
+    }
+
 }
diff --git a/cardstackview/src/main/java/com/yuyakaido/android/cardstackview/internal/CardStackSetting.java b/cardstackview/src/main/java/com/yuyakaido/android/cardstackview/internal/CardStackSetting.java
@@ -1,5 +1,8 @@
 package com.yuyakaido.android.cardstackview.internal;
 
+import android.view.animation.Interpolator;
+import android.view.animation.LinearInterpolator;
+
 import com.yuyakaido.android.cardstackview.Direction;
 import com.yuyakaido.android.cardstackview.RewindAnimationSetting;
 import com.yuyakaido.android.cardstackview.StackFrom;
@@ -21,4 +24,5 @@ public class CardStackSetting {
     public SwipeableMethod swipeableMethod = SwipeableMethod.AutomaticAndManual;
     public SwipeAnimationSetting swipeAnimationSetting = new SwipeAnimationSetting.Builder().build();
     public RewindAnimationSetting rewindAnimationSetting = new RewindAnimationSetting.Builder().build();
+    public Interpolator overlayInterpolator = new LinearInterpolator();
 }
diff --git a/sample/src/main/java/com/yuyakaido/android/cardstackview/sample/MainActivity.kt b/sample/src/main/java/com/yuyakaido/android/cardstackview/sample/MainActivity.kt
@@ -13,6 +13,7 @@ import android.view.Gravity
 import android.view.View
 import android.view.animation.AccelerateInterpolator
 import android.view.animation.DecelerateInterpolator
+import android.view.animation.LinearInterpolator
 import android.widget.TextView
 import com.yuyakaido.android.cardstackview.*
 import java.util.*
@@ -146,6 +147,7 @@ class MainActivity : AppCompatActivity(), CardStackListener {
         manager.setCanScrollHorizontal(true)
         manager.setCanScrollVertical(true)
         manager.setSwipeableMethod(SwipeableMethod.AutomaticAndManual)
+        manager.setOverlayInterpolator(LinearInterpolator())
         cardStackView.layoutManager = manager
         cardStackView.adapter = adapter
         cardStackView.itemAnimator.apply {

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@`
`9`	`9`	`import android.support.v7.widget.RecyclerView;`
`10`	`10`	`import android.view.View;`
`11`	`11`	`import android.view.ViewGroup;`
	`12`	`+import android.view.animation.Interpolator;`
`12`	`13`
`13`	`14`	`import com.yuyakaido.android.cardstackview.internal.CardStackSetting;`
`14`	`15`	`import com.yuyakaido.android.cardstackview.internal.CardStackSmoothScroller;`
`@@ -472,25 +473,26 @@ private void updateOverlay(View view) {`
`472`	`473`	`bottomOverlay.setAlpha(0.0f);`
`473`	`474`	`}`
`474`	`475`	`Direction direction = state.getDirection();`
	`476`	`+ float alpha = setting.overlayInterpolator.getInterpolation(state.getRatio());`
`475`	`477`	`switch (direction) {`
`476`	`478`	`case Left:`
`477`	`479`	`if (leftOverlay != null) {`
`478`		`- leftOverlay.setAlpha(state.getRatio());`
	`480`	`+ leftOverlay.setAlpha(alpha);`
`479`	`481`	`}`
`480`	`482`	`break;`
`481`	`483`	`case Right:`
`482`	`484`	`if (rightOverlay != null) {`
`483`		`- rightOverlay.setAlpha(state.getRatio());`
	`485`	`+ rightOverlay.setAlpha(alpha);`
`484`	`486`	`}`
`485`	`487`	`break;`
`486`	`488`	`case Top:`
`487`	`489`	`if (topOverlay != null) {`
`488`		`- topOverlay.setAlpha(state.getRatio());`
	`490`	`+ topOverlay.setAlpha(alpha);`
`489`	`491`	`}`
`490`	`492`	`break;`
`491`	`493`	`case Bottom:`
`492`	`494`	`if (bottomOverlay != null) {`
`493`		`- bottomOverlay.setAlpha(state.getRatio());`
	`495`	`+ bottomOverlay.setAlpha(alpha);`
`494`	`496`	`}`
`495`	`497`	`break;`
`496`	`498`	`}`
`@@ -620,4 +622,8 @@ public void setRewindAnimationSetting(@NonNull RewindAnimationSetting rewindAnim`
`620`	`622`	`setting.rewindAnimationSetting = rewindAnimationSetting;`
`621`	`623`	`}`
`622`	`624`
	`625`	`+ public void setOverlayInterpolator(@NonNull Interpolator overlayInterpolator) {`
	`626`	`+ setting.overlayInterpolator = overlayInterpolator;`
	`627`	`+ }`
	`628`	`+`
`623`	`629`	`}`