Merge pull request #14 from cketti/reset_list_item_height

Properly reset list item height after animation
timroes · Dec 22, 2013 · b08dcbe · b08dcbe
2 parents 0c4386d + a12885f
commit b08dcbe
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/EnhancedListView/src/main/java/de/timroes/android/listview/EnhancedListView.java b/EnhancedListView/src/main/java/de/timroes/android/listview/EnhancedListView.java
@@ -746,8 +746,9 @@ && velocityY < velocityX && mSwiping && isSwipeDirectionValid(mVelocityTracker.g
     private void performDismiss(final View dismissView, final View listItemView, final int dismissPosition) {
 
         final ViewGroup.LayoutParams lp = listItemView.getLayoutParams();
-        final int originalHeight = listItemView.getHeight();
+        final int originalLayoutHeight = lp.height;
 
+        int originalHeight = listItemView.getHeight();
         ValueAnimator animator = ValueAnimator.ofInt(originalHeight, 1).setDuration(mAnimationTime);
 
         animator.addListener(new AnimatorListenerAdapter() {
@@ -802,7 +803,7 @@ public void onAnimationEnd(Animator animation) {
                         ViewHelper.setAlpha(pendingDismiss.view, 1f);
                         ViewHelper.setTranslationX(pendingDismiss.view, 0);
                         lp = pendingDismiss.childView.getLayoutParams();
-                        lp.height = originalHeight;
+                        lp.height = originalLayoutHeight;
                         pendingDismiss.childView.setLayoutParams(lp);
                     }
 
@@ -900,4 +901,4 @@ private boolean isSwipeDirectionValid(float deltaX) {
         }
 
     }
-}
+}