From f70b844b24d212adf8f558df17b4ddcc2ce8e5a3 Mon Sep 17 00:00:00 2001
From: Jays2Kings <jays@outlook.com>
Date: Tue, 26 Apr 2022 19:45:30 -0400
Subject: [PATCH] update kotlin + compilesdk

sdk to 32
kotlin to 1.6.20
---
 .../java/eu/kanade/tachiyomi/ui/library/LibraryController.kt  | 2 +-
 app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt | 2 +-
 .../main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt | 4 ++--
 .../java/eu/kanade/tachiyomi/ui/webview/WebViewActivity.kt    | 2 +-
 .../main/java/eu/kanade/tachiyomi/util/system/LocaleHelper.kt | 2 +-
 buildSrc/src/main/kotlin/Dependencies.kt                      | 4 ++--
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt
index d0bbbb67e0..1b86b294f4 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt
@@ -741,7 +741,7 @@ class LibraryController(
         }
         hopperGravity = gravityPref
 
-        val gestureDetector = GestureDetectorCompat(activity, LibraryGestureDetector(this))
+        val gestureDetector = GestureDetectorCompat(binding.root.context, LibraryGestureDetector(this))
         with(binding.roundedCategoryHopper) {
             listOf(categoryHopperLayout, upCategory, downCategory, categoryButton).forEach {
                 it.setOnTouchListener { _, event ->
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
index b7be3125e8..c96d85a391 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
@@ -1029,7 +1029,7 @@ open class MainActivity : BaseActivity<MainActivityBinding>(), DownloadServiceLi
     }
 
     override fun dispatchTouchEvent(ev: MotionEvent?): Boolean {
-        gestureDetector?.onTouchEvent(ev)
+        ev?.let { gestureDetector?.onTouchEvent(it) }
         if (ev?.action == MotionEvent.ACTION_DOWN) {
             if (snackBar != null && snackBar!!.isShown) {
                 val sRect = Rect()
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
index 25be0df315..32d6bf9310 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
@@ -341,8 +341,8 @@ class ReaderActivity : BaseRxActivity<ReaderPresenter>() {
         return true
     }
 
-    override fun onPrepareOptionsMenu(menu: Menu?): Boolean {
-        val splitItem = menu?.findItem(R.id.action_shift_double_page)
+    override fun onPrepareOptionsMenu(menu: Menu): Boolean {
+        val splitItem = menu.findItem(R.id.action_shift_double_page)
         splitItem?.isVisible = ((viewer as? PagerViewer)?.config?.doublePages ?: false) && !canShowSplitAtBottom()
         binding.chaptersSheet.shiftPageButton.isVisible = ((viewer as? PagerViewer)?.config?.doublePages ?: false) && canShowSplitAtBottom()
         (viewer as? PagerViewer)?.config?.let { config ->
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/webview/WebViewActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/webview/WebViewActivity.kt
index ba4b845aba..994cf1df2b 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/webview/WebViewActivity.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/webview/WebViewActivity.kt
@@ -92,7 +92,7 @@ open class WebViewActivity : BaseWebViewActivity() {
         return true
     }
 
-    override fun onPrepareOptionsMenu(menu: Menu?): Boolean {
+    override fun onPrepareOptionsMenu(menu: Menu): Boolean {
         val backItem = binding.toolbar.menu.findItem(R.id.action_web_back)
         val forwardItem = binding.toolbar.menu.findItem(R.id.action_web_forward)
         backItem?.isEnabled = binding.webview.canGoBack()
diff --git a/app/src/main/java/eu/kanade/tachiyomi/util/system/LocaleHelper.kt b/app/src/main/java/eu/kanade/tachiyomi/util/system/LocaleHelper.kt
index 4a3aaafa8d..f9dd89643f 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/util/system/LocaleHelper.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/util/system/LocaleHelper.kt
@@ -38,7 +38,7 @@ object LocaleHelper {
             LocaleListCompat.getAdjustedDefault()[0]
         } else {
             getLocale(lang)
-        }
+        } ?: Locale.getDefault()
         return locale.getDisplayName(locale).replaceFirstChar { it.uppercase(locale) }
     }
 
diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt
index 90c0d5c728..9d4a3e993b 100644
--- a/buildSrc/src/main/kotlin/Dependencies.kt
+++ b/buildSrc/src/main/kotlin/Dependencies.kt
@@ -18,7 +18,7 @@ object Versions {
     const val gradleVersions = "0.29.0"
     const val injekt = "65b0440"
     const val junit = "4.13"
-    const val kotlin = "1.6.10"
+    const val kotlin = "1.6.20"
     const val kotson = "2.5.0"
     const val mockito = "1.10.19"
     const val moshi = "1.9.3"
@@ -48,7 +48,7 @@ object LegacyPluginClassPath {
 }
 
 object AndroidVersions {
-    const val compileSdk = 31
+    const val compileSdk = 32
     const val minSdk = 23
     const val targetSdk = 30
     const val versionCode = 87