From 5209aefcf7b0206d1d609d83a0d0e524fad04944 Mon Sep 17 00:00:00 2001
From: Horis <8674809+821938089@users.noreply.github.com>
Date: Mon, 6 Jan 2025 22:16:37 +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/info/BookInfoActivity.kt   | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/io/legado/app/ui/book/info/BookInfoActivity.kt b/app/src/main/java/io/legado/app/ui/book/info/BookInfoActivity.kt
index 447308ba2..12b02f959 100644
--- a/app/src/main/java/io/legado/app/ui/book/info/BookInfoActivity.kt
+++ b/app/src/main/java/io/legado/app/ui/book/info/BookInfoActivity.kt
@@ -3,6 +3,7 @@ package io.legado.app.ui.book.info
 import android.annotation.SuppressLint
 import android.content.Intent
 import android.net.Uri
+import android.os.Build
 import android.os.Bundle
 import android.view.Menu
 import android.view.MenuItem
@@ -159,6 +160,9 @@ class BookInfoActivity :
         binding.flAction.applyNavigationBarPadding()
         binding.tvShelf.setTextColor(getPrimaryTextColor(ColorUtils.isColorLight(bottomBackground)))
         binding.tvToc.text = getString(R.string.toc_s, getString(R.string.loading))
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N_MR1) {
+            binding.tvIntro.revealOnFocusHint = false
+        }
         viewModel.bookData.observe(this) { showBook(it) }
         viewModel.chapterListData.observe(this) { upLoading(false, it) }
         viewModel.waitDialogData.observe(this) { upWaitDialogStatus(it) }
@@ -497,8 +501,8 @@ class BookInfoActivity :
             refreshLayout.isRefreshing = false
             refreshBook()
         }
-        refreshLayout?.setOnChildScrollUpCallback { _, _ ->
-            tvIntro.hasSelection()
+        refreshLayout?.setOnChildScrollUpCallback { _, target ->
+            target!!.canScrollVertically(-1) || tvIntro.hasSelection()
         }
     }