From 55fcb6179b2549cc64d9842af295425ce19e3220 Mon Sep 17 00:00:00 2001 From: Josia Pietsch Date: Thu, 18 Jul 2024 23:11:51 +0200 Subject: [PATCH] updated to SDK 34 --- app/build.gradle | 6 +++--- app/release/output-metadata.json | 4 ++-- .../main/java/de/jrpie/android/launcher/HomeActivity.kt | 7 +++++-- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 7e95a9c..32bf184 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -3,15 +3,15 @@ apply plugin: 'kotlin-android' apply plugin: 'kotlin-android-extensions' android { - compileSdkVersion 33 + compileSdkVersion 34 buildToolsVersion "34.0.0" defaultConfig { applicationId "de.jrpie.android.launcher" minSdkVersion 21 targetSdkVersion 35 - versionCode 13 - versionName "j-alpha-0.1" + versionCode 14 + versionName "j-alpha-0.2" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json index c439280..e44f2e5 100644 --- a/app/release/output-metadata.json +++ b/app/release/output-metadata.json @@ -11,8 +11,8 @@ "type": "SINGLE", "filters": [], "attributes": [], - "versionCode": 13, - "versionName": "j-alpha-0.1", + "versionCode": 14, + "versionName": "j-alpha-0.2", "outputFile": "app-release.apk" } ], diff --git a/app/src/main/java/de/jrpie/android/launcher/HomeActivity.kt b/app/src/main/java/de/jrpie/android/launcher/HomeActivity.kt index 17978b6..73e8e4a 100644 --- a/app/src/main/java/de/jrpie/android/launcher/HomeActivity.kt +++ b/app/src/main/java/de/jrpie/android/launcher/HomeActivity.kt @@ -133,7 +133,9 @@ class HomeActivity: UIObject, AppCompatActivity(), return true } - override fun onFling(e1: MotionEvent, e2: MotionEvent, dX: Float, dY: Float): Boolean { + override fun onFling(e1: MotionEvent?, e2: MotionEvent, dX: Float, dY: Float): Boolean { + + if (e1 == null) return false; val width = displayMetrics.widthPixels val height = displayMetrics.heightPixels @@ -223,7 +225,8 @@ class HomeActivity: UIObject, AppCompatActivity(), * because this inherits from GestureDetector.OnGestureListener */ override fun onDoubleTapEvent(event: MotionEvent): Boolean { return false } override fun onDown(event: MotionEvent): Boolean { return false } - override fun onScroll(e1: MotionEvent, e2: MotionEvent, dX: Float, dY: Float): Boolean { return false } + override fun onScroll(e1: MotionEvent?, e2: MotionEvent, dX: Float, dY: Float): Boolean { return false } override fun onShowPress(event: MotionEvent) {} override fun onSingleTapUp(event: MotionEvent): Boolean { return false } + }