Merge pull request yuyakaido#17 from yuyakaido/scale-diff

yuyakaido · web-flow · commit 06c46eb36330 · 2017-08-15T03:06:57.000+09:00
Added feature to set ScaleDiff
diff --git a/README.md b/README.md
@@ -21,6 +21,7 @@
     - [VisibleCount](#visiblecount)
     - [ElevationEnabled](#elevationenabled)
     - [TranslationDiff](#translationdiff)
+    - [ScaleDiff](#scalediff)
     - [Overlay](#overlay)
     - [SwipeEnabled](#swipeenabled)
     - [SwipeDirection](#swipedirection)
@@ -135,6 +136,24 @@ The unit of TranslationDiff is **dp**.
 CardStackView#setTranslationDiff(12f);
 ```
 
+## ScaleDiff
+
+The range of ScaleDiff is 0.0 - 1.0.
+
+| Default | Value | Sample |
+| :----: | :----: | :----: |
+| ✅ | 0.02 | ![ScaleDiff-2](https://github.com/yuyakaido/CardStackView/blob/master/images/scale-diff-2.png) |
+| | 0.1 | ![ScaleDiff-10](https://github.com/yuyakaido/CardStackView/blob/master/images/scale-diff-10.png) |
+
+```xml
+<com.yuyakaido.android.cardstackview.CardStackView
+    app:scaleDiff="0.02"/>
+```
+
+```java
+CardStackView#setScaleDiff(0.02f);
+```
+
 ## Overlay
 
 | Value | Sample |
diff --git a/cardstackview/src/main/java/com/yuyakaido/android/cardstackview/CardStackView.java b/cardstackview/src/main/java/com/yuyakaido/android/cardstackview/CardStackView.java
@@ -92,6 +92,7 @@ public CardStackView(Context context, AttributeSet attrs, int defStyle) {
         setVisibleCount(array.getInt(R.styleable.CardStackView_visibleCount, option.visibleCount));
         setSwipeThreshold(array.getFloat(R.styleable.CardStackView_swipeThreshold, option.swipeThreshold));
         setTranslationDiff(array.getFloat(R.styleable.CardStackView_translationDiff, option.translationDiff));
+        setScaleDiff(array.getFloat(R.styleable.CardStackView_scaleDiff, option.scaleDiff));
         setStackFrom(StackFrom.values()[array.getInt(R.styleable.CardStackView_stackFrom, option.stackFrom.ordinal())]);
         setElevationEnabled(array.getBoolean(R.styleable.CardStackView_elevationEnabled, option.isElevationEnabled));
         setSwipeEnabled(array.getBoolean(R.styleable.CardStackView_swipeEnabled, option.isSwipeEnabled));
@@ -205,8 +206,8 @@ private void update(float percentX, float percentY) {
         for (int i = 1; i < option.visibleCount; i++) {
             CardContainerView view = containers.get(i);
 
-            float currentScale = 1f - (i * 0.02f);
-            float nextScale = 1f - ((i - 1) * 0.02f);
+            float currentScale = 1f - (i * option.scaleDiff);
+            float nextScale = 1f - ((i - 1) * option.scaleDiff);
             float percent = currentScale + (nextScale - currentScale) * Math.abs(percentX);
             ViewCompat.setScaleX(view, percent);
             ViewCompat.setScaleY(view, percent);
@@ -371,6 +372,13 @@ public void setTranslationDiff(float translationDiff) {
         }
     }
 
+    public void setScaleDiff(float scaleDiff) {
+        option.scaleDiff = scaleDiff;
+        if (adapter != null) {
+            initialize(false);
+        }
+    }
+
     public void setStackFrom(StackFrom stackFrom) {
         option.stackFrom = stackFrom;
         if (adapter != null) {
diff --git a/cardstackview/src/main/java/com/yuyakaido/android/cardstackview/internal/CardStackOption.java b/cardstackview/src/main/java/com/yuyakaido/android/cardstackview/internal/CardStackOption.java
@@ -7,12 +7,13 @@
 
 public class CardStackOption {
     public int visibleCount = 3;
-    public float swipeThreshold = 0.75f;
+    public float swipeThreshold = 0.75f; // Percentage
     public float translationDiff = 12f; // DP
+    public float scaleDiff = 0.02f; // Percentage
     public StackFrom stackFrom = StackFrom.DEFAULT;
     public boolean isElevationEnabled = true;
     public boolean isSwipeEnabled = true;
-    public int leftOverlay = 0;
-    public int rightOverlay = 0;
+    public int leftOverlay = 0; // Layout Resource ID
+    public int rightOverlay = 0; // Layout Resource ID
     public List<SwipeDirection> swipeDirection = SwipeDirection.FREEDOM;
 }
diff --git a/cardstackview/src/main/res/values/attrs.xml b/cardstackview/src/main/res/values/attrs.xml
@@ -5,6 +5,7 @@
         <attr name="visibleCount" format="integer"/>
         <attr name="swipeThreshold" format="float"/>
         <attr name="translationDiff" format="float"/>
+        <attr name="scaleDiff" format="float"/>
         <attr name="stackFrom" format="enum">
             <enum name="bottom" value="0"/>
             <enum name="top" value="1"/>
diff --git a/images/scale-diff-10.png b/images/scale-diff-10.png
diff --git a/images/scale-diff-2.png b/images/scale-diff-2.png
diff --git a/sample/src/main/res/layout/activity_main.xml b/sample/src/main/res/layout/activity_main.xml
@@ -18,6 +18,7 @@
         app:visibleCount="3"
         app:swipeThreshold="0.75"
         app:translationDiff="12"
+        app:scaleDiff="0.02"
         app:stackFrom="top"
         app:elevationEnabled="true"
         app:swipeEnabled="true"
