From d90d680d39d0f5747498095a616aa165d9cc0b6e Mon Sep 17 00:00:00 2001 From: Floens Date: Fri, 25 Dec 2015 12:10:41 +0100 Subject: [PATCH] Don't swipe when the touch started from the left (drawer open) Fling with a minimum speed --- .../ui/NavigationControllerContainerLayout.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Clover/app/src/main/java/org/floens/chan/controller/ui/NavigationControllerContainerLayout.java b/Clover/app/src/main/java/org/floens/chan/controller/ui/NavigationControllerContainerLayout.java index 8929ef36..f4a79480 100644 --- a/Clover/app/src/main/java/org/floens/chan/controller/ui/NavigationControllerContainerLayout.java +++ b/Clover/app/src/main/java/org/floens/chan/controller/ui/NavigationControllerContainerLayout.java @@ -141,7 +141,7 @@ public class NavigationControllerContainerLayout extends FrameLayout { float x = (event.getX() - interceptedEvent.getX()); float y = (event.getY() - interceptedEvent.getY()); - if (Math.abs(y) >= slopPixels) { + if (Math.abs(y) >= slopPixels || interceptedEvent.getX() < dp(20)) { // Logger.test("blockTracking = true"); blockTracking = true; } @@ -214,12 +214,13 @@ public class NavigationControllerContainerLayout extends FrameLayout { if (translationX > 0) { boolean doFlingAway = false; -// Logger.test("velocity = %d", velocity); - - if ((velocity > 0 && Math.abs(velocity) > 2500 && Math.abs(velocity) < maxFlingPixels) || translationX >= getWidth() * 3 / 4) { + if ((velocity > 0 && Math.abs(velocity) > dp(800) && Math.abs(velocity) < maxFlingPixels) || translationX >= getWidth() * 3 / 4) { // int left = getWidth() - translationX; // int flingVelocity = Math.max(velocity, 0); +// Logger.test("flinging with velocity = %d", velocity); + velocity = Math.max(dp(2000), velocity); + scroller.fling(translationX, 0, velocity, 0, 0, Integer.MAX_VALUE, 0, 0); // Logger.test("finalX = %d getWidth = %d", scroller.getFinalX(), getWidth());