From acfc2bff69fee665842a7ff180f4d421cacea5d7 Mon Sep 17 00:00:00 2001
From: Horis <8674809+821938089@users.noreply.github.com>
Date: Mon, 3 Feb 2025 21:21:59 +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

---
 .../app/ui/book/read/BaseReadBookActivity.kt  |   3 +-
 .../app/ui/book/read/ReadBookActivity.kt      |   2 +-
 .../io/legado/app/ui/book/read/ReadMenu.kt    |   1 -
 .../io/legado/app/ui/book/read/SearchMenu.kt  |   1 +
 .../res/layout/activity_book_info_edit.xml    |   2 +-
 app/src/main/res/layout/dialog_read_aloud.xml |  73 +--
 .../main/res/layout/item_bookshelf_list.xml   |   3 +-
 app/src/main/res/layout/view_read_menu.xml    | 478 +++++++++---------
 app/src/main/res/layout/view_search_menu.xml  |  20 +-
 9 files changed, 295 insertions(+), 288 deletions(-)

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 @@
 
         <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
+            android:layout_height="wrap_content"
             android:orientation="vertical"
             android:padding="5dp">
 
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">
 
     <LinearLayout
-
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:gravity="center"
@@ -47,9 +46,9 @@
             android:layout_marginLeft="8dp"
             android:layout_marginRight="8dp"
             android:background="?android:attr/selectableItemBackgroundBorderless"
-            android:tooltipText="@string/prev_sentence"
             android:contentDescription="@string/prev_sentence"
             android:src="@drawable/ic_skip_previous"
+            android:tooltipText="@string/prev_sentence"
             app:tint="@color/primaryText"
             tools:ignore="UnusedAttribute" />
 
@@ -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" />
 
         <io.legado.app.lib.theme.view.ThemeSeekBar
@@ -145,8 +144,8 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:background="?android:attr/selectableItemBackgroundBorderless"
-            android:textColor="@color/primaryText"
-            android:text="@string/timer_m" />
+            android:text="@string/timer_m"
+            android:textColor="@color/primaryText" />
 
     </LinearLayout>
 
@@ -184,8 +183,8 @@
             <Space
                 android:layout_width="0dp"
                 android:layout_height="1dp"
-                android:layout_weight="1"
-                android:layout_gravity="center" />
+                android:layout_gravity="center"
+                android:layout_weight="1" />
 
             <io.legado.app.lib.theme.view.ThemeSwitch
                 android:id="@+id/cb_tts_follow_sys"
@@ -201,19 +200,19 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:paddingLeft="6dp"
-            android:paddingRight="6dp"
             android:gravity="center"
-            android:orientation="horizontal">
+            android:orientation="horizontal"
+            android:paddingLeft="6dp"
+            android:paddingRight="6dp">
 
             <androidx.appcompat.widget.AppCompatImageView
                 android:id="@+id/iv_tts_speech_reduce"
                 android:layout_width="30dp"
                 android:layout_height="30dp"
-                android:tooltipText="@string/tts_speech_reduce"
                 android:contentDescription="@string/tts_speech_reduce"
                 android:src="@drawable/ic_reduce"
                 android:tint="@color/primaryText"
+                android:tooltipText="@string/tts_speech_reduce"
                 tools:ignore="UnusedAttribute" />
 
             <io.legado.app.lib.theme.view.ThemeSeekBar
@@ -227,10 +226,10 @@
                 android:id="@+id/iv_tts_speech_add"
                 android:layout_width="30dp"
                 android:layout_height="30dp"
-                android:tooltipText="@string/tts_speech_add"
                 android:contentDescription="@string/tts_speech_add"
                 android:src="@drawable/ic_add"
                 android:tint="@color/primaryText"
+                android:tooltipText="@string/tts_speech_add"
                 tools:ignore="UnusedAttribute" />
 
         </LinearLayout>
@@ -239,7 +238,7 @@
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="50dp"
+        android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
         android:baselineAligned="false"
         android:orientation="horizontal">
@@ -247,8 +246,8 @@
         <!--目录按钮-->
         <LinearLayout
             android:id="@+id/ll_catalog"
-            android:layout_width="50dp"
-            android:layout_height="50dp"
+            android:layout_width="60dp"
+            android:layout_height="wrap_content"
             android:background="?android:attr/selectableItemBackgroundBorderless"
             android:clickable="true"
             android:contentDescription="@string/chapter_list"
@@ -261,7 +260,9 @@
                 android:layout_width="match_parent"
                 android:layout_height="0dp"
                 android:layout_weight="1"
+                android:adjustViewBounds="true"
                 android:contentDescription="@string/chapter_list"
+                android:maxHeight="20dp"
                 android:src="@drawable/ic_toc"
                 app:tint="@color/primaryText"
                 tools:ignore="NestedWeights" />
@@ -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" />
         </LinearLayout>
@@ -286,8 +287,8 @@
         <!--调节按钮-->
         <LinearLayout
             android:id="@+id/ll_main_menu"
-            android:layout_width="50dp"
-            android:layout_height="50dp"
+            android:layout_width="60dp"
+            android:layout_height="wrap_content"
             android:background="?android:attr/selectableItemBackgroundBorderless"
             android:clickable="true"
             android:contentDescription="@string/read_aloud"
@@ -301,7 +302,9 @@
                 android:layout_width="match_parent"
                 android:layout_height="0dp"
                 android:layout_weight="1"
+                android:adjustViewBounds="true"
                 android:contentDescription="@string/main_menu"
+                android:maxHeight="20dp"
                 android:src="@drawable/ic_menu"
                 app:tint="@color/primaryText"
                 tools:ignore="NestedWeights" />
@@ -326,8 +329,8 @@
         <!--界面按钮-->
         <LinearLayout
             android:id="@+id/ll_to_backstage"
-            android:layout_width="50dp"
-            android:layout_height="50dp"
+            android:layout_width="60dp"
+            android:layout_height="wrap_content"
             android:background="?android:attr/selectableItemBackgroundBorderless"
             android:clickable="true"
             android:contentDescription="@string/to_backstage"
@@ -340,7 +343,9 @@
                 android:layout_width="match_parent"
                 android:layout_height="0dp"
                 android:layout_weight="1"
+                android:adjustViewBounds="true"
                 android:contentDescription="@string/to_backstage"
+                android:maxHeight="20dp"
                 android:src="@drawable/ic_visibility_off"
                 app:tint="@color/primaryText"
                 tools:ignore="NestedWeights" />
@@ -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" />
         </LinearLayout>
@@ -365,8 +370,8 @@
         <!--设置按钮-->
         <LinearLayout
             android:id="@+id/ll_setting"
-            android:layout_width="50dp"
-            android:layout_height="50dp"
+            android:layout_width="60dp"
+            android:layout_height="wrap_content"
             android:background="?android:attr/selectableItemBackgroundBorderless"
             android:clickable="true"
             android:contentDescription="@string/setting"
@@ -379,7 +384,9 @@
                 android:layout_width="match_parent"
                 android:layout_height="0dp"
                 android:layout_weight="1"
+                android:adjustViewBounds="true"
                 android:contentDescription="@string/aloud_config"
+                android:maxHeight="20dp"
                 android:src="@drawable/ic_settings"
                 app:tint="@color/primaryText"
                 tools:ignore="NestedWeights" />
@@ -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" />
         </LinearLayout>
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">
 
         <io.legado.app.ui.widget.text.BadgeView
             android:id="@+id/bv_unread"
diff --git a/app/src/main/res/layout/view_read_menu.xml b/app/src/main/res/layout/view_read_menu.xml
index cc4f50b49..a0985167c 100644
--- a/app/src/main/res/layout/view_read_menu.xml
+++ b/app/src/main/res/layout/view_read_menu.xml
@@ -76,9 +76,9 @@
         android:layout_height="0dp"
         android:layout_marginHorizontal="16dp"
         android:layout_marginTop="16dp"
+        android:background="@color/transparent30"
         android:gravity="center_horizontal"
         android:orientation="vertical"
-        android:background="@color/transparent30"
         app:layout_constraintBottom_toTopOf="@+id/bottom_menu"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/title_bar"
@@ -212,265 +212,257 @@
         </LinearLayout>
 
         <!--底部设置栏-->
-        <FrameLayout
+        <LinearLayout
+            android:id="@+id/ll_bottom_bg"
             android:layout_width="match_parent"
-            android:layout_height="100dp"
-            android:importantForAccessibility="no">
-
-            <View
-                android:id="@+id/vw_bg"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:importantForAccessibility="no" />
-
+            android:layout_height="wrap_content"
+            android:background="@color/background_menu"
+            android:importantForAccessibility="no"
+            android:orientation="vertical">
+            <!--章节设置-->
             <LinearLayout
-                android:id="@+id/ll_bottom_bg"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="@color/background_menu"
+                android:layout_marginLeft="20dp"
+                android:layout_marginTop="5dp"
+                android:layout_marginRight="20dp"
+                android:layout_marginBottom="5dp"
                 android:importantForAccessibility="no"
-                android:orientation="vertical">
-                <!--章节设置-->
-                <LinearLayout
-                    android:layout_width="match_parent"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:id="@+id/tv_pre"
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginLeft="20dp"
-                    android:layout_marginTop="5dp"
-                    android:layout_marginRight="20dp"
-                    android:layout_marginBottom="5dp"
-                    android:importantForAccessibility="no"
-                    android:orientation="horizontal">
+                    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" />
 
-                    <TextView
-                        android:id="@+id/tv_pre"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        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" />
+                <io.legado.app.lib.theme.view.ThemeSeekBar
+                    android:id="@+id/seek_read_page"
+                    android:layout_width="0dp"
+                    android:layout_height="25dp"
+                    android:layout_gravity="center_vertical"
+                    android:layout_weight="1" />
 
-                    <io.legado.app.lib.theme.view.ThemeSeekBar
-                        android:id="@+id/seek_read_page"
-                        android:layout_width="0dp"
-                        android:layout_height="25dp"
-                        android:layout_gravity="center_vertical"
-                        android:layout_weight="1" />
-
-                    <TextView
-                        android:id="@+id/tv_next"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        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" />
-                </LinearLayout>
-
-                <LinearLayout
-                    android:layout_width="match_parent"
+                <TextView
+                    android:id="@+id/tv_next"
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:baselineAligned="false"
-                    android:importantForAccessibility="no"
-                    android:orientation="horizontal">
+                    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" />
+            </LinearLayout>
 
-                    <View
-                        android:layout_width="0dp"
-                        android:layout_height="match_parent"
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:baselineAligned="false"
+                android:importantForAccessibility="no"
+                android:orientation="horizontal">
+
+                <View
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:importantForAccessibility="no" />
+
+                <!--目录按钮-->
+                <LinearLayout
+                    android:id="@+id/ll_catalog"
+                    android:layout_width="60dp"
+                    android:layout_height="wrap_content"
+                    android:background="?android:attr/selectableItemBackgroundBorderless"
+                    android:clickable="true"
+                    android:contentDescription="@string/chapter_list"
+                    android:focusable="true"
+                    android:orientation="vertical"
+                    android:paddingBottom="7dp"
+                    tools:ignore="VisualLintBounds">
+
+                    <androidx.appcompat.widget.AppCompatImageView
+                        android:id="@+id/iv_catalog"
+                        android:layout_width="match_parent"
+                        android:layout_height="0dp"
                         android:layout_weight="1"
-                        android:importantForAccessibility="no" />
-
-                    <!--目录按钮-->
-                    <LinearLayout
-                        android:id="@+id/ll_catalog"
-                        android:layout_width="60dp"
-                        android:layout_height="50dp"
-                        android:background="?android:attr/selectableItemBackgroundBorderless"
-                        android:clickable="true"
+                        android:adjustViewBounds="true"
                         android:contentDescription="@string/chapter_list"
-                        android:focusable="true"
-                        android:orientation="vertical"
-                        android:paddingBottom="7dp"
-                        tools:ignore="VisualLintBounds">
-
-                        <androidx.appcompat.widget.AppCompatImageView
-                            android:id="@+id/iv_catalog"
-                            android:layout_width="match_parent"
-                            android:layout_height="0dp"
-                            android:layout_weight="1"
-                            android:contentDescription="@string/chapter_list"
-                            android:src="@drawable/ic_toc"
-                            app:tint="@color/primaryText"
-                            tools:ignore="NestedWeights" />
-
-                        <TextView
-                            android:id="@+id/tv_catalog"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="center_horizontal"
-                            android:layout_marginTop="3dp"
-                            android:ellipsize="middle"
-                            android:singleLine="true"
-                            android:text="@string/chapter_list"
-                            android:textColor="@color/primaryText"
-                            android:textSize="12sp" />
-                    </LinearLayout>
-
-                    <View
-                        android:layout_width="0dp"
-                        android:layout_height="match_parent"
-                        android:layout_weight="2"
-                        android:importantForAccessibility="no" />
-
-                    <!--调节按钮-->
-                    <LinearLayout
-                        android:id="@+id/ll_read_aloud"
-                        android:layout_width="60dp"
-                        android:layout_height="50dp"
-                        android:background="?android:attr/selectableItemBackgroundBorderless"
-                        android:clickable="true"
-                        android:contentDescription="@string/read_aloud"
-                        android:focusable="true"
-                        android:orientation="vertical"
-                        android:paddingBottom="7dp"
-                        tools:ignore="VisualLintBounds">
-
-                        <androidx.appcompat.widget.AppCompatImageView
-                            android:id="@+id/iv_read_aloud"
-                            android:layout_width="match_parent"
-                            android:layout_height="0dp"
-                            android:layout_weight="1"
-                            android:contentDescription="@string/read_aloud"
-                            android:src="@drawable/ic_read_aloud"
-                            app:tint="@color/primaryText"
-                            tools:ignore="NestedWeights" />
-
-                        <TextView
-                            android:id="@+id/tv_read_aloud"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="center_horizontal"
-                            android:layout_marginTop="3dp"
-                            android:ellipsize="middle"
-                            android:singleLine="true"
-                            android:text="@string/read_aloud"
-                            android:textColor="@color/primaryText"
-                            android:textSize="12sp" />
-                    </LinearLayout>
-
-                    <View
-                        android:layout_width="0dp"
-                        android:layout_height="match_parent"
-                        android:layout_weight="2"
-                        android:importantForAccessibility="no" />
-
-                    <!--界面按钮-->
-                    <LinearLayout
-                        android:id="@+id/ll_font"
-                        android:layout_width="60dp"
-                        android:layout_height="50dp"
-                        android:background="?android:attr/selectableItemBackgroundBorderless"
-                        android:clickable="true"
-                        android:contentDescription="@string/interface_setting"
-                        android:focusable="true"
-                        android:orientation="vertical"
-                        android:paddingBottom="7dp"
-                        tools:ignore="VisualLintBounds">
-
-                        <androidx.appcompat.widget.AppCompatImageView
-                            android:id="@+id/iv_font"
-                            android:layout_width="match_parent"
-                            android:layout_height="0dp"
-                            android:layout_weight="1"
-                            android:contentDescription="@string/interface_setting"
-                            android:src="@drawable/ic_interface_setting"
-                            app:tint="@color/primaryText"
-                            tools:ignore="NestedWeights" />
-
-                        <TextView
-                            android:id="@+id/tv_font"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="center_horizontal"
-                            android:layout_marginTop="3dp"
-                            android:ellipsize="middle"
-                            android:singleLine="true"
-                            android:text="@string/interface_setting"
-                            android:textColor="@color/primaryText"
-                            android:textSize="12sp" />
-                    </LinearLayout>
-
-                    <View
-                        android:layout_width="0dp"
-                        android:layout_height="match_parent"
-                        android:layout_weight="2"
-                        android:importantForAccessibility="no" />
-
-                    <!--设置按钮-->
-                    <LinearLayout
-                        android:id="@+id/ll_setting"
-                        android:layout_width="60dp"
-                        android:layout_height="50dp"
-                        android:background="?android:attr/selectableItemBackgroundBorderless"
-                        android:clickable="true"
-                        android:contentDescription="@string/setting"
-                        android:focusable="true"
-                        android:orientation="vertical"
-                        android:paddingBottom="7dp"
-                        tools:ignore="VisualLintBounds">
-
-                        <androidx.appcompat.widget.AppCompatImageView
-                            android:id="@+id/iv_setting"
-                            android:layout_width="match_parent"
-                            android:layout_height="0dp"
-                            android:layout_weight="1"
-                            android:contentDescription="@string/setting"
-                            android:src="@drawable/ic_settings"
-                            app:tint="@color/primaryText"
-                            tools:ignore="NestedWeights" />
-
-                        <TextView
-                            android:id="@+id/tv_setting"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="center_horizontal"
-                            android:layout_marginTop="3dp"
-                            android:ellipsize="middle"
-                            android:singleLine="true"
-                            android:text="@string/setting"
-                            android:textColor="@color/primaryText"
-                            android:textSize="12sp" />
-                    </LinearLayout>
-
-                    <View
-                        android:layout_width="0dp"
-                        android:layout_height="match_parent"
-                        android:layout_weight="1"
-                        android:importantForAccessibility="no" />
+                        android:maxHeight="20dp"
+                        android:src="@drawable/ic_toc"
+                        app:tint="@color/primaryText"
+                        tools:ignore="NestedWeights" />
 
+                    <TextView
+                        android:id="@+id/tv_catalog"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_horizontal"
+                        android:layout_marginTop="3dp"
+                        android:ellipsize="middle"
+                        android:singleLine="true"
+                        android:text="@string/chapter_list"
+                        android:textColor="@color/primaryText"
+                        android:textSize="12sp" />
                 </LinearLayout>
 
                 <View
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent" />
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="2"
+                    android:importantForAccessibility="no" />
+
+                <!--调节按钮-->
+                <LinearLayout
+                    android:id="@+id/ll_read_aloud"
+                    android:layout_width="60dp"
+                    android:layout_height="wrap_content"
+                    android:background="?android:attr/selectableItemBackgroundBorderless"
+                    android:clickable="true"
+                    android:contentDescription="@string/read_aloud"
+                    android:focusable="true"
+                    android:orientation="vertical"
+                    android:paddingBottom="7dp"
+                    tools:ignore="VisualLintBounds">
+
+                    <androidx.appcompat.widget.AppCompatImageView
+                        android:id="@+id/iv_read_aloud"
+                        android:layout_width="match_parent"
+                        android:layout_height="0dp"
+                        android:layout_weight="1"
+                        android:adjustViewBounds="true"
+                        android:contentDescription="@string/read_aloud"
+                        android:maxHeight="20dp"
+                        android:src="@drawable/ic_read_aloud"
+                        app:tint="@color/primaryText"
+                        tools:ignore="NestedWeights" />
+
+                    <TextView
+                        android:id="@+id/tv_read_aloud"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_horizontal"
+                        android:layout_marginTop="3dp"
+                        android:ellipsize="middle"
+                        android:singleLine="true"
+                        android:text="@string/read_aloud"
+                        android:textColor="@color/primaryText"
+                        android:textSize="12sp" />
+                </LinearLayout>
+
+                <View
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="2"
+                    android:importantForAccessibility="no" />
+
+                <!--界面按钮-->
+                <LinearLayout
+                    android:id="@+id/ll_font"
+                    android:layout_width="60dp"
+                    android:layout_height="wrap_content"
+                    android:background="?android:attr/selectableItemBackgroundBorderless"
+                    android:clickable="true"
+                    android:contentDescription="@string/interface_setting"
+                    android:focusable="true"
+                    android:orientation="vertical"
+                    android:paddingBottom="7dp"
+                    tools:ignore="VisualLintBounds">
+
+                    <androidx.appcompat.widget.AppCompatImageView
+                        android:id="@+id/iv_font"
+                        android:layout_width="match_parent"
+                        android:layout_height="0dp"
+                        android:layout_weight="1"
+                        android:adjustViewBounds="true"
+                        android:contentDescription="@string/interface_setting"
+                        android:maxHeight="20dp"
+                        android:src="@drawable/ic_interface_setting"
+                        app:tint="@color/primaryText"
+                        tools:ignore="NestedWeights" />
+
+                    <TextView
+                        android:id="@+id/tv_font"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_horizontal"
+                        android:layout_marginTop="3dp"
+                        android:ellipsize="middle"
+                        android:singleLine="true"
+                        android:text="@string/interface_setting"
+                        android:textColor="@color/primaryText"
+                        android:textSize="12sp" />
+                </LinearLayout>
+
+                <View
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="2"
+                    android:importantForAccessibility="no" />
+
+                <!--设置按钮-->
+                <LinearLayout
+                    android:id="@+id/ll_setting"
+                    android:layout_width="60dp"
+                    android:layout_height="wrap_content"
+                    android:background="?android:attr/selectableItemBackgroundBorderless"
+                    android:clickable="true"
+                    android:contentDescription="@string/setting"
+                    android:focusable="true"
+                    android:orientation="vertical"
+                    android:paddingBottom="7dp"
+                    tools:ignore="VisualLintBounds">
+
+                    <androidx.appcompat.widget.AppCompatImageView
+                        android:id="@+id/iv_setting"
+                        android:layout_width="match_parent"
+                        android:layout_height="0dp"
+                        android:layout_weight="1"
+                        android:adjustViewBounds="true"
+                        android:contentDescription="@string/setting"
+                        android:maxHeight="20dp"
+                        android:src="@drawable/ic_settings"
+                        app:tint="@color/primaryText"
+                        tools:ignore="NestedWeights" />
+
+                    <TextView
+                        android:id="@+id/tv_setting"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_horizontal"
+                        android:layout_marginTop="3dp"
+                        android:ellipsize="middle"
+                        android:singleLine="true"
+                        android:text="@string/setting"
+                        android:textColor="@color/primaryText"
+                        android:textSize="12sp" />
+                </LinearLayout>
+
+                <View
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:importantForAccessibility="no" />
+
             </LinearLayout>
-        </FrameLayout>
+        </LinearLayout>
     </LinearLayout>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ 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 @@
         <LinearLayout
             android:id="@+id/ll_bottom_bg"
             android:layout_width="match_parent"
-            android:layout_height="50dp"
+            android:layout_height="wrap_content"
             android:baselineAligned="false"
             android:orientation="horizontal">
 
@@ -122,8 +122,8 @@
             <!--结果按钮-->
             <LinearLayout
                 android:id="@+id/ll_search_results"
-                android:layout_width="50dp"
-                android:layout_height="50dp"
+                android:layout_width="60dp"
+                android:layout_height="wrap_content"
                 android:background="?android:attr/selectableItemBackgroundBorderless"
                 android:clickable="true"
                 android:contentDescription="结果"
@@ -137,7 +137,9 @@
                     android:layout_width="match_parent"
                     android:layout_height="0dp"
                     android:layout_weight="1"
+                    android:adjustViewBounds="true"
                     android:contentDescription="结果"
+                    android:maxHeight="20dp"
                     android:src="@drawable/ic_toc"
                     app:tint="@color/primaryText"
                     tools:ignore="NestedWeights" />
@@ -162,8 +164,8 @@
             <!--调节按钮-->
             <LinearLayout
                 android:id="@+id/ll_main_menu"
-                android:layout_width="50dp"
-                android:layout_height="50dp"
+                android:layout_width="60dp"
+                android:layout_height="wrap_content"
                 android:background="?android:attr/selectableItemBackgroundBorderless"
                 android:clickable="true"
                 android:contentDescription="@string/read_aloud"
@@ -176,7 +178,9 @@
                     android:layout_width="match_parent"
                     android:layout_height="0dp"
                     android:layout_weight="1"
+                    android:adjustViewBounds="true"
                     android:contentDescription="@string/main_menu"
+                    android:maxHeight="20dp"
                     android:src="@drawable/ic_menu"
                     app:tint="@color/primaryText"
                     tools:ignore="NestedWeights" />
@@ -200,8 +204,8 @@
             <!--界面按钮-->
             <LinearLayout
                 android:id="@+id/ll_search_exit"
-                android:layout_width="50dp"
-                android:layout_height="50dp"
+                android:layout_width="60dp"
+                android:layout_height="wrap_content"
                 android:background="?android:attr/selectableItemBackgroundBorderless"
                 android:clickable="true"
                 android:contentDescription="退出"
@@ -214,7 +218,9 @@
                     android:layout_width="match_parent"
                     android:layout_height="0dp"
                     android:layout_weight="1"
+                    android:adjustViewBounds="true"
                     android:contentDescription="退出"
+                    android:maxHeight="20dp"
                     android:src="@drawable/ic_auto_page_stop"
                     app:tint="@color/primaryText"
                     tools:ignore="NestedWeights" />