fixed minimum swipe distance

sephiroth74 · Jan 3, 2019 · 6d0cb39 · 6d0cb39
1 parent 3e9b113
commit 6d0cb39
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -12,8 +12,8 @@ org.gradle.jvmargs=-Xmx1536m
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
 # Library Version
-VERSION_NAME=1.2.4
-VERSION_CODE=16
+VERSION_NAME=1.2.5
+VERSION_CODE=17
 GROUP=it.sephiroth.android.library.uigestures
 POM_DESCRIPTION=AndroidGestureRecognizer for Android
 POM_URL=https://github.com/sephiroth74/AndroidUIGestureRecognizer

diff --git a/...cognizer/src/androidTest/java/it/sephiroth/android/library/uigestures/TestSwipeGesture.kt b/...cognizer/src/androidTest/java/it/sephiroth/android/library/uigestures/TestSwipeGesture.kt
@@ -73,7 +73,7 @@ class TestSwipeGesture : TestBaseClass() {
         recognizer.direction = UISwipeGestureRecognizer.UP
         recognizer.actionListener = actionListener
         delegate.addGestureRecognizer(recognizer)
-        mainView.swipeUp(4)
+        mainView.swipeUp(3)
 
         latch.await(10, TimeUnit.SECONDS)
         assertEquals(0L, latch.count)

diff --git a/...recognizer/src/androidTest/java/it/sephiroth/android/library/uigestures/TestTapGesture.kt b/...recognizer/src/androidTest/java/it/sephiroth/android/library/uigestures/TestTapGesture.kt
@@ -54,6 +54,7 @@ class TestTapGesture : TestBaseClass() {
         recognizer.tag = "single-tap"
         recognizer.touchesRequired = 2
         recognizer.tapsRequired = 1
+        recognizer.tapTimeout = 400
 
         recognizer.actionListener = {
             activityTestRule.activity.actionListener.invoke(it)

diff --git a/...ognizer/src/main/java/it/sephiroth/android/library/uigestures/UISwipeGestureRecognizer.kt b/...ognizer/src/main/java/it/sephiroth/android/library/uigestures/UISwipeGestureRecognizer.kt
@@ -105,8 +105,7 @@ open class UISwipeGestureRecognizer(context: Context) : UIGestureRecognizer(cont
         minimumTouchDistance = configuration.scaledTouchSlop
         mMaximumFlingVelocity = configuration.scaledMaximumFlingVelocity
         mMinimumFlingVelocity = configuration.scaledMinimumFlingVelocity
-        minimumTouchDistance = (minimumTouchDistance * 3.5f).toInt()
-
+        minimumSwipeDistance = (minimumTouchDistance * 3f).toInt()
 
         mCurrentLocation = PointF()
     }
@@ -404,8 +403,8 @@ open class UISwipeGestureRecognizer(context: Context) : UIGestureRecognizer(cont
             x1: Float, y1: Float, x2: Float, y2: Float, velocityX: Float, velocityY: Float, distanceThreshold: Float): Int {
         val diffY = y2 - y1
         val diffX = x2 - x1
-        logMessage(Log.VERBOSE, "diff: $diffX, $diffY")
-        logMessage(Log.VERBOSE, "velocity: $velocityX, $velocityY")
+        logMessage(Log.VERBOSE, "diff: $diffX, $diffY, distanceThreshold: $distanceThreshold")
+        logMessage(Log.VERBOSE, "velocity: $velocityX, $velocityY, mMinimumFlingVelocity: $mMinimumFlingVelocity")
 
         if (Math.abs(diffX) > Math.abs(diffY)) {
             if (Math.abs(diffX) > distanceThreshold && Math.abs(velocityX) > mMinimumFlingVelocity) {