fix

Author: bruce3x

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

@@ -18,12 +18,8 @@ public class CardFactory {
 
     private Options mOptions;
 
-    public CardFactory(Options options) {
+    public CardFactory(ViewGroup parent, Options options) {
         mOptions = options;
-    }
-
-    public void init(ViewGroup parent) {
-        mCardHolders.clear();
         for (int i = 0; i < parent.getChildCount(); i++) {
             mCardHolders.add(new CardHolder(parent, parent.getChildAt(i), i, mOptions));
         }
@@ -68,12 +64,12 @@ public CardHolder findByTouch(float touchY) {
         if (mCardHolders.size() == 0) return null;
 
         int index;
-        int last = mCardHolders.size() - 1;
-        CardHolder lastHolder = mCardHolders.get(last);
-        if (touchY > lastHolder.getFixedBottom()) {
+        int count = mCardHolders.size() - 1;
+        int span = count * mOptions.CARD_SPAN_CURRENT;
+        if (touchY > span + mOptions.CARD_HEIGHT) {
             return null;
-        } else if (touchY > last * mOptions.CARD_SPAN_CURRENT) {
-            index = last;
+        } else if (touchY > span) {
+            index = count;
         } else {
             index = (int) Math.floor(touchY / mOptions.CARD_SPAN_CURRENT);
         }

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

@@ -1,7 +1,6 @@
 package me.brucezz.cardstackview;
 
 import android.animation.ValueAnimator;
-import android.util.Log;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.animation.OvershootInterpolator;
@@ -58,7 +57,7 @@ public int getFixedLeft() {
     }
 
     public int getFixedRight() {
-        return mParent.getWidth() - mParent.getPaddingRight();
+        return getFixedLeft() + mView.getMeasuredWidth();
     }
 
     public int getFixedTop() {
@@ -169,7 +168,7 @@ public void onSwap(final CardHolder dragging) {
     /**
      * 判断是否在执行动画
      */
-    private boolean isAnimating() {
+    public boolean isAnimating() {
         return mRunningAnimator != null && mRunningAnimator.isRunning();
     }
 

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

@@ -58,16 +58,17 @@ public CardStackView(Context context, AttributeSet attrs, int defStyleAttr) {
     }
 
     private void initViews() {
+        mOptions = new Options();
+
         for (int i = 0; i < mCardAdapter.getItemCount(); i++) {
             addView(mCardAdapter.getView(null, i, this));
         }
-        mOptions = new Options();
+
+        mSlidingResistanceCalculator = new SlidingResistanceCalculator(2000f, mOptions.CARD_SPAN_OFFSET);
 
         updateOptions();
 
-        mCardFactory = new CardFactory(mOptions);
-        mCardFactory.init(this);
-        mSlidingResistanceCalculator = new SlidingResistanceCalculator(2000f, mOptions.CARD_SPAN_OFFSET);
+        mCardFactory = new CardFactory(this, mOptions);
         //Log.d(TAG, "init: " + mCardAdapter.getItemCount());
     }
 
@@ -169,7 +170,7 @@ public void onLongPress(MotionEvent e) {
             @Override
             public boolean onSingleTapUp(MotionEvent e) {
 
-                CardHolder touch = mCardFactory.findByTouch(e.getY() - getPaddingTop());
+                final CardHolder touch = mCardFactory.findByTouch(e.getY() - getPaddingTop());
                 if (touch != null && mOnCardClickListener != null) {
                     mOnCardClickListener.onClick(touch.mView, touch.mRealIndex, touch.mChildIndex);
                 }
@@ -183,12 +184,14 @@ public boolean onSingleTapUp(MotionEvent e) {
      * 计算一些常量值
      */
     private void updateOptions() {
-        mOptions.SCREEN_WIDTH = Util.getScreenWidthPixel(getContext());
+        int parentH = getMeasuredHeight() - getPaddingTop() - getPaddingBottom();
+        int parentW = getMeasuredWidth() - getPaddingLeft() - getPaddingRight();
+
+        // TODO: 2016/10/31 后面提供相关属性，不通过 adapter 提供
         mOptions.CARD_HEIGHT = mCardAdapter.getCardHeight();
-        mOptions.CARD_WIDTH = mOptions.SCREEN_WIDTH - getPaddingLeft() - getPaddingRight();
+        mOptions.CARD_WIDTH = parentW;
 
         mOptions.CARD_SPAN_NORMAL_MIN = mCardAdapter.getMinCardSpan();
-        int parentH = getMeasuredHeight() - getPaddingTop() - getPaddingBottom();
         int span = (parentH - mOptions.CARD_HEIGHT) / (mCardAdapter.getItemCount() - 1);
         mOptions.CARD_SPAN_NORMAL = Math.max(span, mOptions.CARD_SPAN_NORMAL_MIN);
 
@@ -241,7 +244,7 @@ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
             // wrap_content  use min span
             if (existsValidChild()) {
                 width = maxWidth;
-                height = mOptions.CARD_SPAN_NORMAL_MIN * (mCardFactory.size() - 1) + mOptions.CARD_HEIGHT;
+                height = mOptions.CARD_SPAN_NORMAL_MIN * (getChildCount() - 1) + mOptions.CARD_HEIGHT;
             }
             width += (getPaddingLeft() + getPaddingRight());
             height += (getPaddingTop() + getPaddingBottom());
@@ -269,11 +272,14 @@ protected void onLayout(boolean changed, int left, int top, int right, int botto
     /**
      * 更新卡片位置
      */
-    private void updateCardPosition() {
+    public void updateCardPosition() {
         if (!existsValidChild()) return;
 
         for (int i = 0; i < mCardFactory.size(); i++) {
-            mCardFactory.get(i).layoutFixed();
+            CardHolder holder = mCardFactory.get(i);
+            //if (!holder.isAnimating()) {
+                holder.layoutFixed();
+            //}
         }
     }
 
@@ -328,9 +334,6 @@ public interface OnPositionChangedListener {
         void onPositionChanged(List<Integer> position);
     }
 
-
-
-
     private class CardStackViewDataObserver extends DataSetObserver {
         @Override
         public void onChanged() {

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

@@ -7,10 +7,6 @@
  */
 
 public class Options {
-    /**
-     * 屏幕宽度，跟计算 Card 宽度有关
-     */
-    public int SCREEN_WIDTH;
     /**
      * 卡片当前绘制的间距
      */
@@ -68,11 +64,18 @@ public class Options {
      * 卡片间距重置动画时长
      */
     public long SPAN_RESET_DURATION = 300L;
+    /**
+     * 点击卡片之后移除其他卡片
+     */
+    public boolean CLICK_TO_SEPARATE = true;
+    /**
+     * 移出屏幕的动画时长
+     */
+    public long CARD_SLIP_OUT = 500L;
 
     @Override
     public String toString() {
         return "Options{" +
-            "\nSCREEN_WIDTH=" + SCREEN_WIDTH +
             ", \nCARD_SPAN_CURRENT=" + CARD_SPAN_CURRENT +
             ", \nCARD_SPAN_NORMAL=" + CARD_SPAN_NORMAL +
             ", \nCARD_SPAN_NORMAL_MIN=" + CARD_SPAN_NORMAL_MIN +