From cf95e7b034b48d6683bbcd29aff68bfb8cc090dc Mon Sep 17 00:00:00 2001
From: tarsin <yuanqingxiang233@163.com>
Date: Sat, 17 Jun 2023 15:01:33 +0800
Subject: [PATCH] Upgrade compileSdk to 34

---
 app/build.gradle.kts                                        | 4 ++--
 .../labs/subscaleview/SubsamplingScaleImageView.kt          | 4 ++--
 .../tachiyomi/ui/reader/ReaderNavigationOverlayView.kt      | 6 +++---
 .../tachiyomi/ui/reader/viewer/webtoon/WebtoonFrame.kt      | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 15701ad65..dde28b0fc 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -21,8 +21,8 @@ plugins {
 }
 
 android {
-    compileSdk = 33
-    buildToolsVersion = "33.0.2"
+    compileSdk = 34
+    buildToolsVersion = "34.0.0"
     ndkVersion = "25.2.9519653"
 
     splits {
diff --git a/app/src/main/java/com/davemorrissey/labs/subscaleview/SubsamplingScaleImageView.kt b/app/src/main/java/com/davemorrissey/labs/subscaleview/SubsamplingScaleImageView.kt
index 852d82f55..7a5f4aec3 100644
--- a/app/src/main/java/com/davemorrissey/labs/subscaleview/SubsamplingScaleImageView.kt
+++ b/app/src/main/java/com/davemorrissey/labs/subscaleview/SubsamplingScaleImageView.kt
@@ -442,8 +442,8 @@ open class SubsamplingScaleImageView @JvmOverloads constructor(
         detector = GestureDetector(
             context,
             object : GestureDetector.SimpleOnGestureListener() {
-                override fun onFling(e1: MotionEvent, e2: MotionEvent, velocityX: Float, velocityY: Float): Boolean {
-                    if (panEnabled && isReady && vTranslate != null && (abs(e1.x - e2.x) > 50 || abs(e1.y - e2.y) > 50) && (abs(velocityX) > 500 || abs(velocityY) > 500) && !isZooming) {
+                override fun onFling(e1: MotionEvent?, e2: MotionEvent, velocityX: Float, velocityY: Float): Boolean {
+                    if (panEnabled && isReady && vTranslate != null && e1 != null && (abs(e1.x - e2.x) > 50 || abs(e1.y - e2.y) > 50) && (abs(velocityX) > 500 || abs(velocityY) > 500) && !isZooming) {
                         val vTranslateEnd = PointF(vTranslate!!.x + velocityX * 0.25F, vTranslate!!.y + velocityY * 0.25F)
                         val sCenterXEnd = (width / 2 - vTranslateEnd.x) / scale
                         val sCenterYEnd = (height / 2 - vTranslateEnd.y) / scale
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderNavigationOverlayView.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderNavigationOverlayView.kt
index 6e17affc7..c7a283453 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderNavigationOverlayView.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderNavigationOverlayView.kt
@@ -58,21 +58,21 @@ class ReaderNavigationOverlayView(context: Context, attributeSet: AttributeSet)
         strokeWidth = 8f
     }
 
-    override fun onDraw(canvas: Canvas?) {
+    override fun onDraw(canvas: Canvas) {
         if (navigation == null) return
 
         navigation?.regions?.forEach { region ->
             val rect = region.rectF
 
             // Scale rect from 1f,1f to screen width and height
-            canvas?.withScale(width.toFloat(), height.toFloat()) {
+            canvas.withScale(width.toFloat(), height.toFloat()) {
                 regionPaint.color = context.getColor(region.type.colorRes)
                 drawRect(rect, regionPaint)
             }
 
             // Don't want scale anymore because it messes with drawText
             // Translate origin to rect start (left, top)
-            canvas?.withTranslation(x = (width * rect.left), y = (height * rect.top)) {
+            canvas.withTranslation(x = (width * rect.left), y = (height * rect.top)) {
                 // Calculate center of rect width on screen
                 val x = width * (abs(rect.left - rect.right) / 2)
 
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonFrame.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonFrame.kt
index 323cf0f63..e78f7c3b6 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonFrame.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonFrame.kt
@@ -68,7 +68,7 @@ class WebtoonFrame(context: Context) : FrameLayout(context) {
         }
 
         override fun onFling(
-            e1: MotionEvent,
+            e1: MotionEvent?,
             e2: MotionEvent,
             velocityX: Float,
             velocityY: Float,