sample temp fix

Author: bruce3x

sample/build.gradle

@@ -26,4 +26,5 @@ dependencies {
     compile project(':cardstackview')
     compile 'com.android.support:cardview-v7:24.2.1'
     compile 'com.jaeger.statusbaruitl:library:1.3.0'
+    compile 'com.makeramen:roundedimageview:2.2.1'
 }

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

@@ -2,6 +2,7 @@
 
 import android.os.Bundle;
 import android.support.annotation.Nullable;
+import android.support.v4.content.ContextCompat;
 import android.support.v7.app.AppCompatActivity;
 import android.view.View;
 import android.widget.ImageView;
@@ -31,7 +32,9 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         mContent = findViewById(R.id.detail_content);
 
         Card card = getIntent().getParcelableExtra("card");
-        mImageView.setImageResource(card.mImage);
+        int padding = getIntent().getIntExtra("padding", 0);
+        mImageView.getLayoutParams().height -= padding;
+        mImageView.setImageDrawable(ContextCompat.getDrawable(this, card.mImage));
         StatusBarUtil.setColor(this, card.mBgColor);
         mTextView.setText(card.mTitle);
 
@@ -45,7 +48,7 @@ private void animContent() {
 
     @Override
     public void onBackPressed() {
-        //setResult(RESULT_OK);
+        setResult(RESULT_OK);
         finish();
         overridePendingTransition(0, 0);
     }

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

@@ -150,14 +150,23 @@ private class AnimationHelper {
         public int startBottom;
         public int endBottom;
 
+        public int startPaddingLeft;
+        public int endPaddingLeft;
+        public int startPaddingRight;
+        public int endPaddingRight;
+        public int startPaddingTop;
+        public int endPaddingTop;
+        public int startPaddingBottom;
+        public int endPaddingBottom;
+
         public float startRadius;
         public float endRadius;
 
         public @ColorInt int startColor;
         public @ColorInt int endColor;
         private ArgbEvaluator mArgbEvaluator = new ArgbEvaluator();
 
-        public static final long ANIMATION_DURATION_CARD = 5000L;
+        public static final long ANIMATION_DURATION_CARD = 500L;
         public static final long ANIMATION_DURATION_ALPHA = 300L;
 
         public AnimationHelper(View view, int index) {
@@ -171,10 +180,17 @@ public AnimationHelper(View view, int index) {
             startTop = mCardView.getTop();
             startBottom = mCardView.getBottom();
 
-            endLeft = 0;
-            endRight = mCardView.getWidth() + 2 * mCardView.getLeft();
-            endTop = 0;
-            endBottom = mCardView.getHeight();
+            endLeft = -mCardView.getPaddingLeft();
+            endRight = mCardView.getWidth() + 2 * mCardView.getLeft() + mCardView.getPaddingRight();
+            endTop = -mCardView.getPaddingTop();
+            endBottom = mCardView.getHeight() - mCardView.getPaddingTop();
+
+            startPaddingLeft = mCardView.getPaddingLeft();
+            startPaddingRight = mCardView.getPaddingRight();
+            startPaddingTop = mCardView.getPaddingTop();
+            startPaddingBottom = mCardView.getPaddingBottom();
+
+            endPaddingLeft = endPaddingRight = endPaddingTop = endPaddingBottom = 0;
 
             startRadius = mCardView.getRadius();
             endRadius = 1f;// radius 减到 0 会自动产生透明度变化
@@ -221,6 +237,7 @@ public void onAnimationUpdate(ValueAnimator animation) {
             animator.addListener(new Animator.AnimatorListener() {
                 @Override
                 public void onAnimationStart(Animator animation) {
+                    mCardStackView.setSkipLayout(true);
                     if (!reverse) {
                         mTitle.animate().alpha(0f).setDuration(ANIMATION_DURATION_ALPHA).start();
                         mToolbar.animate().alpha(0f).setDuration(ANIMATION_DURATION_ALPHA).start();
@@ -237,9 +254,16 @@ public void onAnimationEnd(Animator animation) {
                     } else {
                         Intent intent = new Intent(MainActivity.this, DetailActivity.class);
                         intent.putExtra("card", mCards.get(mIndex));
+                        intent.putExtra("padding", startPaddingBottom);
                         startActivityForResult(intent, REQ_DETAIL);
                         overridePendingTransition(0, 0);
                     }
+                    mCardStackView.post(new Runnable() {
+                        @Override
+                        public void run() {
+                            mCardStackView.setSkipLayout(false);
+                        }
+                    });
                 }
 
                 @Override
@@ -273,7 +297,6 @@ public void resetViews() {
             }
 
             update(0f);
-            //mImageView.postInvalidate();
             mTitle.setAlpha(1f);
             mToolbar.setAlpha(1f);
         }

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

@@ -10,7 +10,7 @@
         android:layout_width="match_parent"
         android:layout_height="192dp"
         android:scaleType="centerCrop"
-        tools:src="@drawable/calendar"
+        tools:src="@drawable/knowledge"
         />
 
     <TextView