Fix SimpleOnGestureListener implementation in SkikoGesturesDetector.a…

…ndroid.kt
JetBrains · Jun 19, 2023 · 288c143 · 288c143
1 parent 8a83c49
commit 288c143
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/skiko/src/androidMain/kotlin/org/jetbrains/skiko/Convertors.android.kt b/skiko/src/androidMain/kotlin/org/jetbrains/skiko/Convertors.android.kt
@@ -99,11 +99,15 @@ private val swipeThreshold = 100
 private val swipeVelocityThreshold = 100
 
 internal fun toSkikoGestureDirection(
-    event1: MotionEvent, 
+    event1: MotionEvent?,
     event2: MotionEvent, 
     velocityX: Float, 
     velocityY: Float
 ): SkikoGestureEventDirection {
+    if (event1 == null) {
+        return SkikoGestureEventDirection.UNKNOWN
+    }
+
     val dx = event2.x - event1.x
     val dy = event2.y - event1.y
     if (abs(dx) > abs(dy)) {

diff --git a/skiko/src/androidMain/kotlin/org/jetbrains/skiko/SkikoGesturesDetector.android.kt b/skiko/src/androidMain/kotlin/org/jetbrains/skiko/SkikoGesturesDetector.android.kt
@@ -79,7 +79,7 @@ internal class SkikoGesturesDetector(
         }
 
         override fun onScroll(
-            event1: MotionEvent,
+            event1: MotionEvent?,
             event2: MotionEvent,
             distanceX: Float,
             distanceY: Float,
@@ -98,7 +98,7 @@ internal class SkikoGesturesDetector(
         }
 
         override fun onFling(
-            event1: MotionEvent, 
+            event1: MotionEvent?,
             event2: MotionEvent, 
             velocityX: Float, 
             velocityY: Float