diff --git a/app/src/main/java/io/legado/app/ui/book/read/BaseReadBookActivity.kt b/app/src/main/java/io/legado/app/ui/book/read/BaseReadBookActivity.kt
index 9a6449f5d..1c5409466 100644
--- a/app/src/main/java/io/legado/app/ui/book/read/BaseReadBookActivity.kt
+++ b/app/src/main/java/io/legado/app/ui/book/read/BaseReadBookActivity.kt
@@ -219,6 +219,7 @@ abstract class BaseReadBookActivity :
upNavigationBar()
when {
binding.readMenu.isVisible -> super.upNavigationBarColor()
+ binding.searchMenu.bottomMenuVisible -> super.upNavigationBarColor()
bottomDialog > 0 -> super.upNavigationBarColor()
!AppConfig.immNavigationBar -> super.upNavigationBarColor()
else -> setNavigationBarColorAuto(ReadBookConfig.bgMeanColor)
@@ -228,7 +229,7 @@ abstract class BaseReadBookActivity :
@SuppressLint("RtlHardcoded")
private fun upNavigationBar() {
binding.navigationBar.run {
- if (bottomDialog > 0 || binding.readMenu.isVisible) {
+ if (bottomDialog > 0 || binding.readMenu.isVisible || binding.searchMenu.bottomMenuVisible) {
// val navigationBarHeight =
// if (ReadBookConfig.hideNavigationBar) navigationBarHeight else 0
// when (navigationBarGravity) {
diff --git a/app/src/main/java/io/legado/app/ui/book/read/ReadBookActivity.kt b/app/src/main/java/io/legado/app/ui/book/read/ReadBookActivity.kt
index 159f61e3a..659349c8b 100644
--- a/app/src/main/java/io/legado/app/ui/book/read/ReadBookActivity.kt
+++ b/app/src/main/java/io/legado/app/ui/book/read/ReadBookActivity.kt
@@ -232,7 +232,7 @@ class ReadBookActivity : BaseReadBookActivity(),
override val pageFactory get() = binding.readView.pageFactory
override val pageDelegate get() = binding.readView.pageDelegate
override val headerHeight: Int get() = binding.readView.curPage.headerHeight
- private val menuLayoutIsVisible get() = bottomDialog > 0 || binding.readMenu.isVisible
+ private val menuLayoutIsVisible get() = bottomDialog > 0 || binding.readMenu.isVisible || binding.searchMenu.bottomMenuVisible
private val nextPageDebounce by lazy { Debounce { keyPage(PageDirection.NEXT) } }
private val prevPageDebounce by lazy { Debounce { keyPage(PageDirection.PREV) } }
private var bookChanged = false
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 7fa379f68..a70a310f8 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
@@ -225,7 +225,6 @@ class ReadMenu @JvmOverloads constructor(
ivSetting.setColorFilter(textColor, PorterDuff.Mode.SRC_IN)
tvSetting.setTextColor(textColor)
vwBrightnessPosAdjust.setColorFilter(textColor, PorterDuff.Mode.SRC_IN)
- vwBg.setOnClickListener(null)
llBrightness.setOnClickListener(null)
seekBrightness.post {
seekBrightness.progress = AppConfig.readBrightness
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 f957a2b4c..69cf3f5de 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
@@ -59,6 +59,7 @@ class SearchMenu @JvmOverloads constructor(
get() = searchResultList.getOrNull(currentSearchResultIndex)
val previousSearchResult: SearchResult?
get() = searchResultList.getOrNull(lastSearchResultIndex)
+ val bottomMenuVisible get() = binding.llBottomMenu.isVisible
init {
initAnimation()
diff --git a/app/src/main/res/layout/activity_book_info_edit.xml b/app/src/main/res/layout/activity_book_info_edit.xml
index 1915756ee..38f36de89 100644
--- a/app/src/main/res/layout/activity_book_info_edit.xml
+++ b/app/src/main/res/layout/activity_book_info_edit.xml
@@ -28,7 +28,7 @@
diff --git a/app/src/main/res/layout/dialog_read_aloud.xml b/app/src/main/res/layout/dialog_read_aloud.xml
index c42e327fc..010f031b6 100644
--- a/app/src/main/res/layout/dialog_read_aloud.xml
+++ b/app/src/main/res/layout/dialog_read_aloud.xml
@@ -6,14 +6,13 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/background_menu"
+ android:orientation="vertical"
android:paddingLeft="16dp"
- android:paddingRight="16dp"
android:paddingTop="6dp"
- android:paddingBottom="6dp"
- android:orientation="vertical">
+ android:paddingRight="16dp"
+ android:paddingBottom="6dp">
@@ -60,9 +59,9 @@
android:layout_marginLeft="8dp"
android:layout_marginRight="8dp"
android:background="?android:attr/selectableItemBackgroundBorderless"
- android:tooltipText="@string/audio_play"
android:contentDescription="@string/audio_play"
android:src="@drawable/ic_play_24dp"
+ android:tooltipText="@string/audio_play"
app:tint="@color/primaryText"
tools:ignore="UnusedAttribute" />
@@ -74,8 +73,8 @@
android:layout_marginRight="8dp"
android:background="?android:attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/stop"
- android:tooltipText="@string/stop"
android:src="@drawable/ic_stop_black_24dp"
+ android:tooltipText="@string/stop"
app:tint="@color/primaryText"
tools:ignore="UnusedAttribute" />
@@ -87,8 +86,8 @@
android:layout_marginRight="8dp"
android:background="?android:attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/next_sentence"
- android:tooltipText="@string/next_sentence"
android:src="@drawable/ic_skip_next"
+ android:tooltipText="@string/next_sentence"
app:tint="@color/primaryText"
tools:ignore="UnusedAttribute" />
@@ -127,10 +126,10 @@
android:layout_width="30dp"
android:layout_height="30dp"
android:background="?android:attr/selectableItemBackgroundBorderless"
- android:tooltipText="@string/set_timer"
android:contentDescription="@string/set_timer"
android:src="@drawable/ic_time_add_24dp"
android:tint="@color/primaryText"
+ android:tooltipText="@string/set_timer"
tools:ignore="UnusedAttribute" />
+ android:text="@string/timer_m"
+ android:textColor="@color/primaryText" />
@@ -184,8 +183,8 @@
+ android:layout_gravity="center"
+ android:layout_weight="1" />
+ android:orientation="horizontal"
+ android:paddingLeft="6dp"
+ android:paddingRight="6dp">
@@ -239,7 +238,7 @@
@@ -247,8 +246,8 @@
@@ -272,9 +273,9 @@
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="3dp"
- android:text="@string/chapter_list"
- android:singleLine="true"
android:ellipsize="middle"
+ android:singleLine="true"
+ android:text="@string/chapter_list"
android:textColor="@color/primaryText"
android:textSize="12sp" />
@@ -286,8 +287,8 @@
@@ -326,8 +329,8 @@
@@ -351,9 +356,9 @@
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="3dp"
- android:text="@string/to_backstage"
- android:singleLine="true"
android:ellipsize="middle"
+ android:singleLine="true"
+ android:text="@string/to_backstage"
android:textColor="@color/primaryText"
android:textSize="12sp" />
@@ -365,8 +370,8 @@
@@ -390,9 +397,9 @@
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="3dp"
- android:text="@string/setting"
- android:singleLine="true"
android:ellipsize="middle"
+ android:singleLine="true"
+ android:text="@string/setting"
android:textColor="@color/primaryText"
android:textSize="12sp" />
diff --git a/app/src/main/res/layout/item_bookshelf_list.xml b/app/src/main/res/layout/item_bookshelf_list.xml
index 2c2787616..947b6a013 100644
--- a/app/src/main/res/layout/item_bookshelf_list.xml
+++ b/app/src/main/res/layout/item_bookshelf_list.xml
@@ -32,8 +32,9 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
+ app:layout_constraintBottom_toBottomOf="@+id/tv_name"
app:layout_constraintRight_toRightOf="parent"
- app:layout_constraintTop_toTopOf="@+id/iv_cover">
+ app:layout_constraintTop_toTopOf="@+id/tv_name">
-
-
-
-
+ android:layout_height="wrap_content"
+ android:background="@color/background_menu"
+ android:importantForAccessibility="no"
+ android:orientation="vertical">
+
-
-
+
+
+ android:layout_marginStart="10dp"
+ android:layout_marginEnd="10dp"
+ android:background="?android:attr/selectableItemBackgroundBorderless"
+ android:clickable="true"
+ android:enabled="false"
+ android:focusable="true"
+ android:paddingTop="10dp"
+ android:paddingBottom="10dp"
+ android:text="@string/previous_chapter"
+ android:textColor="@color/primaryText"
+ android:textSize="14sp"
+ tools:ignore="TouchTargetSizeCheck" />
-
+
-
-
-
-
-
-
+ android:layout_marginStart="10dp"
+ android:layout_marginEnd="10dp"
+ android:background="?android:attr/selectableItemBackgroundBorderless"
+ android:clickable="true"
+ android:enabled="false"
+ android:focusable="true"
+ android:paddingTop="10dp"
+ android:paddingBottom="10dp"
+ android:text="@string/next_chapter"
+ android:textColor="@color/primaryText"
+ android:textSize="14sp"
+ tools:ignore="TouchTargetSizeCheck" />
+
-
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ android:maxHeight="20dp"
+ android:src="@drawable/ic_toc"
+ app:tint="@color/primaryText"
+ tools:ignore="NestedWeights" />
+
+ android:layout_width="0dp"
+ android:layout_height="match_parent"
+ android:layout_weight="2"
+ android:importantForAccessibility="no" />
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/view_search_menu.xml b/app/src/main/res/layout/view_search_menu.xml
index 624551f18..0da5692bb 100644
--- a/app/src/main/res/layout/view_search_menu.xml
+++ b/app/src/main/res/layout/view_search_menu.xml
@@ -109,7 +109,7 @@
@@ -122,8 +122,8 @@
@@ -162,8 +164,8 @@
@@ -200,8 +204,8 @@