moparisthebest/k-9
1
0
Fork 0
mirror of https://github.com/moparisthebest/k-9 synced 2025-01-12 06:08:25 -05:00
Code Issues Releases Wiki Activity

Issue 3875: Revert to the old way of determining minimum swipe distance.

Browse Source 
Fix my logic bug when determining left to right vs. right to left.
This commit is contained in:
Andrew Chen 2012-01-03 21:56:20 -08:00
parent 93ecf86806
commit 3c5a63adeb
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/com/fsck/k9/activity/K9Activity.java
View File

@ -141,7 +141,6 @@ public class K9Activity extends Activity {
this.gesturesEnabled = gesturesEnabled; this.gesturesEnabled = gesturesEnabled;
} }
private static final float SWIPE_MIN_DISTANCE_DIP = 130.0f;
private static final float SWIPE_MAX_OFF_PATH_DIP = 250f; private static final float SWIPE_MAX_OFF_PATH_DIP = 250f;
private static final float SWIPE_THRESHOLD_VELOCITY_DIP = 325f; private static final float SWIPE_THRESHOLD_VELOCITY_DIP = 325f;
@ -168,7 +167,6 @@ public class K9Activity extends Activity {
// Calculate the minimum distance required for this to count as a swipe. // Calculate the minimum distance required for this to count as a swipe.
// Convert the constant dips to pixels. // Convert the constant dips to pixels.
final float mGestureScale = getResources().getDisplayMetrics().density; final float mGestureScale = getResources().getDisplayMetrics().density;
final int minDistance = (int)(SWIPE_MIN_DISTANCE_DIP * mGestureScale + 0.5f);
final int minVelocity = (int)(SWIPE_THRESHOLD_VELOCITY_DIP * mGestureScale + 0.5f); final int minVelocity = (int)(SWIPE_THRESHOLD_VELOCITY_DIP * mGestureScale + 0.5f);
final int maxOffPath = (int)(SWIPE_MAX_OFF_PATH_DIP * mGestureScale + 0.5f); final int maxOffPath = (int)(SWIPE_MAX_OFF_PATH_DIP * mGestureScale + 0.5f);
@ -176,12 +174,14 @@ public class K9Activity extends Activity {
final float deltaX = e2.getX() - e1.getX(); final float deltaX = e2.getX() - e1.getX();
final float deltaY = e2.getY() - e1.getY(); final float deltaY = e2.getY() - e1.getY();
// Calculate the minimum distance required for this to be considered a swipe.
final int minDistance = (int)Math.abs(deltaY * 4);
if(K9.DEBUG) {
final boolean movedAcross = (Math.abs(deltaX) > Math.abs(deltaY * 4)); final boolean movedAcross = (Math.abs(deltaX) > Math.abs(deltaY * 4));
final boolean steadyHand = (Math.abs(deltaX / deltaY) > 2); final boolean steadyHand = (Math.abs(deltaX / deltaY) > 2);
if(K9.DEBUG) { Log.d(K9.LOG_TAG, String.format("Old swipe algorithm: movedAcross=%s steadyHand=%s result=%s", movedAcross, steadyHand, movedAcross && steadyHand));
Log.d(K9.LOG_TAG, "Old swipe algorithm: movedAcross=" + movedAcross + " steadyHand=" + steadyHand + " result=" + (movedAcross && steadyHand)); Log.d(K9.LOG_TAG, String.format("New swipe algorithm: deltaX=%.2f deltaY=%.2f minDistance=%d velocity=%.2f (min=%d)", deltaX, deltaY, minDistance, velocityX, minVelocity));
final int oldMin = (int)Math.abs(deltaY * 4);
Log.d(K9.LOG_TAG, String.format("New swipe algorithm: deltaX=%.2f deltaY=%.2f velocity=%.2f (min=%d, oldMin=%d)", deltaX, deltaY, velocityX, minVelocity, oldMin));
} }
try { try {
@ -196,7 +196,7 @@ public class K9Activity extends Activity {
return false; return false;
} }
// right to left swipe // right to left swipe
if (deltaX < minDistance) { if (deltaX < (minDistance * -1)) {
onSwipeRightToLeft(e1, e2); onSwipeRightToLeft(e1, e2);
if(K9.DEBUG) if(K9.DEBUG)
Log.d(K9.LOG_TAG, "New swipe algorithm: Right to Left swipe OK."); Log.d(K9.LOG_TAG, "New swipe algorithm: Right to Left swipe OK.");