From 4b60c5121a2bcc7ce914704a394c129b8e2f1e20 Mon Sep 17 00:00:00 2001
From: HapeLee <1321903405@qq.com>
Date: Sun, 16 Nov 2025 14:39:13 +0800
Subject: [PATCH] =?UTF-8?q?=E6=AD=A3=E6=96=87=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../io/legado/app/ui/book/read/SearchMenu.kt | 29 +-----
app/src/main/res/layout/view_search_menu.xml | 93 +++----------------
2 files changed, 19 insertions(+), 103 deletions(-)
diff --git a/app/src/main/java/io/legado/app/ui/book/read/SearchMenu.kt b/app/src/main/java/io/legado/app/ui/book/read/SearchMenu.kt
index 02d6c236e..5978e8cff 100644
--- a/app/src/main/java/io/legado/app/ui/book/read/SearchMenu.kt
+++ b/app/src/main/java/io/legado/app/ui/book/read/SearchMenu.kt
@@ -31,11 +31,7 @@ class SearchMenu @JvmOverloads constructor(
private val menuBottomIn: Animation = loadAnimation(context, R.anim.anim_readbook_bottom_in)
private val menuBottomOut: Animation = loadAnimation(context, R.anim.anim_readbook_bottom_out)
- //private val bgColor: Int = context.bottomBackground
- //private val textColor: Int = context.getPrimaryTextColor(ColorUtils.isColorLight(bgColor))
-// private val bottomBackgroundList: ColorStateList =
-// Selector.colorBuild().setDefaultColor(bgColor)
-// .setPressedColor(ColorUtils.darkenColor(bgColor)).create()
+
private var onMenuOutEnd: (() -> Unit)? = null
private var isMenuOutAnimating = false
@@ -64,22 +60,6 @@ class SearchMenu @JvmOverloads constructor(
}
private fun initView() = binding.run {
-// llSearchBaseInfo.setBackgroundColor(bgColor)
-// tvCurrentSearchInfo.setTextColor(bottomBackgroundList)
-// llBottomBg.setBackgroundColor(bgColor)
-// fabLeft.backgroundTintList = bottomBackgroundList
-// fabLeft.setColorFilter(textColor, PorterDuff.Mode.SRC_IN)
-// fabRight.backgroundTintList = bottomBackgroundList
-// fabRight.setColorFilter(textColor, PorterDuff.Mode.SRC_IN)
-// tvMainMenu.setTextColor(textColor)
-// tvSearchResults.setTextColor(textColor)
-// tvSearchExit.setTextColor(textColor)
-// ivMainMenu.setColorFilter(textColor, PorterDuff.Mode.SRC_IN)
-// ivSearchResults.setColorFilter(textColor, PorterDuff.Mode.SRC_IN)
-// ivSearchExit.setColorFilter(textColor, PorterDuff.Mode.SRC_IN)
-// ivSearchContentUp.setColorFilter(textColor, PorterDuff.Mode.SRC_IN)
-// ivSearchContentDown.setColorFilter(textColor, PorterDuff.Mode.SRC_IN)
-// tvCurrentSearchInfo.setTextColor(textColor)
applyNavigationBarPadding()
}
@@ -104,8 +84,6 @@ class SearchMenu @JvmOverloads constructor(
@SuppressLint("SetTextI18n")
fun updateSearchInfo() {
ReadBook.curTextChapter?.let {
- binding.tvCurrentSearchInfo.text =
- "${context.getString(R.string.search_content_size)}: ${searchResultList.size}"
binding.tvCurrentChapter.text = "当前章节: ${it.title}"
}
updateSearchProgress()
@@ -125,9 +103,12 @@ class SearchMenu @JvmOverloads constructor(
val total = searchResultList.size
if (total == 0) {
binding.tvSearchProgress.text = "0%"
+ binding.tvSearchFraction.text = "0/0"
} else {
- val progress = ((currentSearchResultIndex + 1) * 100 / total)
+ val current = currentSearchResultIndex + 1
+ val progress = (current * 100 / total)
binding.tvSearchProgress.text = "$progress%"
+ binding.tvSearchFraction.text = "$current / $total"
}
}
diff --git a/app/src/main/res/layout/view_search_menu.xml b/app/src/main/res/layout/view_search_menu.xml
index cfaf4aa86..469b0ac05 100644
--- a/app/src/main/res/layout/view_search_menu.xml
+++ b/app/src/main/res/layout/view_search_menu.xml
@@ -66,36 +66,28 @@
-
+ android:textSize="14sp"
+ android:textStyle="bold"
+ android:layout_gravity="center_vertical" />
+ android:layout_marginStart="8dp"
+ android:textSize="12sp"
+ android:textStyle="bold"/>
@@ -119,33 +111,24 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+