move attr "CardHeight" & "CardMinSpan" to xml

Author: bruce3x

cardstackview/src/main/java/me/brucezz/cardstackview/CardAdapter.java

@@ -22,16 +22,6 @@ public abstract class CardAdapter {
      */
     public abstract int getItemCount();
 
-    /**
-     * 获取每一个 View 的高度
-     */
-    public abstract int getCardHeight();
-
-    /**
-     * View 最小间隔
-     */
-    public abstract int getMinCardSpan();
-
     /**
      * 获取卡片的排序位置
      * 如 原始第 1 张卡片，现在要摆放在第 3 的位置

cardstackview/src/main/java/me/brucezz/cardstackview/CardStackView.java

@@ -2,6 +2,7 @@
 
 import android.animation.ValueAnimator;
 import android.content.Context;
+import android.content.res.TypedArray;
 import android.database.DataSetObserver;
 import android.support.v4.view.GestureDetectorCompat;
 import android.support.v4.widget.ViewDragHelper;
@@ -42,6 +43,8 @@ public class CardStackView extends ViewGroup {
 
     private boolean mSkipLayout = false;
     private boolean mSkipTouch = false;
+    private int mCardHeight;
+    private int mCardMinSpan;
 
     public void setSkipLayout(boolean skipLayout) {
         mSkipLayout = skipLayout;
@@ -62,6 +65,11 @@ public CardStackView(Context context, AttributeSet attrs) {
     public CardStackView(Context context, AttributeSet attrs, int defStyleAttr) {
         super(context, attrs, defStyleAttr);
 
+        TypedArray ta = getContext().getTheme().obtainStyledAttributes(attrs, R.styleable.CardStackView, defStyleAttr, 0);
+        mCardHeight = ta.getDimensionPixelSize(R.styleable.CardStackView_card_height, Util.dp2px(getContext(), 160));
+        mCardMinSpan = ta.getDimensionPixelSize(R.styleable.CardStackView_card_min_span, Util.dp2px(getContext(), 40));
+        ta.recycle();
+
         initTouchCallback();
 
         setChildrenDrawingOrderEnabled(true);
@@ -195,11 +203,10 @@ private void updateOptions() {
         int parentH = getMeasuredHeight() - getPaddingTop() - getPaddingBottom();
         int parentW = getMeasuredWidth() - getPaddingLeft() - getPaddingRight();
 
-        // TODO: 2016/10/31 后面提供相关属性，不通过 adapter 提供
-        mOptions.CARD_HEIGHT = mCardAdapter.getCardHeight();
+        mOptions.CARD_HEIGHT = mCardHeight;
         mOptions.CARD_WIDTH = parentW;
 
-        mOptions.CARD_SPAN_NORMAL_MIN = mCardAdapter.getMinCardSpan();
+        mOptions.CARD_SPAN_NORMAL_MIN = mCardMinSpan;
         int span = (parentH - mOptions.CARD_HEIGHT) / (mCardAdapter.getItemCount() - 1);
         mOptions.CARD_SPAN_NORMAL = Math.max(span, mOptions.CARD_SPAN_NORMAL_MIN);
 

cardstackview/src/main/java/me/brucezz/cardstackview/Util.java

@@ -1,6 +1,7 @@
 package me.brucezz.cardstackview;
 
 import android.content.Context;
+import android.util.TypedValue;
 
 /**
  * Created by brucezz on 2016-09-26.
@@ -10,10 +11,7 @@
 
 public class Util {
 
-    /**
-     * 获取屏幕宽度
-     */
-    public static int getScreenWidthPixel(Context context) {
-        return context.getResources().getDisplayMetrics().widthPixels;
+    public static int dp2px(Context context, float dpValue) {
+        return (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, dpValue, context.getResources().getDisplayMetrics());
     }
 }

cardstackview/src/main/res/values/attrs.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <declare-styleable name="CardStackView">
+        <attr format="dimension" name="card_height"/>
+        <attr format="dimension" name="card_min_span"/>
+    </declare-styleable>
+</resources>

sample/src/main/java/me/brucezz/sample/MainActivity.java

@@ -153,7 +153,7 @@ public AnimationHelper(View view, int index) {
             startRadius = mCardView.getRadius();
             endRadius = 1f;// radius 减到 0 会自动产生透明度变化
 
-            startColor = getResources().getColor(R.color.colorPrimaryDark);
+            startColor = getResources().getColor(R.color.colorPrimary);
             endColor = mCards.get(mIndex).second.mBgColor;
 
             startElevation = mCardView.getMaxCardElevation();

sample/src/main/java/me/brucezz/sample/SimpleCardAdapter.java

@@ -61,16 +61,6 @@ public int getItemCount() {
         return mCards != null ? mCards.size() : 0;
     }
 
-    @Override
-    public int getCardHeight() {
-        return mContext.getResources().getDimensionPixelSize(R.dimen.card_height);
-    }
-
-    @Override
-    public int getMinCardSpan() {
-        return mContext.getResources().getDimensionPixelSize(R.dimen.card_span_min);
-    }
-
     @Override
     public int getOrder(int position) {
         return mCards.get(position).first;

sample/src/main/res/layout/activity_main.xml

@@ -14,7 +14,9 @@
         android:paddingBottom="@dimen/card_height"
         android:paddingLeft="8dp"
         android:paddingRight="8dp"
-        android:paddingTop="64dp"/>
+        android:paddingTop="64dp"
+        app:card_height="@dimen/card_height"
+        app:card_min_span="@dimen/card_span_min"/>
 
     <android.support.v7.widget.Toolbar
         android:id="@+id/toolbar"