diff --git a/app/src/main/java/io/legato/kazusa/ui/book/read/ReadMenu.kt b/app/src/main/java/io/legato/kazusa/ui/book/read/ReadMenu.kt
index 99c3ffc54..e7f847b19 100644
--- a/app/src/main/java/io/legato/kazusa/ui/book/read/ReadMenu.kt
+++ b/app/src/main/java/io/legato/kazusa/ui/book/read/ReadMenu.kt
@@ -401,9 +401,10 @@ class ReadMenu @JvmOverloads constructor(
}
seekReadPage.addOnChangeListener { slider, value, fromUser ->
- VibrationUtils.vibrate(context, 12)
- if (fromUser && AppConfig.progressBarBehavior == "page") {
- ReadBook.skipToPage(value.toInt() - 1)
+ if (fromUser) {
+ if (AppConfig.progressBarBehavior == "page")
+ ReadBook.skipToPage(value.toInt() - 1)
+ VibrationUtils.vibrate(context, 12)
}
}
@@ -541,7 +542,7 @@ class ReadMenu @JvmOverloads constructor(
id = "search",
iconRes = R.drawable.ic_search,
description = context.getString(R.string.search_content),
- onClick = { callBack.openSearchActivity(null) }
+ onClick = { runMenuOut{ callBack.openSearchActivity(null) } }
),
ToolButton(
id = "auto_page",
diff --git a/app/src/main/java/io/legato/kazusa/ui/book/read/SearchMenu.kt b/app/src/main/java/io/legato/kazusa/ui/book/read/SearchMenu.kt
index 17e3ca561..24ddb625b 100644
--- a/app/src/main/java/io/legato/kazusa/ui/book/read/SearchMenu.kt
+++ b/app/src/main/java/io/legato/kazusa/ui/book/read/SearchMenu.kt
@@ -105,7 +105,8 @@ class SearchMenu @JvmOverloads constructor(
fun updateSearchInfo() {
ReadBook.curTextChapter?.let {
binding.tvCurrentSearchInfo.text =
- """${context.getString(R.string.search_content_size)}: ${searchResultList.size} / 当前章节: ${it.title}"""
+ "${context.getString(R.string.search_content_size)}: ${searchResultList.size}"
+ binding.tvCurrentChapter.text = "当前章节: ${it.title}"
}
}
@@ -120,14 +121,14 @@ class SearchMenu @JvmOverloads constructor(
private fun bindEvent() = binding.run {
//搜索结果
- llSearchResults.setOnClickListener {
+ ivSearchResults.setOnClickListener {
runMenuOut {
callBack.openSearchActivity(selectedSearchResult?.query)
}
}
//主菜单
- llMainMenu.setOnClickListener {
+ ivMainMenu.setOnClickListener {
runMenuOut {
callBack.cancelSelect()
callBack.showMenuBar()
@@ -136,7 +137,7 @@ class SearchMenu @JvmOverloads constructor(
}
//退出
- llSearchExit.setOnClickListener {
+ ivSearchExit.setOnClickListener {
runMenuOut {
callBack.exitSearchMenu()
}
@@ -150,22 +151,6 @@ class SearchMenu @JvmOverloads constructor(
)
}
- ivSearchContentUp.setOnClickListener {
- updateSearchResultIndex(currentSearchResultIndex - 1)
- callBack.navigateToSearch(
- searchResultList[currentSearchResultIndex],
- currentSearchResultIndex
- )
- }
-
- ivSearchContentDown.setOnClickListener {
- updateSearchResultIndex(currentSearchResultIndex + 1)
- callBack.navigateToSearch(
- searchResultList[currentSearchResultIndex],
- currentSearchResultIndex
- )
- }
-
fabRight.setOnClickListener {
updateSearchResultIndex(currentSearchResultIndex + 1)
callBack.navigateToSearch(
diff --git a/app/src/main/res/layout/view_search_menu.xml b/app/src/main/res/layout/view_search_menu.xml
index 05275e767..fb1dfd97a 100644
--- a/app/src/main/res/layout/view_search_menu.xml
+++ b/app/src/main/res/layout/view_search_menu.xml
@@ -55,59 +55,48 @@
android:orientation="vertical"
app:layout_constraintBottom_toBottomOf="parent">
-
+
+ android:textSize="18sp" />
-
+
+
+
+
+ android:padding="8dp"
+ android:singleLine="true"
+ android:textSize="14sp" />
-
-
-
+
-
-
-
-
-
-
-
-
-
+ android:elevation="16dp"
+ style="@style/Widget.Material3Expressive.Button.TonalButton"
+ android:text="@string/search_content_size"
+ app:icon="@drawable/ic_toc" />
-
-
+
+
-
-
-
-
-
-
+ android:elevation="16dp"
+ style="@style/Widget.Material3Expressive.Button.TonalButton"
+ android:text="@string/main_menu"
+ app:icon="@drawable/ic_menu" />
-
-
+
+
-
-
-
-
-
+ android:elevation="16dp"
+ style="@style/Widget.Material3Expressive.Button.TonalButton"
+ android:text="@string/exit"
+ app:icon="@drawable/ic_auto_page_stop"
+ tools:ignore="NestedWeights" />