From 6f49b4d23e356c034debe27a87d7571f87afa3c9 Mon Sep 17 00:00:00 2001
From: FooIbar <118464521+FooIbar@users.noreply.github.com>
Date: Sat, 21 Oct 2023 18:22:45 +0800
Subject: [PATCH] Fix deprecated

---
 .../labs/subscaleview/SubsamplingScaleImageView.kt            | 4 ++--
 .../main/kotlin/com/hippo/ehviewer/ui/legacy/SearchLayout.kt  | 4 ++--
 .../tachiyomi/ui/reader/viewer/CircularProgressIndicator.kt   | 2 +-
 .../ui/reader/viewer/webtoon/WebtoonLayoutManager.kt          | 1 +
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/src/main/kotlin/com/davemorrissey/labs/subscaleview/SubsamplingScaleImageView.kt b/app/src/main/kotlin/com/davemorrissey/labs/subscaleview/SubsamplingScaleImageView.kt
index bc957da2a..5745afc78 100644
--- a/app/src/main/kotlin/com/davemorrissey/labs/subscaleview/SubsamplingScaleImageView.kt
+++ b/app/src/main/kotlin/com/davemorrissey/labs/subscaleview/SubsamplingScaleImageView.kt
@@ -602,7 +602,7 @@ open class SubsamplingScaleImageView @JvmOverloads constructor(
     private fun onTouchEventInternal(event: MotionEvent): Boolean {
         val touchCount = event.pointerCount
         when (event.action) {
-            MotionEvent.ACTION_DOWN, MotionEvent.ACTION_POINTER_1_DOWN, MotionEvent.ACTION_POINTER_2_DOWN -> {
+            MotionEvent.ACTION_DOWN, MotionEvent.ACTION_POINTER_DOWN -> {
                 anim = null
                 requestDisallowInterceptTouchEvent(true)
                 maxTouchCount = maxTouchCount.coerceAtLeast(touchCount)
@@ -773,7 +773,7 @@ open class SubsamplingScaleImageView @JvmOverloads constructor(
                     return true
                 }
             }
-            MotionEvent.ACTION_UP, MotionEvent.ACTION_POINTER_UP, MotionEvent.ACTION_POINTER_2_UP -> {
+            MotionEvent.ACTION_UP, MotionEvent.ACTION_POINTER_UP -> {
                 longClickJob?.cancel()
                 if (isQuickScaling) {
                     isQuickScaling = false
diff --git a/app/src/main/kotlin/com/hippo/ehviewer/ui/legacy/SearchLayout.kt b/app/src/main/kotlin/com/hippo/ehviewer/ui/legacy/SearchLayout.kt
index 7729084a2..19c3164ae 100644
--- a/app/src/main/kotlin/com/hippo/ehviewer/ui/legacy/SearchLayout.kt
+++ b/app/src/main/kotlin/com/hippo/ehviewer/ui/legacy/SearchLayout.kt
@@ -16,8 +16,8 @@ import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material3.ElevatedCard
 import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.SecondaryTabRow
 import androidx.compose.material3.Tab
-import androidx.compose.material3.TabRow
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
@@ -123,7 +123,7 @@ class SearchLayout @JvmOverloads constructor(
                         }
                     }
                 }
-                TabRow(
+                SecondaryTabRow(
                     selectedTabIndex = if (vm.isNormalMode) 0 else 1,
                     divider = {},
                 ) {
diff --git a/app/src/main/kotlin/eu/kanade/tachiyomi/ui/reader/viewer/CircularProgressIndicator.kt b/app/src/main/kotlin/eu/kanade/tachiyomi/ui/reader/viewer/CircularProgressIndicator.kt
index 19f6714f3..d236d6f6e 100644
--- a/app/src/main/kotlin/eu/kanade/tachiyomi/ui/reader/viewer/CircularProgressIndicator.kt
+++ b/app/src/main/kotlin/eu/kanade/tachiyomi/ui/reader/viewer/CircularProgressIndicator.kt
@@ -46,7 +46,7 @@ fun CombinedCircularProgressIndicator(progress: Float) {
                 label = "rotation",
             )
             CircularProgressIndicator(
-                progress = animatedProgress,
+                progress = { animatedProgress },
                 modifier = Modifier.rotate(rotation),
             )
         }
diff --git a/app/src/main/kotlin/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonLayoutManager.kt b/app/src/main/kotlin/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonLayoutManager.kt
index 74ced080c..894a7f009 100644
--- a/app/src/main/kotlin/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonLayoutManager.kt
+++ b/app/src/main/kotlin/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonLayoutManager.kt
@@ -27,6 +27,7 @@ class WebtoonLayoutManager(activity: ReaderActivity) : LinearLayoutManager(activ
     /**
      * Returns the custom extra layout space.
      */
+    @Deprecated("Deprecated in Java")
     override fun getExtraLayoutSpace(state: RecyclerView.State): Int {
         return extraLayoutSpace
     }