From 759af97742b5643d6f53e7bce13d5ef6e088fcde Mon Sep 17 00:00:00 2001 From: tibbi Date: Thu, 6 Oct 2022 14:21:15 +0200 Subject: [PATCH] making some motionevents not nullable again --- .../launcher/activities/MainActivity.kt | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/launcher/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/launcher/activities/MainActivity.kt index d9ab59f..b768eac 100644 --- a/app/src/main/kotlin/com/simplemobiletools/launcher/activities/MainActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/launcher/activities/MainActivity.kt @@ -424,14 +424,12 @@ class MainActivity : SimpleActivity(), FlingListener { } private class MyGestureListener(private val flingListener: FlingListener) : GestureDetector.SimpleOnGestureListener() { - override fun onSingleTapUp(event: MotionEvent?): Boolean { - if (event != null) { - (flingListener as MainActivity).homeScreenClicked(event.x, event.y) - } + override fun onSingleTapUp(event: MotionEvent): Boolean { + (flingListener as MainActivity).homeScreenClicked(event.x, event.y) return super.onSingleTapUp(event) } - override fun onFling(event1: MotionEvent?, event2: MotionEvent?, velocityX: Float, velocityY: Float): Boolean { + override fun onFling(event1: MotionEvent, event2: MotionEvent, velocityX: Float, velocityY: Float): Boolean { // ignore fling events just after releasing an icon from dragging if (System.currentTimeMillis() - mLastUpEvent < 500L) { return true @@ -445,10 +443,8 @@ class MainActivity : SimpleActivity(), FlingListener { return true } - override fun onLongPress(event: MotionEvent?) { - if (event != null) { - (flingListener as MainActivity).homeScreenLongPressed(event.x, event.y) - } + override fun onLongPress(event: MotionEvent) { + (flingListener as MainActivity).homeScreenLongPressed(event.x, event.y) } }