From d46d4cf6b4b529932a8a093e04d1f1beb8cf30fa Mon Sep 17 00:00:00 2001 From: M66B Date: Mon, 6 Jan 2020 19:06:06 +0100 Subject: [PATCH] Scroll instead of fling --- app/src/main/java/eu/faircode/email/SwipeListener.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/SwipeListener.java b/app/src/main/java/eu/faircode/email/SwipeListener.java index e19d6373e1..851d00d937 100644 --- a/app/src/main/java/eu/faircode/email/SwipeListener.java +++ b/app/src/main/java/eu/faircode/email/SwipeListener.java @@ -36,7 +36,7 @@ public class SwipeListener implements View.OnTouchListener { gestureDetector = new GestureDetector(context, new GestureDetector.SimpleOnGestureListener() { @Override - public boolean onFling(MotionEvent me1, MotionEvent me2, float vx, float vy) { + public boolean onScroll(MotionEvent me1, MotionEvent me2, float distanceX, float distanceY) { if (me1 == null || me2 == null) return false; if (me1.getPointerCount() > 1 || me2.getPointerCount() > 1) @@ -45,8 +45,11 @@ public class SwipeListener implements View.OnTouchListener { boolean consumed = false; int dx = Math.round(me2.getX() - me1.getX()); int dy = Math.round(me2.getY() - me1.getY()); + long dt = me2.getEventTime() - me1.getEventTime(); + long vx = dx * 1000 / dt; if (Math.abs(dx) > Math.abs(dy)) { - Log.i("Swipe dx=" + dx + "/" + MOVE_THRESHOLD + " vx=" + vx + "/" + SPEED_THRESHOLD); + Log.i("Swipe dx=" + dx + "/" + MOVE_THRESHOLD + + " dt=" + dt + " vx=" + vx + "/" + SPEED_THRESHOLD); if (Math.abs(dx) > MOVE_THRESHOLD && Math.abs(vx) > SPEED_THRESHOLD) try { if (dx > 0)