raise targetSdk to 34

Razeeman · Feb 10, 2024 · c2f9701 · c2f9701
1 parent d86ed5a
commit c2f9701
Show file tree

Hide file tree

Showing 10 changed files with 15 additions and 21 deletions.
diff --git a/buildSrc/src/main/kotlin/com/example/util/simpletimetracker/Base.kt b/buildSrc/src/main/kotlin/com/example/util/simpletimetracker/Base.kt
@@ -4,5 +4,5 @@ object Base {
     const val versionCode = 37
     const val versionName = "1.36"
     const val minSDK = 21
-    const val currentSDK = 33
+    const val currentSDK = 34
 }
diff --git a/core/src/main/java/com/example/util/simpletimetracker/core/utils/TouchDetectors.kt b/core/src/main/java/com/example/util/simpletimetracker/core/utils/TouchDetectors.kt
@@ -109,7 +109,8 @@ class SwipeDetector(
     private val detector = GestureDetectorCompat(
         context,
         object : GestureDetector.SimpleOnGestureListener() {
-            override fun onScroll(e1: MotionEvent, e2: MotionEvent, distanceX: Float, distanceY: Float): Boolean {
+            override fun onScroll(e1: MotionEvent?, e2: MotionEvent, distanceX: Float, distanceY: Float): Boolean {
+                if (e1 == null) return false
                 val angle = Math.toDegrees(atan2(e1.y - e2.y, e2.x - e1.x).toDouble())
 
                 // Right

diff --git a/...le/util/simpletimetracker/feature_dialogs/colorSelection/customView/ColorSelectionView.kt b/...le/util/simpletimetracker/feature_dialogs/colorSelection/customView/ColorSelectionView.kt
@@ -80,9 +80,7 @@ class ColorSelectionView @JvmOverloads constructor(
         initGradientPaint(w.toFloat(), h.toFloat())
     }
 
-    override fun onDraw(canvas: Canvas?) {
-        if (canvas == null) return
-
+    override fun onDraw(canvas: Canvas) {
         // Draw base color.
         mainPaint.color = floatArrayOf(colorHue, 1f, 1f)
             .let(Color::HSVToColor)

diff --git a/...va/com/example/util/simpletimetracker/feature_dialogs/duration/customView/DurationView.kt b/...va/com/example/util/simpletimetracker/feature_dialogs/duration/customView/DurationView.kt
@@ -50,9 +50,7 @@ class DurationView @JvmOverloads constructor(
         setMeasuredDimension(w, h)
     }
 
-    override fun onDraw(canvas: Canvas?) {
-        if (canvas == null) return
-
+    override fun onDraw(canvas: Canvas) {
         val w = width.toFloat()
         val h = height.toFloat()
 

diff --git a/...java/com/example/util/simpletimetracker/feature_records/customView/RecordsCalendarView.kt b/...java/com/example/util/simpletimetracker/feature_records/customView/RecordsCalendarView.kt
@@ -197,8 +197,7 @@ class RecordsCalendarView @JvmOverloads constructor(
         setMeasuredDimension(w, h)
     }
 
-    override fun onDraw(canvas: Canvas?) {
-        if (canvas == null) return
+    override fun onDraw(canvas: Canvas) {
         if (data.isEmpty()) return
 
         val w = width.toFloat()

diff --git a/...a/com/example/util/simpletimetracker/feature_statistics_detail/customView/BarChartView.kt b/...a/com/example/util/simpletimetracker/feature_statistics_detail/customView/BarChartView.kt
@@ -113,8 +113,8 @@ class BarChartView @JvmOverloads constructor(
         setMeasuredDimension(w, h)
     }
 
-    override fun onDraw(canvas: Canvas?) {
-        if (canvas == null || bars.isEmpty()) return
+    override fun onDraw(canvas: Canvas) {
+        if (bars.isEmpty()) return
 
         val w = width.toFloat()
         val h = height.toFloat()

diff --git a/...example/util/simpletimetracker/feature_statistics_detail/customView/SeriesCalendarView.kt b/...example/util/simpletimetracker/feature_statistics_detail/customView/SeriesCalendarView.kt
@@ -95,9 +95,7 @@ class SeriesCalendarView @JvmOverloads constructor(
         setMeasuredDimension(w, h)
     }
 
-    override fun onDraw(canvas: Canvas?) {
-        if (canvas == null) return
-
+    override fun onDraw(canvas: Canvas) {
         val w = width.toFloat()
         val h = height.toFloat()
 

diff --git a/...ava/com/example/util/simpletimetracker/feature_statistics_detail/customView/SeriesView.kt b/...ava/com/example/util/simpletimetracker/feature_statistics_detail/customView/SeriesView.kt
@@ -74,8 +74,8 @@ class SeriesView @JvmOverloads constructor(
     }
 
     @Suppress("UNUSED_VARIABLE")
-    override fun onDraw(canvas: Canvas?) {
-        if (canvas == null || data.isEmpty()) return
+    override fun onDraw(canvas: Canvas) {
+        if (data.isEmpty()) return
 
         val w = width.toFloat()
         val h = height.toFloat()

diff --git a/...s/src/main/java/com/example/util/simpletimetracker/feature_views/pieChart/PieChartView.kt b/...s/src/main/java/com/example/util/simpletimetracker/feature_views/pieChart/PieChartView.kt
@@ -83,8 +83,8 @@ class PieChartView @JvmOverloads constructor(
         setMeasuredDimension(w, h)
     }
 
-    override fun onDraw(canvas: Canvas?) {
-        if (canvas == null || segments.isEmpty()) return
+    override fun onDraw(canvas: Canvas) {
+        if (segments.isEmpty()) return
 
         val w = width.toFloat()
         val h = height.toFloat()

diff --git a/...a/com/example/util/simpletimetracker/feature_widget/universal/customView/IconStackView.kt b/...a/com/example/util/simpletimetracker/feature_widget/universal/customView/IconStackView.kt
@@ -53,8 +53,8 @@ class IconStackView @JvmOverloads constructor(
         setMeasuredDimension(w, h)
     }
 
-    override fun onDraw(canvas: Canvas?) {
-        if (canvas == null || data.isEmpty()) return
+    override fun onDraw(canvas: Canvas) {
+        if (data.isEmpty()) return
 
         val w = width.toFloat()
         val h = height.toFloat()