velocity tracker returns invalid values

sephiroth74 · Jan 8, 2019 · 18e04ea · 18e04ea
1 parent b4f06ca
commit 18e04ea
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 15 deletions.
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
@@ -204,9 +204,8 @@ class TestSwipeGesture : TestBaseClass() {
         recognizer.direction = UISwipeGestureRecognizer.RIGHT
         recognizer.actionListener = actionListener
 
-        val recognizer2 = UISwipeGestureRecognizer(context)
-        recognizer2.tag = "swipe-up"
-        recognizer2.direction = UISwipeGestureRecognizer.UP
+        val recognizer2 = UITapGestureRecognizer(context)
+        recognizer2.tag = "tap"
         recognizer2.actionListener = {
             fail("unexpected")
         }
@@ -216,7 +215,7 @@ class TestSwipeGesture : TestBaseClass() {
         delegate.addGestureRecognizer(recognizer)
         delegate.addGestureRecognizer(recognizer2)
 
-        mainView.swipeRight(5)
+        mainView.swipeRight(10)
 
         latch.await(2, TimeUnit.SECONDS)
         assertEquals(0L, latch.count)

diff --git a/...rerecognizer/src/main/java/it/sephiroth/android/library/uigestures/UIGestureRecognizer.kt b/...rerecognizer/src/main/java/it/sephiroth/android/library/uigestures/UIGestureRecognizer.kt
@@ -329,7 +329,7 @@ abstract class UIGestureRecognizer(context: Context) : OnGestureRecognizerStateC
         if (!sDebug) {
             return
         }
-        Log.println(level, LOG_TAG, "[${javaClass.simpleName}] $fmt")
+        Log.println(level, LOG_TAG, "[${javaClass.simpleName}:$tag] $fmt")
     }
 
     @Suppress("unused")

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
@@ -194,7 +194,7 @@ open class UISwipeGestureRecognizer(context: Context) : UIGestureRecognizer(cont
             mVelocityTracker = VelocityTracker.obtain()
         }
 
-        mVelocityTracker!!.addMovement(event)
+        mVelocityTracker?.addMovement(event)
 
         when (action) {
             MotionEvent.ACTION_POINTER_DOWN -> {
@@ -213,7 +213,7 @@ open class UISwipeGestureRecognizer(context: Context) : UIGestureRecognizer(cont
                 mLastFocusLocation.set(mCurrentLocation)
                 mDownFocusLocation.set(mCurrentLocation)
 
-                mVelocityTracker!!.computeCurrentVelocity(1000, scaledMaximumFlingVelocity.toFloat())
+                mVelocityTracker?.computeCurrentVelocity(1000, scaledMaximumFlingVelocity.toFloat())
                 val upIndex = event.actionIndex
 
                 val id1 = event.getPointerId(upIndex)
@@ -231,7 +231,7 @@ open class UISwipeGestureRecognizer(context: Context) : UIGestureRecognizer(cont
                     val dot = x + y
 
                     if (dot < 0) {
-                        mVelocityTracker!!.clear()
+                        mVelocityTracker?.clear()
                         break
                     }
                 }
@@ -252,7 +252,7 @@ open class UISwipeGestureRecognizer(context: Context) : UIGestureRecognizer(cont
                     mLastFocusLocation.set(mCurrentLocation)
                     mDownFocusLocation.set(mCurrentLocation)
 
-                    mVelocityTracker!!.clear()
+                    mVelocityTracker?.clear()
 
                     setBeginFiringEvents(false)
                     removeMessages(MESSAGE_RESET)
@@ -264,14 +264,15 @@ open class UISwipeGestureRecognizer(context: Context) : UIGestureRecognizer(cont
                 scrollX = mLastFocusLocation.x - mCurrentLocation.x
                 scrollY = mLastFocusLocation.y - mCurrentLocation.y
 
+                mVelocityTracker?.computeCurrentVelocity(1000, scaledMaximumFlingVelocity.toFloat())
+                yVelocity = mVelocityTracker!!.yVelocity
+                xVelocity = mVelocityTracker!!.xVelocity
+
                 if (state == State.Possible) {
                     val distance = mCurrentLocation.distance(mDownFocusLocation)
                     logMessage(Log.INFO, "started: $mStarted, distance: $distance, slop: $scaledTouchSlop")
                     if (!mStarted) {
                         if (distance > scaledTouchSlop) {
-                            mVelocityTracker!!.computeCurrentVelocity(1000, scaledMaximumFlingVelocity.toFloat())
-                            yVelocity = mVelocityTracker!!.yVelocity
-                            xVelocity = mVelocityTracker!!.xVelocity
 
                             translationX -= scrollX
                             translationY -= scrollY
@@ -325,9 +326,6 @@ open class UISwipeGestureRecognizer(context: Context) : UIGestureRecognizer(cont
                         }
                     } else {
                         // touch has been recognized. now let's track the movement
-                        mVelocityTracker!!.computeCurrentVelocity(1000, scaledMaximumFlingVelocity.toFloat())
-                        yVelocity = mVelocityTracker!!.yVelocity
-                        xVelocity = mVelocityTracker!!.xVelocity
                         val time = event.eventTime - event.downTime
 
                         if (time > maximumTouchFlingTime) {
@@ -378,6 +376,8 @@ open class UISwipeGestureRecognizer(context: Context) : UIGestureRecognizer(cont
             }
 
             MotionEvent.ACTION_UP -> {
+                mVelocityTracker?.addMovement(event)
+
                 if (mVelocityTracker != null) {
                     mVelocityTracker!!.recycle()
                     mVelocityTracker = null