From 743bcaafbd436a4997dc87ff4bc3f62d4193f0c8 Mon Sep 17 00:00:00 2001
From: Horis <8674809+821938089@users.noreply.github.com>
Date: Sun, 23 Mar 2025 16:40:06 +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/ui/book/manga/ReadMangaActivity.kt    | 38 ++++++-------------
 .../io/legado/app/utils/ViewExtensions.kt     |  6 +++
 2 files changed, 17 insertions(+), 27 deletions(-)

diff --git a/app/src/main/java/io/legado/app/ui/book/manga/ReadMangaActivity.kt b/app/src/main/java/io/legado/app/ui/book/manga/ReadMangaActivity.kt
index a65f20b51..83bb8f3c3 100644
--- a/app/src/main/java/io/legado/app/ui/book/manga/ReadMangaActivity.kt
+++ b/app/src/main/java/io/legado/app/ui/book/manga/ReadMangaActivity.kt
@@ -17,7 +17,6 @@ import androidx.core.view.isVisible
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.PagerSnapHelper
-import androidx.recyclerview.widget.RecyclerView
 import com.bumptech.glide.Glide
 import com.bumptech.glide.integration.recyclerview.RecyclerViewPreloader
 import com.bumptech.glide.request.target.Target.SIZE_ORIGINAL
@@ -58,6 +57,7 @@ import io.legado.app.ui.widget.recycler.LoadMoreView
 import io.legado.app.utils.GSON
 import io.legado.app.utils.NetworkUtils
 import io.legado.app.utils.StartActivityContract
+import io.legado.app.utils.canScroll
 import io.legado.app.utils.fastBinarySearch
 import io.legado.app.utils.findCenterViewPosition
 import io.legado.app.utils.fromJsonObject
@@ -418,7 +418,7 @@ class ReadMangaActivity : VMBaseActivity<ActivityMangaBinding, ReadMangaViewMode
     }
 
     override fun scrollBy(distance: Int) {
-        if (binding.recyclerView.isAtEnd()) {
+        if (!binding.recyclerView.canScroll(1)) {
             return
         }
         val time = ceil(16f / distance * 10000).toInt()
@@ -657,25 +657,15 @@ class ReadMangaActivity : VMBaseActivity<ActivityMangaBinding, ReadMangaViewMode
     }
 
     private fun scrollToNext() {
-        if (binding.recyclerView.isAtEnd()) {
-            return
-        }
-        var dx = 0
-        var dy = 0
-        if (AppConfig.enableMangaHorizontalScroll) {
-            dx = binding.recyclerView.run {
-                width - paddingStart - paddingEnd
-            }
-        } else {
-            dy = binding.recyclerView.run {
-                height - paddingTop - paddingBottom
-            }
-        }
-        binding.recyclerView.smoothScrollBy(dx, dy)
+        scrollPageTo(1)
     }
 
     private fun scrollToPrev() {
-        if (binding.recyclerView.isAtStart()) {
+        scrollPageTo(-1)
+    }
+
+    private fun scrollPageTo(direction: Int) {
+        if (!binding.recyclerView.canScroll(direction)) {
             return
         }
         var dx = 0
@@ -689,7 +679,9 @@ class ReadMangaActivity : VMBaseActivity<ActivityMangaBinding, ReadMangaViewMode
                 height - paddingTop - paddingBottom
             }
         }
-        binding.recyclerView.smoothScrollBy(-dx, -dy)
+        dx *= direction
+        dy *= direction
+        binding.recyclerView.smoothScrollBy(dx, dy)
     }
 
     private fun showNumberPickerDialog(
@@ -731,14 +723,6 @@ class ReadMangaActivity : VMBaseActivity<ActivityMangaBinding, ReadMangaViewMode
         }
     }
 
-    private fun RecyclerView.isAtStart(): Boolean {
-        return !canScrollVertically(-1) && !canScrollHorizontally(-1)
-    }
-
-    private fun RecyclerView.isAtEnd(): Boolean {
-        return !canScrollVertically(1) && !canScrollHorizontally(1)
-    }
-
     fun updateWindowBrightness(brightness: Int) {
         val layoutParams = window.attributes
         val normalizedBrightness = brightness.toFloat() / 255.0f
diff --git a/app/src/main/java/io/legado/app/utils/ViewExtensions.kt b/app/src/main/java/io/legado/app/utils/ViewExtensions.kt
index 7d6e0cdae..5fbc3f476 100644
--- a/app/src/main/java/io/legado/app/utils/ViewExtensions.kt
+++ b/app/src/main/java/io/legado/app/utils/ViewExtensions.kt
@@ -39,6 +39,7 @@ import androidx.recyclerview.widget.RecyclerView
 import androidx.viewpager.widget.ViewPager
 import io.legado.app.help.config.AppConfig
 import io.legado.app.lib.theme.TintHelper
+import io.legado.app.ui.book.read.page.entities.PageDirection
 import io.legado.app.utils.canvasrecorder.CanvasRecorder
 import io.legado.app.utils.canvasrecorder.record
 import splitties.systemservices.inputMethodManager
@@ -299,3 +300,8 @@ fun View.setBackgroundKeepPadding(@DrawableRes backgroundResId: Int) {
     setBackgroundResource(backgroundResId)
     setPadding(paddingLeft, paddingTop, paddingRight, paddingBottom)
 }
+
+fun View.canScroll(direction: Int): Boolean {
+    return canScrollVertically(direction) || canScrollHorizontally(direction)
+}
+