fix box being stuck on bottom and top as article goes back to base po…

…sition
klinker41 · Nov 12, 2016 · e998e80 · e998e80
1 parent bbf72ed
commit e998e80
Showing 1 changed file with 31 additions and 0 deletions.
diff --git a/library/src/main/java/xyz/klinker/android/article/view/ElasticDragDismissFrameLayout.java b/library/src/main/java/xyz/klinker/android/article/view/ElasticDragDismissFrameLayout.java
@@ -16,6 +16,7 @@
 
 package xyz.klinker.android.article.view;
 
+import android.animation.ValueAnimator;
 import android.annotation.TargetApi;
 import android.content.Context;
 import android.graphics.Canvas;
@@ -172,6 +173,36 @@ public void onStopNestedScroll(View child) {
                         .setInterpolator(fastOutSlowInInterpolator)
                         .setListener(null)
                         .start();
+
+                ValueAnimator animator = null;
+                if (draggingUp) {
+                    animator = ValueAnimator.ofFloat(draggingBackground.top,
+                            draggingBackground.bottom);
+                    animator.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
+                        @Override
+                        public void onAnimationUpdate(ValueAnimator valueAnimator) {
+                            draggingBackground.top = (float) valueAnimator.getAnimatedValue();
+                            invalidate();
+                        }
+                    });
+                } else if (draggingDown) {
+                    animator = ValueAnimator.ofFloat(draggingBackground.bottom,
+                            draggingBackground.top);
+                    animator.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
+                        @Override
+                        public void onAnimationUpdate(ValueAnimator valueAnimator) {
+                            draggingBackground.bottom = (float) valueAnimator.getAnimatedValue();
+                            invalidate();
+                        }
+                    });
+                }
+
+                if (animator != null) {
+                    animator.setInterpolator(fastOutSlowInInterpolator);
+                    animator.setDuration(200L);
+                    animator.start();
+                }
+
                 totalDrag = 0;
                 draggingDown = draggingUp = false;
                 dispatchDragCallback(0f, 0f, 0f, 0f);