From 697d48966233c81bab63a7f0e9da4cdc736f1535 Mon Sep 17 00:00:00 2001 From: Alexander Maryanovsky Date: Tue, 20 Jun 2023 16:54:21 +0300 Subject: [PATCH] Fix SimpleOnGestureListener implementation in SkikoGesturesDetector.android.kt (#725) --- .../kotlin/org/jetbrains/skiko/Convertors.android.kt | 6 +++++- .../org/jetbrains/skiko/SkikoGesturesDetector.android.kt | 4 ++-- 2 files changed, 7 insertions(+), 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 index 910cbf77e..adff99950 100644 --- 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 index 190644a3f..206287d06 100644 --- 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