From 372327b605edb69903a55c76a0238b142c45f5d6 Mon Sep 17 00:00:00 2001
From: HapeLee <1321903405@qq.com>
Date: Mon, 16 Jun 2025 19:56:31 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/res/drawable/ic_cursor_left.xml  |   2 +-
 app/src/main/res/drawable/ic_cursor_right.xml |   2 +-
 app/src/main/res/layout/dialog_text_view.xml  |   2 +-
 app/src/main/res/layout/item_source_edit.xml  |   6 +-
 app/src/main/res/layout/view_read_menu.xml    | 438 +++++++++---------
 5 files changed, 227 insertions(+), 223 deletions(-)

diff --git a/app/src/main/res/drawable/ic_cursor_left.xml b/app/src/main/res/drawable/ic_cursor_left.xml
index 1656763c3..d10e5da81 100644
--- a/app/src/main/res/drawable/ic_cursor_left.xml
+++ b/app/src/main/res/drawable/ic_cursor_left.xml
@@ -6,6 +6,6 @@
     android:viewportHeight="24">
 
     <path
-        android:fillColor="#595757"
+        android:fillColor="?attr/colorPrimary"
         android:pathData="M12,4h8v8c0,4.418-3.582,8-8,8s-8-3.582-8-8S7.582,4,12,4z" />
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_cursor_right.xml b/app/src/main/res/drawable/ic_cursor_right.xml
index 99734ea19..4f4181ecb 100644
--- a/app/src/main/res/drawable/ic_cursor_right.xml
+++ b/app/src/main/res/drawable/ic_cursor_right.xml
@@ -6,6 +6,6 @@
     android:viewportHeight="24">
 
     <path
-        android:fillColor="#595757"
+        android:fillColor="?attr/colorPrimary"
         android:pathData="M12,4.208H4v8c0,4.418,3.582,8,8,8s8-3.582,8-8S16.418,4.208,12,4.208z" />
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_text_view.xml b/app/src/main/res/layout/dialog_text_view.xml
index fd378010f..7a18e6677 100644
--- a/app/src/main/res/layout/dialog_text_view.xml
+++ b/app/src/main/res/layout/dialog_text_view.xml
@@ -35,7 +35,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:fillViewport="true">
-        <com.google.android.material.textview.MaterialTextView
+        <io.legato.kazusa.ui.widget.text.ScrollTextView
             android:id="@+id/text_view"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/item_source_edit.xml b/app/src/main/res/layout/item_source_edit.xml
index 6731b406d..a44611ae7 100644
--- a/app/src/main/res/layout/item_source_edit.xml
+++ b/app/src/main/res/layout/item_source_edit.xml
@@ -5,15 +5,15 @@
     android:id="@+id/textInputLayout"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:paddingHorizontal="12dp"
-    android:paddingVertical="6dp">
+    android:paddingHorizontal="16dp"
+    android:paddingVertical="8dp">
 
     <io.legato.kazusa.ui.widget.code.CodeView
         android:id="@+id/editText"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         style="@style/Widget.Material3.TextInputLayout.OutlinedBox.Dense"
-        android:padding="12dp"
+        android:padding="16dp"
         android:inputType="textMultiLine"
         tools:ignore="SpeakableTextPresentCheck,TouchTargetSizeCheck" />
 
diff --git a/app/src/main/res/layout/view_read_menu.xml b/app/src/main/res/layout/view_read_menu.xml
index 76f1234e0..305e62717 100644
--- a/app/src/main/res/layout/view_read_menu.xml
+++ b/app/src/main/res/layout/view_read_menu.xml
@@ -19,7 +19,6 @@
         android:id="@+id/title_bar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:theme="?attr/actionBarStyle"
         app:layout_constraintTop_toTopOf="parent">
 
         <androidx.constraintlayout.widget.ConstraintLayout
@@ -197,246 +196,251 @@
 
         </LinearLayout>
 
-        <!--底部设置栏-->
-        <LinearLayout
-            android:id="@+id/ll_bottom_bg"
+        <com.google.android.material.card.MaterialCardView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="?attr/colorSurface"
-            android:importantForAccessibility="no"
-            android:orientation="vertical">
-            <!--章节设置-->
+            app:strokeWidth="0dp"
+            android:layout_margin="8dp">
             <LinearLayout
+                android:id="@+id/ll_bottom_bg"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="16dp"
-                android:layout_marginTop="5dp"
-                android:layout_marginRight="16dp"
-                android:layout_marginBottom="5dp"
+                android:background="?attr/colorSurface"
                 android:importantForAccessibility="no"
-                android:gravity="center"
-                android:orientation="horizontal">
-
-                <com.google.android.material.button.MaterialButton
-                    android:id="@+id/tv_pre"
-                    style="@style/Widget.Material3.Button.IconButton.Outlined"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_margin="4dp"
-                    android:clickable="true"
-                    android:enabled="false"
-                    android:focusable="true"
-                    app:icon="@drawable/ic_previous"
-                    android:contentDescription="@string/previous_chapter"
-                    tools:ignore="TouchTargetSizeCheck" />
-
-                <com.google.android.material.slider.Slider
-                    android:id="@+id/seek_read_page"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:layout_weight="1"
-                    android:valueTo="2.0"
-                    android:valueFrom="1.0"
-                    android:value="1.0"/>
-
-                <com.google.android.material.button.MaterialButton
-                    android:id="@+id/tv_next"
-                    style="@style/Widget.Material3.Button.IconButton.Outlined"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_margin="4dp"
-                    android:clickable="true"
-                    android:enabled="false"
-                    android:focusable="true"
-                    app:icon="@drawable/ic_next"
-                    android:contentDescription="@string/next_chapter"
-                    tools:ignore="TouchTargetSizeCheck"/>
-            </LinearLayout>
-
-            <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" />
-
-                <!--目录按钮-->
+                android:orientation="vertical">
+                <!--章节设置-->
                 <LinearLayout
-                    android:id="@+id/ll_catalog"
-                    android:layout_width="56dp"
+                    android:layout_width="match_parent"
                     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:layout_marginLeft="16dp"
+                    android:layout_marginTop="5dp"
+                    android:layout_marginRight="16dp"
+                    android:layout_marginBottom="5dp"
+                    android:importantForAccessibility="no"
                     android:gravity="center"
-                    android:paddingBottom="4dp"
-                    tools:ignore="VisualLintBounds">
+                    android:orientation="horizontal">
 
-                    <androidx.appcompat.widget.AppCompatImageView
-                        android:id="@+id/iv_catalog"
-                        android:layout_width="match_parent"
-                        android:layout_height="0dp"
+                    <com.google.android.material.button.MaterialButton
+                        android:id="@+id/tv_pre"
+                        style="@style/Widget.Material3.Button.IconButton.Outlined"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_margin="4dp"
+                        android:clickable="true"
+                        android:enabled="false"
+                        android:focusable="true"
+                        app:icon="@drawable/ic_previous"
+                        android:contentDescription="@string/previous_chapter"
+                        tools:ignore="TouchTargetSizeCheck" />
+
+                    <com.google.android.material.slider.Slider
+                        android:id="@+id/seek_read_page"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"
                         android:layout_weight="1"
-                        android:adjustViewBounds="true"
+                        android:valueTo="2.0"
+                        android:valueFrom="1.0"
+                        android:value="1.0"/>
+
+                    <com.google.android.material.button.MaterialButton
+                        android:id="@+id/tv_next"
+                        style="@style/Widget.Material3.Button.IconButton.Outlined"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_margin="4dp"
+                        android:clickable="true"
+                        android:enabled="false"
+                        android:focusable="true"
+                        app:icon="@drawable/ic_next"
+                        android:contentDescription="@string/next_chapter"
+                        tools:ignore="TouchTargetSizeCheck"/>
+                </LinearLayout>
+
+                <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="56dp"
+                        android:layout_height="wrap_content"
+                        android:background="?android:attr/selectableItemBackgroundBorderless"
+                        android:clickable="true"
                         android:contentDescription="@string/chapter_list"
-                        android:maxHeight="24dp"
-                        android:src="@drawable/ic_toc"
-                        tools:ignore="NestedWeights" />
+                        android:focusable="true"
+                        android:orientation="vertical"
+                        android:gravity="center"
+                        android:paddingBottom="4dp"
+                        tools:ignore="VisualLintBounds">
 
-                    <TextView
-                        android:id="@+id/tv_catalog"
-                        android:layout_width="wrap_content"
+                        <androidx.appcompat.widget.AppCompatImageView
+                            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="24dp"
+                            android:src="@drawable/ic_toc"
+                            tools:ignore="NestedWeights" />
+
+                        <TextView
+                            android:id="@+id/tv_catalog"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="2dp"
+                            android:ellipsize="middle"
+                            android:singleLine="true"
+                            android:text="@string/chapter_list"
+                            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="56dp"
                         android:layout_height="wrap_content"
-                        android:layout_marginTop="2dp"
-                        android:ellipsize="middle"
-                        android:singleLine="true"
-                        android:text="@string/chapter_list"
-                        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="56dp"
-                    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:gravity="center"
-                    android:paddingBottom="4dp"
-                    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:background="?android:attr/selectableItemBackgroundBorderless"
+                        android:clickable="true"
                         android:contentDescription="@string/read_aloud"
-                        android:maxHeight="24dp"
-                        android:src="@drawable/ic_read_aloud"
-                        tools:ignore="NestedWeights" />
+                        android:focusable="true"
+                        android:orientation="vertical"
+                        android:gravity="center"
+                        android:paddingBottom="4dp"
+                        tools:ignore="VisualLintBounds">
 
-                    <TextView
-                        android:id="@+id/tv_read_aloud"
-                        android:layout_width="wrap_content"
+                        <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="24dp"
+                            android:src="@drawable/ic_read_aloud"
+                            tools:ignore="NestedWeights" />
+
+                        <TextView
+                            android:id="@+id/tv_read_aloud"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="2dp"
+                            android:ellipsize="middle"
+                            android:singleLine="true"
+                            android:text="@string/read_aloud"
+                            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="56dp"
                         android:layout_height="wrap_content"
-                        android:layout_marginTop="2dp"
-                        android:ellipsize="middle"
-                        android:singleLine="true"
-                        android:text="@string/read_aloud"
-                        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="56dp"
-                    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:gravity="center"
-                    android:paddingBottom="4dp"
-                    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:background="?android:attr/selectableItemBackgroundBorderless"
+                        android:clickable="true"
                         android:contentDescription="@string/interface_setting"
-                        android:maxHeight="24dp"
-                        android:src="@drawable/ic_interface_setting"
-                        tools:ignore="NestedWeights" />
+                        android:focusable="true"
+                        android:orientation="vertical"
+                        android:gravity="center"
+                        android:paddingBottom="4dp"
+                        tools:ignore="VisualLintBounds">
 
-                    <TextView
-                        android:id="@+id/tv_font"
-                        android:layout_width="wrap_content"
+                        <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="24dp"
+                            android:src="@drawable/ic_interface_setting"
+                            tools:ignore="NestedWeights" />
+
+                        <TextView
+                            android:id="@+id/tv_font"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="2dp"
+                            android:ellipsize="middle"
+                            android:singleLine="true"
+                            android:text="@string/interface_setting"
+                            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="56dp"
                         android:layout_height="wrap_content"
-                        android:layout_marginTop="2dp"
-                        android:ellipsize="middle"
-                        android:singleLine="true"
-                        android:text="@string/interface_setting"
-                        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="56dp"
-                    android:layout_height="wrap_content"
-                    android:background="?android:attr/selectableItemBackgroundBorderless"
-                    android:clickable="true"
-                    android:contentDescription="@string/setting"
-                    android:focusable="true"
-                    android:orientation="vertical"
-                    android:gravity="center"
-                    android:paddingBottom="4dp"
-                    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:background="?android:attr/selectableItemBackgroundBorderless"
+                        android:clickable="true"
                         android:contentDescription="@string/setting"
-                        android:maxHeight="24dp"
-                        android:src="@drawable/ic_settings"
-                        tools:ignore="NestedWeights" />
+                        android:focusable="true"
+                        android:orientation="vertical"
+                        android:gravity="center"
+                        android:paddingBottom="4dp"
+                        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="24dp"
+                            android:src="@drawable/ic_settings"
+                            tools:ignore="NestedWeights" />
+
+                        <TextView
+                            android:id="@+id/tv_setting"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="2dp"
+                            android:ellipsize="middle"
+                            android:singleLine="true"
+                            android:text="@string/setting"
+                            android:textSize="12sp" />
+                    </LinearLayout>
+
+                    <View
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1"
+                        android:importantForAccessibility="no" />
 
-                    <TextView
-                        android:id="@+id/tv_setting"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="2dp"
-                        android:ellipsize="middle"
-                        android:singleLine="true"
-                        android:text="@string/setting"
-                        android:textSize="12sp" />
                 </LinearLayout>
-
-                <View
-                    android:layout_width="0dp"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1"
-                    android:importantForAccessibility="no" />
-
             </LinearLayout>
-        </LinearLayout>
+        </com.google.android.material.card.MaterialCardView>
     </LinearLayout>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file