From 747ddd04febaf91cd7a6399cf4ebceafa1b6295b Mon Sep 17 00:00:00 2001
From: Horis <8674809+821938089@users.noreply.github.com>
Date: Tue, 27 Aug 2024 12:56:45 +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

---
 .../java/io/legado/app/ui/book/read/ReadBookActivity.kt     | 6 +++---
 .../legado/app/ui/widget/recycler/DragSelectTouchHelper.kt  | 5 ++---
 .../legado/app/ui/widget/recycler/scroller/FastScroller.kt  | 1 +
 .../java/io/legado/app/ui/widget/seekbar/VerticalSeekBar.kt | 1 +
 .../legado/app/ui/widget/seekbar/VerticalSeekBarWrapper.kt  | 1 +
 .../app/ui/widget/text/ScrollMultiAutoCompleteTextView.kt   | 1 +
 .../java/io/legado/app/ui/widget/text/ScrollTextView.kt     | 1 +
 gradle/libs.versions.toml                                   | 2 +-
 8 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/io/legado/app/ui/book/read/ReadBookActivity.kt b/app/src/main/java/io/legado/app/ui/book/read/ReadBookActivity.kt
index 7b01da78f..5b66a354a 100644
--- a/app/src/main/java/io/legado/app/ui/book/read/ReadBookActivity.kt
+++ b/app/src/main/java/io/legado/app/ui/book/read/ReadBookActivity.kt
@@ -591,9 +591,9 @@ class ReadBookActivity : BaseReadBookActivity(),
     /**
      * 按键拦截,显示菜单
      */
-    override fun dispatchKeyEvent(event: KeyEvent?): Boolean {
-        val keyCode = event?.keyCode
-        val action = event?.action
+    override fun dispatchKeyEvent(event: KeyEvent): Boolean {
+        val keyCode = event.keyCode
+        val action = event.action
         val isDown = action == 0
 
         if (keyCode == KeyEvent.KEYCODE_MENU) {
diff --git a/app/src/main/java/io/legado/app/ui/widget/recycler/DragSelectTouchHelper.kt b/app/src/main/java/io/legado/app/ui/widget/recycler/DragSelectTouchHelper.kt
index 0443be001..185148d0a 100644
--- a/app/src/main/java/io/legado/app/ui/widget/recycler/DragSelectTouchHelper.kt
+++ b/app/src/main/java/io/legado/app/ui/widget/recycler/DragSelectTouchHelper.kt
@@ -28,8 +28,7 @@ import androidx.recyclerview.widget.RecyclerView.OnItemTouchListener
 import io.legado.app.BuildConfig
 import io.legado.app.ui.widget.recycler.DragSelectTouchHelper.AdvanceCallback.Mode
 import io.legado.app.utils.DebugLog
-
-import java.util.*
+import java.util.Locale
 import kotlin.math.max
 import kotlin.math.min
 
@@ -52,7 +51,7 @@ import kotlin.math.min
  *  |                   | ----------------------------------------------> |                       |
  *  +-------------------+                                                 +-----------------------+
  */
-@Suppress("unused", "MemberVisibilityCanBePrivate")
+@Suppress("unused", "MemberVisibilityCanBePrivate", "DEPRECATION")
 class DragSelectTouchHelper(
     /**
      * Developer callback which controls the behavior of DragSelectTouchHelper.
diff --git a/app/src/main/java/io/legado/app/ui/widget/recycler/scroller/FastScroller.kt b/app/src/main/java/io/legado/app/ui/widget/recycler/scroller/FastScroller.kt
index b789db419..897a28103 100644
--- a/app/src/main/java/io/legado/app/ui/widget/recycler/scroller/FastScroller.kt
+++ b/app/src/main/java/io/legado/app/ui/widget/recycler/scroller/FastScroller.kt
@@ -288,6 +288,7 @@ class FastScroller : LinearLayout {
         visibility = if (enabled) View.VISIBLE else View.INVISIBLE
     }
 
+    @Suppress("DEPRECATION")
     @SuppressLint("ClickableViewAccessibility")
     override fun onTouchEvent(event: MotionEvent): Boolean {
         when (event.action) {
diff --git a/app/src/main/java/io/legado/app/ui/widget/seekbar/VerticalSeekBar.kt b/app/src/main/java/io/legado/app/ui/widget/seekbar/VerticalSeekBar.kt
index 49e7b44b6..c9d05cc46 100644
--- a/app/src/main/java/io/legado/app/ui/widget/seekbar/VerticalSeekBar.kt
+++ b/app/src/main/java/io/legado/app/ui/widget/seekbar/VerticalSeekBar.kt
@@ -59,6 +59,7 @@ class VerticalSeekBar @JvmOverloads constructor(context: Context, attrs: Attribu
         if (!isInEditMode) {
             applyTint(context.accentColor)
         }
+        @Suppress("DEPRECATION")
         ViewCompat.setLayoutDirection(this, ViewCompat.LAYOUT_DIRECTION_LTR)
 
         if (attrs != null) {
diff --git a/app/src/main/java/io/legado/app/ui/widget/seekbar/VerticalSeekBarWrapper.kt b/app/src/main/java/io/legado/app/ui/widget/seekbar/VerticalSeekBarWrapper.kt
index 683953f1a..a22f3a568 100644
--- a/app/src/main/java/io/legado/app/ui/widget/seekbar/VerticalSeekBarWrapper.kt
+++ b/app/src/main/java/io/legado/app/ui/widget/seekbar/VerticalSeekBarWrapper.kt
@@ -130,6 +130,7 @@ class VerticalSeekBarWrapper @JvmOverloads constructor(
         applyViewRotation(width, height)
     }
 
+    @Suppress("DEPRECATION")
     private fun applyViewRotation(w: Int, h: Int) {
         val seekBar = childSeekBar
 
diff --git a/app/src/main/java/io/legado/app/ui/widget/text/ScrollMultiAutoCompleteTextView.kt b/app/src/main/java/io/legado/app/ui/widget/text/ScrollMultiAutoCompleteTextView.kt
index 59f020edf..a9f0e6460 100644
--- a/app/src/main/java/io/legado/app/ui/widget/text/ScrollMultiAutoCompleteTextView.kt
+++ b/app/src/main/java/io/legado/app/ui/widget/text/ScrollMultiAutoCompleteTextView.kt
@@ -257,6 +257,7 @@ open class ScrollMultiAutoCompleteTextView @JvmOverloads constructor(
             }
         }
 
+        @Suppress("DEPRECATION")
         fun postOnAnimation() {
             if (mEatRunOnAnimationRequest) {
                 mReSchedulePostAnimationCallback = true
diff --git a/app/src/main/java/io/legado/app/ui/widget/text/ScrollTextView.kt b/app/src/main/java/io/legado/app/ui/widget/text/ScrollTextView.kt
index cecd86e00..948146935 100644
--- a/app/src/main/java/io/legado/app/ui/widget/text/ScrollTextView.kt
+++ b/app/src/main/java/io/legado/app/ui/widget/text/ScrollTextView.kt
@@ -258,6 +258,7 @@ class ScrollTextView(context: Context, attrs: AttributeSet?) :
             }
         }
 
+        @Suppress("DEPRECATION")
         fun postOnAnimation() {
             if (mEatRunOnAnimationRequest) {
                 mReSchedulePostAnimationCallback = true
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 95b8dc9dc..e44ee5214 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -27,7 +27,7 @@ jsoupxpath = "2.5.3"
 coroutines = "1.8.1"
 liveeventbus = "1.8.14"
 markwon = "4.6.2"
-material = "1.11.0"
+material = "1.12.0"
 media = "1.7.0"
 media3 = "1.4.0"
 nanoHttpd = "2.3.1"