diff --git a/app/src/main/java/io/legado/app/ui/book/read/ReadMenu.kt b/app/src/main/java/io/legado/app/ui/book/read/ReadMenu.kt
index 26423e701..e56a47066 100644
--- a/app/src/main/java/io/legado/app/ui/book/read/ReadMenu.kt
+++ b/app/src/main/java/io/legado/app/ui/book/read/ReadMenu.kt
@@ -170,6 +170,13 @@ class ReadMenu : FrameLayout {
}
})
+ //搜索
+ fabSearch.onClick {
+ runMenuOut {
+ callBack?.openSearchList()
+ }
+ }
+
//自动翻页
fabAutoPage.onClick {
runMenuOut {
@@ -200,12 +207,6 @@ class ReadMenu : FrameLayout {
}
}
- ll_search.onClick {
- runMenuOut {
- callBack?.openSearchList()
- }
- }
-
//朗读
ll_read_aloud.onClick {
runMenuOut {
diff --git a/app/src/main/java/io/legado/app/ui/book/searchContent/SearchResult.kt b/app/src/main/java/io/legado/app/ui/book/searchContent/SearchResult.kt
index 3a629839b..2de16020b 100644
--- a/app/src/main/java/io/legado/app/ui/book/searchContent/SearchResult.kt
+++ b/app/src/main/java/io/legado/app/ui/book/searchContent/SearchResult.kt
@@ -4,6 +4,7 @@ import android.text.Spanned
import androidx.core.text.HtmlCompat
import io.legado.app.App
import io.legado.app.R
+import io.legado.app.lib.theme.accentColor
import io.legado.app.utils.getCompatColor
import io.legado.app.utils.hexString
@@ -19,18 +20,20 @@ data class SearchResult(
var newPosition: Int = 0,
var contentPosition: Int =0
) {
+ val textColor = App.INSTANCE.getCompatColor(R.color.primaryText).hexString
+ val accentColor = App.INSTANCE.accentColor.hexString
+
val presentText: String
- get(){
+ get() {
return colorPresentText(newPosition, query, text) +
- "($chapterTitle)"
+ "($chapterTitle)"
}
- fun colorPresentText(position: Int, center: String, targetText: String): String {
+ private fun colorPresentText(position: Int, center: String, targetText: String): String {
val sub1 = text.substring(0, position)
val sub2 = text.substring(position + center.length, targetText.length)
- val textColor = App.INSTANCE.getCompatColor(R.color.primaryText).hexString
return "$sub1" +
- "$center" +
+ "$center" +
"$sub2"
}
diff --git a/app/src/main/res/layout/view_read_menu.xml b/app/src/main/res/layout/view_read_menu.xml
index b63fba1ff..d48221169 100644
--- a/app/src/main/res/layout/view_read_menu.xml
+++ b/app/src/main/res/layout/view_read_menu.xml
@@ -92,6 +92,26 @@
android:paddingStart="32dp"
android:paddingEnd="32dp">
+
+
+
+
-
-
-
-
-
-
-
-
-