Merge pull request yuyakaido#16 from yuyakaido/translation-diff

yuyakaido · web-flow · commit e594b93a2edc · 2017-08-15T02:36:28.000+09:00
Added feature to set TranslationDiff
diff --git a/README.md b/README.md
@@ -20,6 +20,7 @@
     - [StackFrom](#stackfrom)
     - [VisibleCount](#visiblecount)
     - [ElevationEnabled](#elevationenabled)
+    - [TranslationDiff](#translationdiff)
     - [Overlay](#overlay)
     - [SwipeEnabled](#swipeenabled)
     - [SwipeDirection](#swipedirection)
@@ -115,6 +116,25 @@ or
 CardStackView#setElevationEnabled(false);
 ```
 
+## TranslationDiff
+
+The unit of TranslationDiff is **dp**.
+
+| Default | Value | Sample |
+| :----: | :----: | :----: |
+| | 8dp | ![TranslationDiff-18](https://github.com/yuyakaido/CardStackView/blob/master/images/translation-diff-8.png) |
+| ✅ | 12dp | ![TranslationDiff-12](https://github.com/yuyakaido/CardStackView/blob/master/images/translation-diff-12.png) |
+| | 16dp | ![TranslationDiff-16](https://github.com/yuyakaido/CardStackView/blob/master/images/translation-diff-16.png) |
+
+```xml
+<com.yuyakaido.android.cardstackview.CardStackView
+    app:translationDiff="12"/>
+```
+
+```java
+CardStackView#setTranslationDiff(12f);
+```
+
 ## 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
@@ -91,6 +91,7 @@ public CardStackView(Context context, AttributeSet attrs, int defStyle) {
         TypedArray array = context.obtainStyledAttributes(attrs, R.styleable.CardStackView);
         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));
         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));
@@ -210,12 +211,12 @@ private void update(float percentX, float percentY) {
             ViewCompat.setScaleX(view, percent);
             ViewCompat.setScaleY(view, percent);
 
-            float currentTranslationY = i * 30;
+            float currentTranslationY = i * Util.toPx(getContext(), option.translationDiff);
             if (option.stackFrom == StackFrom.Top) {
                 currentTranslationY *= -1;
             }
 
-            float nextTranslationY = (i - 1) * 30;
+            float nextTranslationY = (i - 1) * Util.toPx(getContext(), option.translationDiff);
             if (option.stackFrom == StackFrom.Top) {
                 nextTranslationY *= -1;
             }
@@ -363,6 +364,13 @@ public void setSwipeThreshold(float swipeThreshold) {
         }
     }
 
+    public void setTranslationDiff(float translationDiff) {
+        option.translationDiff = translationDiff;
+        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
@@ -8,6 +8,7 @@
 public class CardStackOption {
     public int visibleCount = 3;
     public float swipeThreshold = 0.75f;
+    public float translationDiff = 12f; // DP
     public StackFrom stackFrom = StackFrom.DEFAULT;
     public boolean isElevationEnabled = true;
     public boolean isSwipeEnabled = true;
diff --git a/cardstackview/src/main/java/com/yuyakaido/android/cardstackview/internal/Util.java b/cardstackview/src/main/java/com/yuyakaido/android/cardstackview/internal/Util.java
@@ -1,5 +1,6 @@
 package com.yuyakaido.android.cardstackview.internal;
 
+import android.content.Context;
 import android.graphics.Point;
 
 import com.yuyakaido.android.cardstackview.Quadrant;
@@ -8,6 +9,11 @@ public class Util {
 
     private Util() {}
 
+    public static float toPx(Context context, float dp) {
+        float scale = context.getResources().getDisplayMetrics().density;
+        return dp * scale + 0.5f;
+    }
+
     public static double getRadian(float x1, float y1, float x2, float y2) {
         float width = x2 - x1;
         float height = y1 - y2;
diff --git a/cardstackview/src/main/res/values/attrs.xml b/cardstackview/src/main/res/values/attrs.xml
@@ -4,6 +4,7 @@
     <declare-styleable name="CardStackView">
         <attr name="visibleCount" format="integer"/>
         <attr name="swipeThreshold" format="float"/>
+        <attr name="translationDiff" format="float"/>
         <attr name="stackFrom" format="enum">
             <enum name="bottom" value="0"/>
             <enum name="top" value="1"/>
diff --git a/images/translation-diff-12.png b/images/translation-diff-12.png
diff --git a/images/translation-diff-16.png b/images/translation-diff-16.png
diff --git a/images/translation-diff-8.png b/images/translation-diff-8.png
diff --git a/sample/src/main/res/layout/activity_main.xml b/sample/src/main/res/layout/activity_main.xml
@@ -17,6 +17,7 @@
         android:clipToPadding="false"
         app:visibleCount="3"
         app:swipeThreshold="0.75"
+        app:translationDiff="12"
         app:stackFrom="top"
         app:elevationEnabled="true"
         app:swipeEnabled="true"
