From 6e37f4b3f8ff4958282db3eaf59405a91eda438a Mon Sep 17 00:00:00 2001
From: kunfei <gekunfei@live.com>
Date: Thu, 8 Sep 2022 18:24:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                                  |  6 +++---
 .../app/ui/book/read/config/MoreConfigDialog.kt   |  2 +-
 .../java/io/legado/app/utils/MenuExtensions.kt    | 15 +++++++++++----
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 1385c82b7..58abfd2c2 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -18,7 +18,7 @@ def version = "3." + releaseTime()
 def gitCommits = Integer.parseInt('git rev-list HEAD --count'.execute().text.trim())
 
 android {
-    compileSdkVersion 32
+    compileSdkVersion 33
     buildToolsVersion "32.0.0"
     namespace 'io.legado.app'
     kotlinOptions {
@@ -42,7 +42,7 @@ android {
     defaultConfig {
         applicationId "io.legado.app"
         minSdkVersion 21
-        targetSdkVersion 32
+        targetSdkVersion 33
         versionCode 10000 + gitCommits
         versionName version
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -156,7 +156,7 @@ dependencies {
     implementation('com.github.android:renderscript-intrinsics-replacement-toolkit:b6363490c3')
 
     //androidX
-    implementation('androidx.core:core-ktx:1.8.0')
+    implementation('androidx.core:core-ktx:1.9.0')
     implementation('androidx.appcompat:appcompat:1.5.1')
     implementation('androidx.activity:activity-ktx:1.5.1')
     implementation('androidx.fragment:fragment-ktx:1.5.2')
diff --git a/app/src/main/java/io/legado/app/ui/book/read/config/MoreConfigDialog.kt b/app/src/main/java/io/legado/app/ui/book/read/config/MoreConfigDialog.kt
index 18a452c3b..25a1cf056 100644
--- a/app/src/main/java/io/legado/app/ui/book/read/config/MoreConfigDialog.kt
+++ b/app/src/main/java/io/legado/app/ui/book/read/config/MoreConfigDialog.kt
@@ -72,7 +72,7 @@ class MoreConfigDialog : DialogFragment() {
     class ReadPreferenceFragment : PreferenceFragment(),
         SharedPreferences.OnSharedPreferenceChangeListener {
 
-        private val slopSquare by lazy { ViewConfiguration.get(context).scaledTouchSlop }
+        private val slopSquare by lazy { ViewConfiguration.get(requireContext()).scaledTouchSlop }
 
         @SuppressLint("RestrictedApi")
         override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
diff --git a/app/src/main/java/io/legado/app/utils/MenuExtensions.kt b/app/src/main/java/io/legado/app/utils/MenuExtensions.kt
index 8bcd1223c..f69d9e3a9 100644
--- a/app/src/main/java/io/legado/app/utils/MenuExtensions.kt
+++ b/app/src/main/java/io/legado/app/utils/MenuExtensions.kt
@@ -65,10 +65,17 @@ fun Menu.applyOpenTint(context: Context) {
 fun Menu.iconItemOnLongClick(id: Int, function: (view: View) -> Unit) {
     findItem(id)?.let { item ->
         item.setActionView(R.layout.view_action_button)
-        item.actionView.contentDescription = item.title
-        item.actionView.findViewById<ImageButton>(R.id.item).setImageDrawable(item.icon)
-        item.actionView.setOnLongClickListener { function.invoke(item.actionView); true }
-        item.actionView.setOnClickListener { performIdentifierAction(id, 0) }
+        item.actionView?.run {
+            contentDescription = item.title
+            findViewById<ImageButton>(R.id.item).setImageDrawable(item.icon)
+            setOnLongClickListener {
+                function.invoke(this)
+                true
+            }
+            setOnClickListener {
+                performIdentifierAction(id, 0)
+            }
+        }
     }
 }