Update compile and target SDK to 33 (Android 13)

Main breaking change: the `MotionEvent` parameters on `GestureDetector.OnGestureListener` interface are now non-nullable.
iSoron · Sep 21, 2023 · 426d96c · 426d96c
1 parent d97178d
commit 426d96c
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 15 deletions.
diff --git a/uhabits-android/build.gradle.kts b/uhabits-android/build.gradle.kts
@@ -42,13 +42,13 @@ kotlin {
 
 android {
 
-    compileSdk = 32
+    compileSdk = 33
 
     defaultConfig {
         versionCode = 20200
         versionName = "2.2.0"
         minSdk = 28
-        targetSdk = 32
+        targetSdk = 33
         applicationId = "org.isoron.uhabits"
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }

diff --git a/...oid/src/androidTest/java/org/isoron/uhabits/activities/common/views/FrequencyChartTest.kt b/...oid/src/androidTest/java/org/isoron/uhabits/activities/common/views/FrequencyChartTest.kt
@@ -18,6 +18,7 @@
  */
 package org.isoron.uhabits.activities.common.views
 
+import android.view.MotionEvent
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.filters.MediumTest
 import org.isoron.uhabits.BaseViewTest
@@ -52,7 +53,12 @@ class FrequencyChartTest : BaseViewTest() {
     @Test
     @Throws(Throwable::class)
     fun testRender_withDataOffset() {
-        view.onScroll(null, null, -dpToPixels(150), 0f)
+        view.onScroll(
+            MotionEvent.obtain(0L, 0L, MotionEvent.ACTION_SCROLL, 0f, 0f, 0),
+            MotionEvent.obtain(0L, 0L, MotionEvent.ACTION_SCROLL, 0f, 0f, 0),
+            -dpToPixels(150),
+            0f
+        )
         view.invalidate()
         assertRenders(view, BASE_PATH + "renderDataOffset.png")
     }

diff --git a/...android/src/androidTest/java/org/isoron/uhabits/activities/common/views/ScoreChartTest.kt b/...android/src/androidTest/java/org/isoron/uhabits/activities/common/views/ScoreChartTest.kt
@@ -18,6 +18,7 @@
  */
 package org.isoron.uhabits.activities.common.views
 
+import android.view.MotionEvent
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.filters.MediumTest
 import org.isoron.uhabits.BaseViewTest
@@ -63,7 +64,12 @@ class ScoreChartTest : BaseViewTest() {
     @Test
     @Throws(Throwable::class)
     fun testRender_withDataOffset() {
-        view.onScroll(null, null, -dpToPixels(150), 0f)
+        view.onScroll(
+            MotionEvent.obtain(0L, 0L, MotionEvent.ACTION_SCROLL, 0f, 0f, 0),
+            MotionEvent.obtain(0L, 0L, MotionEvent.ACTION_SCROLL, 0f, 0f, 0),
+            -dpToPixels(150),
+            0f
+        )
         view.invalidate()
         assertRenders(view, BASE_PATH + "renderDataOffset.png")
     }

diff --git a/uhabits-android/src/main/java/org/isoron/platform/gui/AndroidDataView.kt b/uhabits-android/src/main/java/org/isoron/platform/gui/AndroidDataView.kt
@@ -44,21 +44,21 @@ class AndroidDataView(
         addUpdateListener(this@AndroidDataView)
     }
 
-    override fun onTouchEvent(event: MotionEvent?) = detector.onTouchEvent(event)
-    override fun onDown(e: MotionEvent?) = true
-    override fun onShowPress(e: MotionEvent?) = Unit
+    override fun onTouchEvent(event: MotionEvent) = detector.onTouchEvent(event)
+    override fun onDown(e: MotionEvent) = true
+    override fun onShowPress(e: MotionEvent) = Unit
 
-    override fun onSingleTapUp(e: MotionEvent?): Boolean {
+    override fun onSingleTapUp(e: MotionEvent): Boolean {
         return handleClick(e, true)
     }
 
-    override fun onLongPress(e: MotionEvent?) {
+    override fun onLongPress(e: MotionEvent) {
         handleClick(e)
     }
 
     override fun onScroll(
-        e1: MotionEvent?,
-        e2: MotionEvent?,
+        e1: MotionEvent,
+        e2: MotionEvent,
         dx: Float,
         dy: Float
     ): Boolean {
@@ -79,8 +79,8 @@ class AndroidDataView(
     }
 
     override fun onFling(
-        e1: MotionEvent?,
-        e2: MotionEvent?,
+        e1: MotionEvent,
+        e2: MotionEvent,
         velocityX: Float,
         velocityY: Float
     ): Boolean {
@@ -100,7 +100,7 @@ class AndroidDataView(
         return false
     }
 
-    override fun onAnimationUpdate(animation: ValueAnimator?) {
+    override fun onAnimationUpdate(animation: ValueAnimator) {
         if (!scroller.isFinished) {
             scroller.computeScrollOffset()
             updateDataOffset()

diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/ScrollableChart.kt b/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/ScrollableChart.kt
@@ -116,7 +116,7 @@ abstract class ScrollableChart : View, GestureDetector.OnGestureListener, Animat
         return BundleSavedState(superState, bundle)
     }
 
-    override fun onScroll(e1: MotionEvent?, e2: MotionEvent?, dx: Float, dy: Float): Boolean {
+    override fun onScroll(e1: MotionEvent, e2: MotionEvent, dx: Float, dy: Float): Boolean {
         var dx = dx
         if (scrollerBucketSize == 0) return false
         if (abs(dx) > abs(dy)) {