Revert "Fling collapsing react view screens (#1213)" (#1214)

This reverts commit a2a9324b1e.

android/app/src/main/java/com/reactnativenavigation/screens/CollapsingSingleScreen.java

@@ -81,9 +81,9 @@ public class CollapsingSingleScreen extends SingleScreen {
                     @Override
                     public void onFling(CollapseAmount amount) {
                         if (screenParams.styleParams.drawScreenBelowTopBar) {
-                            ((CollapsingView) contentView).fling(amount);
+                            ((CollapsingView) contentView).collapse(amount);
                         }
-                        topBar.fling(amount);
+                        topBar.collapse(amount);
                     }
                 },
                 getCollapseBehaviour()

android/app/src/main/java/com/reactnativenavigation/screens/CollapsingViewPagerScreen.java

@@ -80,8 +80,8 @@ public class CollapsingViewPagerScreen extends ViewPagerScreen {
 
                     @Override
                     public void onFling(CollapseAmount amount) {
-                        topBar.fling(amount);
-                        ((CollapsingView) viewPager).fling(amount);
+                        topBar.collapse(amount);
+                        ((CollapsingView) viewPager).collapse(amount);
                     }
                 },
                 getCollapseBehaviour()

android/app/src/main/java/com/reactnativenavigation/views/CollapsingContentView.java

@@ -57,11 +57,6 @@ public class CollapsingContentView extends ContentView implements CollapsingView
         viewCollapser.collapse(amount);
     }
 
-    @Override
-    public void fling(CollapseAmount amount) {
-        viewCollapser.fling(amount);
-    }
-
     public void destroy() {
         if (scrollViewDetector != null) {
             scrollViewDetector.destroy();

android/app/src/main/java/com/reactnativenavigation/views/collapsingToolbar/CollapseAmount.java

@@ -24,11 +24,11 @@ public class CollapseAmount {
         return amount != null;
     }
 
-    boolean collapseToTop() {
+    public boolean collapseToTop() {
         return direction == CollapseCalculator.Direction.Up;
     }
 
-    boolean collapseToBottom() {
+    public boolean collapseToBottom() {
         return direction == CollapseCalculator.Direction.Down;
     }
 

android/app/src/main/java/com/reactnativenavigation/views/collapsingToolbar/CollapseCalculator.java

@@ -2,7 +2,6 @@ package com.reactnativenavigation.views.collapsingToolbar;
 
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
-import android.util.Log;
 import android.view.GestureDetector;
 import android.view.MotionEvent;
 import android.view.ViewConfiguration;
@@ -13,9 +12,6 @@ import com.reactnativenavigation.views.collapsingToolbar.behaviours.CollapseBeha
 import com.reactnativenavigation.views.collapsingToolbar.behaviours.TitleBarHideOnScrollBehaviour;
 
 public class CollapseCalculator {
-    private static final int FLING_DISTANCE_PIXELS_THRESHOLD = 100;
-    private static final int FLING_VELOCITY = 7000;
-
     public enum Direction {
         Up, Down, None
     }
@@ -36,12 +32,12 @@ public class CollapseCalculator {
     private int scrollY = 0;
     private float totalCollapse = 0;
     private float totalCollapseDeltaSinceTouchDown = 0;
-    private final ViewConfiguration viewConfiguration;
+    private final int scaledTouchSlop;
 
     public CollapseCalculator(final CollapsingView collapsingView, CollapseBehaviour collapseBehaviour) {
         this.view = collapsingView;
         this.collapseBehaviour = collapseBehaviour;
-        viewConfiguration = ViewConfiguration.get(NavigationApplication.instance);
+        scaledTouchSlop = ViewConfiguration.get(NavigationApplication.instance).getScaledTouchSlop();
         setFlingDetector();
     }
 
@@ -50,27 +46,10 @@ public class CollapseCalculator {
             flingDetector =
                     new GestureDetector(NavigationApplication.instance, new GestureDetector.SimpleOnGestureListener() {
                         @Override
-                        public boolean onFling(MotionEvent e1, MotionEvent e2, float velocityX, final float velocityY) {
+                        public boolean onFling(MotionEvent e1, MotionEvent e2, float velocityX, float velocityY) {
                             final Direction direction = getScrollDirection(e1, e2);
-                            final float diff = Math.abs(e2.getRawY() - e1.getRawY());
-                            if (Math.abs(velocityY) < viewConfiguration.getScaledMinimumFlingVelocity() ||
-                                diff < FLING_DISTANCE_PIXELS_THRESHOLD) {
-                                Log.w("FLING", "Consuming fling v: [" + velocityY + "] dy: [" + diff + "]");
-                                return false;
-                            }
-
                             if (canCollapse(direction) && totalCollapse != 0) {
                                 flingListener.onFling(new CollapseAmount(direction));
-                                if (direction == Direction.Up) {
-                                    scrollView.postDelayed(new Runnable() {
-                                        @Override
-                                        public void run() {
-                                            int max = (int) Math.max(Math.abs(velocityY), FLING_VELOCITY);
-                                            scrollView.fling(max);
-                                        }
-                                    }, ViewCollapser.FLING_DURATION);
-                                }
-
                                 return true;
                             }
                             return false;
@@ -97,8 +76,7 @@ public class CollapseCalculator {
     @NonNull
     CollapseAmount calculate(MotionEvent event) {
         updateInitialTouchY(event);
-        final boolean isFling = flingDetector.onTouchEvent(event);
-        CollapseAmount touchUpCollapse = shouldCollapseOnTouchUp(event, isFling);
+        CollapseAmount touchUpCollapse = shouldCollapseOnTouchUp(event);
         if (touchUpCollapse != CollapseAmount.None) {
             previousTouchEvent = MotionEvent.obtain(event);
             return touchUpCollapse;
@@ -119,8 +97,9 @@ public class CollapseCalculator {
         }
     }
 
-    private CollapseAmount shouldCollapseOnTouchUp(MotionEvent event, boolean isFling) {
-        if (isTouchUp(event) && collapseBehaviour.shouldCollapseOnTouchUp() && !isFling) {
+    private CollapseAmount shouldCollapseOnTouchUp(MotionEvent event) {
+        if ((collapseBehaviour.shouldCollapseOnTouchUp())
+            && !flingDetector.onTouchEvent(event) && isTouchUp(event)) {
             final float visibilityPercentage = view.getCurrentCollapseValue() / view.getFinalCollapseValue();
             Direction direction = visibilityPercentage >= 0.5f ? Direction.Up : Direction.Down;
             if (canCollapse(direction) && totalCollapse != 0) {
@@ -216,7 +195,7 @@ public class CollapseCalculator {
         totalCollapseDeltaSinceTouchDown += Math.abs(y - previousCollapseY);
         previousCollapseY = y;
         previousTouchEvent = MotionEvent.obtain(event);
-        return totalCollapseDeltaSinceTouchDown < viewConfiguration.getScaledTouchSlop() ? CollapseAmount.None : new CollapseAmount(collapse);
+        return totalCollapseDeltaSinceTouchDown < scaledTouchSlop ? CollapseAmount.None : new CollapseAmount(collapse);
     }
 
     private float calculateCollapse(float y) {

android/app/src/main/java/com/reactnativenavigation/views/collapsingToolbar/CollapsingTopBar.java

@@ -138,11 +138,6 @@ public class CollapsingTopBar extends TopBar implements CollapsingView {
         }
     }
 
-    @Override
-    public void fling(CollapseAmount amount) {
-        viewCollapser.fling(amount, (CollapsingTitleBar) titleBar, header);
-    }
-
     public void onScrollViewAdded(ScrollView scrollView) {
         scrollListener.onScrollViewAdded(scrollView);
     }

android/app/src/main/java/com/reactnativenavigation/views/collapsingToolbar/CollapsingTopBarReactHeader.java

@@ -115,7 +115,6 @@ public class CollapsingTopBarReactHeader extends ContentView implements Collapsi
     }
 
     private void onTouchDown(MotionEvent ev) {
-        listener.onTouch(ev);
         if (touchDown == -1) {
             touchDown = (int) ev.getRawY();
         }

android/app/src/main/java/com/reactnativenavigation/views/collapsingToolbar/CollapsingView.java

@@ -10,6 +10,4 @@ public interface CollapsingView {
     View asView();
 
     void collapse(CollapseAmount amount);
-
-    void fling(CollapseAmount amount);
 }

android/app/src/main/java/com/reactnativenavigation/views/collapsingToolbar/CollapsingViewPager.java

@@ -43,9 +43,4 @@ public class CollapsingViewPager extends ViewPager implements CollapsingView {
     public void collapse(CollapseAmount amount) {
         viewCollapser.collapse(amount);
     }
-
-    @Override
-    public void fling(CollapseAmount amount) {
-        viewCollapser.fling(amount);
-    }
 }

android/app/src/main/java/com/reactnativenavigation/views/collapsingToolbar/ViewCollapser.java

@@ -2,24 +2,12 @@ package com.reactnativenavigation.views.collapsingToolbar;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
-import android.animation.ObjectAnimator;
-import android.animation.ValueAnimator;
-import android.support.annotation.NonNull;
-import android.view.View;
 import android.view.ViewPropertyAnimator;
-import android.view.animation.DecelerateInterpolator;
 
 public class ViewCollapser {
     private static final int DURATION = 160;
-    public static final int FLING_DURATION = 40;
     private CollapsingView view;
     private ViewPropertyAnimator animator;
-    private final ValueAnimator.AnimatorUpdateListener LISTENER =
-            new ValueAnimator.AnimatorUpdateListener() {
-                @Override
-                public void onAnimationUpdate(ValueAnimator animation) {
-                }
-            };
 
     public ViewCollapser(CollapsingView view) {
         this.view = view;
@@ -67,32 +55,4 @@ public class ViewCollapser {
                 });
         animator.start();
     }
-
-    void fling(final CollapseAmount amount, final CollapsingTitleBar titleBar, final CollapsingTopBarReactHeader header) {
-        fling(amount, new ValueAnimator.AnimatorUpdateListener() {
-            @Override
-            public void onAnimationUpdate(ValueAnimator animation) {
-                titleBar.collapse(new CollapseAmount((Float) animation.getAnimatedValue()));
-                header.collapse((Float) animation.getAnimatedValue());
-            }
-        });
-    }
-
-    public void fling(CollapseAmount amount) {
-        fling(amount, LISTENER);
-    }
-
-    private void fling(final CollapseAmount amount, @NonNull final ValueAnimator.AnimatorUpdateListener updateListener) {
-        final float translation = amount.collapseToTop() ? view.getFinalCollapseValue() : 0;
-        ObjectAnimator animator = ObjectAnimator.ofFloat(view.asView(), View.TRANSLATION_Y, translation);
-        animator.setDuration(FLING_DURATION);
-        animator.setInterpolator(new DecelerateInterpolator());
-        animator.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
-            @Override
-            public void onAnimationUpdate(ValueAnimator animation) {
-                updateListener.onAnimationUpdate(animation);
-            }
-        });
-        animator.start();
-    }
 }

android/app/src/main/java/com/reactnativenavigation/views/collapsingToolbar/behaviours/CollapseTopBarBehaviour.java

@@ -3,7 +3,7 @@ package com.reactnativenavigation.views.collapsingToolbar.behaviours;
 public class CollapseTopBarBehaviour implements CollapseBehaviour {
     @Override
     public boolean shouldCollapseOnFling() {
-        return true;
+        return false;
     }
 
     @Override