From 239ee28179a24745f75b06a80f368e25ea0d1df2 Mon Sep 17 00:00:00 2001
From: HapeLee <1321903405@qq.com>
Date: Wed, 15 Oct 2025 00:43:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=9C=97=E8=AF=BB=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E7=95=8C=E9=9D=A2=E9=97=AE=E9=A2=98=20#100?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ui/book/read/config/ReadAloudDialog.kt    | 10 ++-
 app/src/main/res/layout/dialog_read_aloud.xml | 74 ++++++++-----------
 2 files changed, 37 insertions(+), 47 deletions(-)

diff --git a/app/src/main/java/io/legato/kazusa/ui/book/read/config/ReadAloudDialog.kt b/app/src/main/java/io/legato/kazusa/ui/book/read/config/ReadAloudDialog.kt
index c924a8ea1..b85aa7a29 100644
--- a/app/src/main/java/io/legato/kazusa/ui/book/read/config/ReadAloudDialog.kt
+++ b/app/src/main/java/io/legato/kazusa/ui/book/read/config/ReadAloudDialog.kt
@@ -94,11 +94,11 @@ class ReadAloudDialog : BaseBottomSheetDialogFragment(R.layout.dialog_read_aloud
     }
 
     private fun initEvent() = binding.run {
-        llMainMenu.setOnClickListener {
+        ivMainMenu.setOnClickListener {
             callBack?.showMenuBar()
             dismissAllowingStateLoss()
         }
-        llSetting.setOnClickListener {
+        ivSetting.setOnClickListener {
             ReadAloudConfigDialog().show(childFragmentManager, "readAloudConfigDialog")
         }
         tvPre.setOnClickListener { ReadBook.moveToPrevChapter(upContent = true, toLast = false) }
@@ -110,8 +110,8 @@ class ReadAloudDialog : BaseBottomSheetDialogFragment(R.layout.dialog_read_aloud
         ivPlayPause.setOnClickListener { callBack?.onClickReadAloud() }
         ivPlayPrev.setOnClickListener { ReadAloud.prevParagraph(requireContext()) }
         ivPlayNext.setOnClickListener { ReadAloud.nextParagraph(requireContext()) }
-        llCatalog.setOnClickListener { callBack?.openChapterList() }
-        llToBackstage.setOnClickListener { callBack?.finish() }
+        ivCatalog.setOnClickListener { callBack?.openChapterList() }
+        ivToBackstage.setOnClickListener { callBack?.finish() }
         cbTtsFollowSys.setOnCheckedChangeListener { _, isChecked ->
             AppConfig.ttsFlowSys = isChecked
             upTtsSpeechRateEnabled(!isChecked)
@@ -134,6 +134,7 @@ class ReadAloudDialog : BaseBottomSheetDialogFragment(R.layout.dialog_read_aloud
             val newValue = (seekTtsSpeechRate.value - 1).coerceAtLeast(seekTtsSpeechRate.valueFrom)
             seekTtsSpeechRate.value = newValue
             AppConfig.ttsSpeechRate = newValue.toInt()
+            upTtsSpeechRateText(newValue.toInt())
             upTtsSpeechRate()
         }
 
@@ -142,6 +143,7 @@ class ReadAloudDialog : BaseBottomSheetDialogFragment(R.layout.dialog_read_aloud
             val newValue = (seekTtsSpeechRate.value + 1).coerceAtMost(seekTtsSpeechRate.valueTo)
             seekTtsSpeechRate.value = newValue
             AppConfig.ttsSpeechRate = newValue.toInt()
+            upTtsSpeechRateText(newValue.toInt())
             upTtsSpeechRate()
         }
 
diff --git a/app/src/main/res/layout/dialog_read_aloud.xml b/app/src/main/res/layout/dialog_read_aloud.xml
index cd086e076..888d78042 100644
--- a/app/src/main/res/layout/dialog_read_aloud.xml
+++ b/app/src/main/res/layout/dialog_read_aloud.xml
@@ -254,7 +254,7 @@
         <!--目录按钮-->
         <LinearLayout
             android:id="@+id/ll_catalog"
-            android:layout_width="60dp"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:background="?attr/selectableItemBackgroundBorderless"
             android:clickable="true"
@@ -263,16 +263,13 @@
             android:orientation="vertical"
             android:paddingBottom="7dp">
 
-            <androidx.appcompat.widget.AppCompatImageView
+            <com.google.android.material.button.MaterialButton
                 android:id="@+id/iv_catalog"
-                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"
-                tools:ignore="NestedWeights" />
+                android:layout_width="60dp"
+                android:layout_height="wrap_content"
+                style="@style/Widget.Material3Expressive.Button.IconButton.Tonal"
+                app:icon="@drawable/ic_toc"
+                app:iconGravity="textStart"/>
 
             <TextView
                 android:id="@+id/tv_catalog"
@@ -289,11 +286,11 @@
         <View
             android:layout_width="0dp"
             android:layout_height="match_parent"
-            android:layout_weight="2" />
+            android:layout_weight="1" />
         <!--调节按钮-->
         <LinearLayout
             android:id="@+id/ll_main_menu"
-            android:layout_width="60dp"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:background="?attr/selectableItemBackgroundBorderless"
             android:clickable="true"
@@ -303,16 +300,13 @@
             android:paddingBottom="7dp"
             tools:ignore="TextSizeCheck">
 
-            <androidx.appcompat.widget.AppCompatImageView
+            <com.google.android.material.button.MaterialButton
                 android:id="@+id/iv_main_menu"
-                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"
-                tools:ignore="NestedWeights" />
+                android:layout_width="60dp"
+                android:layout_height="wrap_content"
+                style="@style/Widget.Material3Expressive.Button.IconButton.Tonal"
+                app:icon="@drawable/ic_menu"
+                app:iconGravity="textStart"/>
 
             <TextView
                 android:id="@+id/tv_main_menu"
@@ -329,11 +323,11 @@
         <View
             android:layout_width="0dp"
             android:layout_height="match_parent"
-            android:layout_weight="2" />
+            android:layout_weight="1" />
         <!--界面按钮-->
         <LinearLayout
             android:id="@+id/ll_to_backstage"
-            android:layout_width="60dp"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:background="?attr/selectableItemBackgroundBorderless"
             android:clickable="true"
@@ -342,16 +336,13 @@
             android:orientation="vertical"
             android:paddingBottom="7dp">
 
-            <androidx.appcompat.widget.AppCompatImageView
+            <com.google.android.material.button.MaterialButton
                 android:id="@+id/iv_to_backstage"
-                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"
-                tools:ignore="NestedWeights" />
+                android:layout_width="60dp"
+                android:layout_height="wrap_content"
+                style="@style/Widget.Material3Expressive.Button.IconButton.Tonal"
+                app:icon="@drawable/ic_visibility_off"
+                app:iconGravity="textStart"/>
 
             <TextView
                 android:id="@+id/tv_to_backstage"
@@ -368,11 +359,11 @@
         <View
             android:layout_width="0dp"
             android:layout_height="match_parent"
-            android:layout_weight="2" />
+            android:layout_weight="1" />
         <!--设置按钮-->
         <LinearLayout
             android:id="@+id/ll_setting"
-            android:layout_width="60dp"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:background="?attr/selectableItemBackgroundBorderless"
             android:clickable="true"
@@ -381,16 +372,13 @@
             android:orientation="vertical"
             android:paddingBottom="7dp">
 
-            <androidx.appcompat.widget.AppCompatImageView
+            <com.google.android.material.button.MaterialButton
                 android:id="@+id/iv_setting"
-                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"
-                tools:ignore="NestedWeights" />
+                android:layout_width="60dp"
+                android:layout_height="wrap_content"
+                style="@style/Widget.Material3Expressive.Button.IconButton.Tonal"
+                app:icon="@drawable/ic_settings"
+                app:iconGravity="textStart"/>
 
             <TextView
                 android:id="@+id/tv_setting"