更新界面

app/src/main/AndroidManifest.xml

@@ -124,7 +124,7 @@
         <!-- 阅读界面 -->
         <activity
             android:name=".ui.book.read.ReadBookActivity"
-            android:configChanges="locale|keyboardHidden|smallestScreenSize|screenLayout"
+
             android:enableOnBackInvokedCallback="true"
             android:exported="true"
             android:launchMode="singleTask">

app/src/main/java/io/legato/kazusa/ui/book/read/ReadBookActivity.kt

@@ -1,5 +1,6 @@
 package io.legato.kazusa.ui.book.read
 
+//import io.legado.app.lib.theme.accentColor
 import android.annotation.SuppressLint
 import android.content.Intent
 import android.content.res.Configuration
@@ -34,7 +35,6 @@ import io.legato.kazusa.data.entities.Book
 import io.legato.kazusa.data.entities.BookChapter
 import io.legato.kazusa.data.entities.BookProgress
 import io.legato.kazusa.data.entities.BookSource
-import io.legato.kazusa.data.entities.ReplaceRule
 import io.legato.kazusa.exception.NoStackTraceException
 import io.legato.kazusa.help.AppWebDav
 import io.legato.kazusa.help.IntentData
@@ -57,7 +57,6 @@ import io.legato.kazusa.help.storage.Backup
 import io.legato.kazusa.lib.dialogs.SelectItem
 import io.legato.kazusa.lib.dialogs.alert
 import io.legato.kazusa.lib.dialogs.selector
-//import io.legado.app.lib.theme.accentColor
 import io.legato.kazusa.model.ReadAloud
 import io.legato.kazusa.model.ReadBook
 import io.legato.kazusa.model.analyzeRule.AnalyzeRule
@@ -76,7 +75,6 @@ import io.legato.kazusa.ui.book.info.BookInfoActivity
 import io.legato.kazusa.ui.book.read.config.AutoReadDialog
 import io.legato.kazusa.ui.book.read.config.BgTextConfigDialog.Companion.BG_COLOR
 import io.legato.kazusa.ui.book.read.config.BgTextConfigDialog.Companion.TEXT_COLOR
-import io.legato.kazusa.ui.book.read.config.MoreConfigDialog
 import io.legato.kazusa.ui.book.read.config.ReadAloudDialog
 import io.legato.kazusa.ui.book.read.config.ReadStyleDialog
 import io.legato.kazusa.ui.book.read.config.TipConfigDialog.Companion.TIP_COLOR
@@ -320,10 +318,12 @@ class ReadBookActivity : BaseReadBookActivity(),
 
     override fun onConfigurationChanged(newConfig: Configuration) {
         super.onConfigurationChanged(newConfig)
-        upSystemUiVisibility()
-        binding.readView.upStatusBar()
+        //upSystemUiVisibility()
+        //binding.readView.upStatusBar()
+        recreate()
     }
 
+
     override fun onTopResumedActivityChanged(isTopResumedActivity: Boolean) {
         if (!isTopResumedActivity) {
             ReadBook.cancelPreDownloadTask()

app/src/main/java/io/legato/kazusa/ui/widget/dialog/VariableDialog.kt

@@ -1,5 +1,6 @@
 package io.legato.kazusa.ui.widget.dialog
 
+//import io.legado.app.lib.theme.primaryColor
 import android.app.Application
 import android.os.Bundle
 import android.view.MenuItem
@@ -8,15 +9,14 @@ import android.view.ViewGroup
 import androidx.appcompat.widget.Toolbar
 import androidx.fragment.app.viewModels
 import io.legato.kazusa.R
-import io.legato.kazusa.base.BaseDialogFragment
+import io.legato.kazusa.base.BaseBottomSheetDialogFragment
 import io.legato.kazusa.base.BaseViewModel
 import io.legato.kazusa.databinding.DialogVariableBinding
-//import io.legado.app.lib.theme.primaryColor
 import io.legato.kazusa.utils.applyTint
 import io.legato.kazusa.utils.setLayout
 import io.legato.kazusa.utils.viewbindingdelegate.viewBinding
 
-class VariableDialog() : BaseDialogFragment(R.layout.dialog_variable, true),
+class VariableDialog() : BaseBottomSheetDialogFragment(R.layout.dialog_variable),
     Toolbar.OnMenuItemClickListener {
 
     private val binding by viewBinding(DialogVariableBinding::bind)

app/src/main/res/layout/activity_book_info.xml

@@ -350,7 +350,7 @@
         android:textColor="?attr/colorOnPrimary"
         android:contentDescription="@string/reading"
         app:icon="@drawable/ic_bottom_books"
-        app:backgroundTint="?attr/colorSecondary"
+        app:backgroundTint="?attr/colorTertiary"
         app:iconTint="?attr/colorOnPrimary" />
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>

app/src/main/res/layout/activity_book_search.xml

@@ -72,20 +72,27 @@
             android:layout_height="wrap_content"
             android:orientation="horizontal"
             android:paddingHorizontal="16dp"
-            android:paddingVertical="8dp">
+            android:paddingVertical="4dp">
 
             <TextView
                 android:id="@+id/tv_history"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:textSize="16sp"
+                android:textStyle="bold"
                 android:layout_gravity="center_vertical"
                 android:text="@string/searchHistory" />
 
+            <View
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1" />
+
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/tv_clear_history"
-                android:layout_width="36dp"
-                android:layout_height="36dp"
-                style="@style/Widget.Material3.Button.IconButton.Outlined"
+                style="@style/Widget.Material3Expressive.Button.IconButton.Outlined"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
                 app:iconGravity="textStart"
                 app:icon="@drawable/ic_clear_all" />
 

app/src/main/res/layout/activity_search_content.xml

@@ -42,7 +42,7 @@
             android:layout_width="0dp"
             android:layout_height="match_parent"
             android:layout_weight="1"
-            android:background="?android:attr/selectableItemBackgroundBorderless"
+            android:background="?attr/selectableItemBackgroundBorderless"
             android:ellipsize="middle"
             android:gravity="center_vertical"
             android:singleLine="true"

app/src/main/res/layout/dialog_book_change_source.xml

@@ -52,7 +52,7 @@
             android:layout_width="0dp"
             android:layout_height="match_parent"
             android:layout_weight="1"
-            android:background="?android:attr/selectableItemBackgroundBorderless"
+            android:background="?attr/selectableItemBackgroundBorderless"
             android:ellipsize="end"
             android:gravity="center_vertical"
             android:singleLine="true"

app/src/main/res/layout/dialog_chapter_change_source.xml

@@ -46,7 +46,7 @@
             android:layout_width="0dp"
             android:layout_height="match_parent"
             android:layout_weight="1"
-            android:background="?android:attr/selectableItemBackgroundBorderless"
+            android:background="?attr/selectableItemBackgroundBorderless"
             android:ellipsize="middle"
             android:gravity="center_vertical"
             android:paddingLeft="10dp"
@@ -58,7 +58,7 @@
             android:id="@+id/iv_top"
             android:layout_width="36dp"
             android:layout_height="match_parent"
-            android:background="?android:attr/selectableItemBackgroundBorderless"
+            android:background="?attr/selectableItemBackgroundBorderless"
             android:contentDescription="@string/go_to_top"
             android:src="@drawable/ic_arrow_drop_up"
             android:tooltipText="@string/go_to_top"
@@ -68,7 +68,7 @@
             android:id="@+id/iv_bottom"
             android:layout_width="36dp"
             android:layout_height="match_parent"
-            android:background="?android:attr/selectableItemBackgroundBorderless"
+            android:background="?attr/selectableItemBackgroundBorderless"
             android:contentDescription="@string/go_to_bottom"
             android:src="@drawable/ic_arrow_drop_down"
             android:tooltipText="@string/go_to_bottom"
@@ -94,7 +94,7 @@
                 android:id="@+id/iv_hide_toc"
                 android:layout_width="match_parent"
                 android:layout_height="36dp"
-                android:background="?android:attr/selectableItemBackground"
+                android:background="?attr/selectableItemBackground"
                 android:src="@drawable/ic_arrow_down" />
 
         </FrameLayout>

app/src/main/res/layout/dialog_read_aloud.xml

@@ -259,7 +259,7 @@
             android:id="@+id/ll_catalog"
             android:layout_width="60dp"
             android:layout_height="wrap_content"
-            android:background="?android:attr/selectableItemBackgroundBorderless"
+            android:background="?attr/selectableItemBackgroundBorderless"
             android:clickable="true"
             android:contentDescription="@string/chapter_list"
             android:focusable="true"
@@ -298,7 +298,7 @@
             android:id="@+id/ll_main_menu"
             android:layout_width="60dp"
             android:layout_height="wrap_content"
-            android:background="?android:attr/selectableItemBackgroundBorderless"
+            android:background="?attr/selectableItemBackgroundBorderless"
             android:clickable="true"
             android:contentDescription="@string/read_aloud"
             android:focusable="true"
@@ -338,7 +338,7 @@
             android:id="@+id/ll_to_backstage"
             android:layout_width="60dp"
             android:layout_height="wrap_content"
-            android:background="?android:attr/selectableItemBackgroundBorderless"
+            android:background="?attr/selectableItemBackgroundBorderless"
             android:clickable="true"
             android:contentDescription="@string/to_backstage"
             android:focusable="true"
@@ -377,7 +377,7 @@
             android:id="@+id/ll_setting"
             android:layout_width="60dp"
             android:layout_height="wrap_content"
-            android:background="?android:attr/selectableItemBackgroundBorderless"
+            android:background="?attr/selectableItemBackgroundBorderless"
             android:clickable="true"
             android:contentDescription="@string/setting"
             android:focusable="true"

app/src/main/res/layout/dialog_read_book_style.xml

@@ -48,6 +48,7 @@
                     android:layout_height="36dp"
                     android:layout_width="wrap_content"
                     android:layout_marginStart="8dp"
+                    app:iconSize="16dp"
                     app:icon="@drawable/ic_brightness"
                     app:iconGravity="textStart"
                     app:layout_constraintBottom_toBottomOf="parent"

app/src/main/res/layout/dialog_url_option_edit.xml

@@ -38,7 +38,7 @@
                 android:id="@+id/tv_ok"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:background="?android:attr/selectableItemBackgroundBorderless"
+                android:background="?attr/selectableItemBackgroundBorderless"
                 android:padding="12dp"
                 android:text="@string/ok" />
 

app/src/main/res/layout/dialog_variable.xml

@@ -1,47 +1,44 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:padding="16dp">
+    android:layout_height="wrap_content"
+    android:layout_gravity="center"
+    android:orientation="vertical"
+    tools:ignore="UselessParent">
+
+    <androidx.appcompat.widget.Toolbar
+        android:id="@+id/tool_bar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:displayHomeAsUp="false"
+        app:title="Set variable"
+        app:titleTextAppearance="@style/ToolbarTitle" />
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:background="@drawable/shape_card_view"
         android:orientation="vertical"
-        tools:ignore="UselessParent">
+        android:padding="16dp">
 
-        <androidx.appcompat.widget.Toolbar
-            android:id="@+id/tool_bar"
+        <com.google.android.material.textfield.TextInputLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:elevation="5dp"
-            android:theme="?attr/actionBarStyle"
-            app:displayHomeAsUp="false"
-            app:fitStatusBar="false"
-            app:title="Set variable"
-            app:titleTextAppearance="@style/ToolbarTitle" />
+            android:paddingBottom="8dp">
 
-        <io.legato.kazusa.ui.widget.text.AccentTextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:padding="3dp"
-            android:text="variable"
-            tools:ignore="HardcodedText" />
+            <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/tv_variable"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:hint="variable"
+                tools:ignore="SpeakableTextPresentCheck,TouchTargetSizeCheck" />
+        </com.google.android.material.textfield.TextInputLayout>
 
-        <io.legato.kazusa.lib.theme.view.ThemeEditText
-            android:id="@+id/tv_variable"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            tools:ignore="SpeakableTextPresentCheck,TouchTargetSizeCheck" />
 
         <androidx.core.widget.NestedScrollView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-
             android:overScrollMode="ifContentScrolls">
 
             <LinearLayout
@@ -49,7 +46,7 @@
                 android:layout_height="wrap_content"
                 android:orientation="vertical">
 
-                <io.legato.kazusa.ui.widget.text.AccentTextView
+                <TextView
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:padding="3dp"
@@ -60,13 +57,12 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:padding="3dp"
-                    android:textColor="@color/secondaryText"
                     android:textIsSelectable="true" />
 
             </LinearLayout>
 
         </androidx.core.widget.NestedScrollView>
-
     </LinearLayout>
 
-</FrameLayout>
+</LinearLayout>
+

app/src/main/res/layout/dialog_verification_code_view.xml

@@ -19,7 +19,7 @@
         android:id="@+id/verification_code_image_view"
         android:layout_width="match_parent"
         android:layout_height="100dp"
-        android:background="?android:attr/selectableItemBackgroundBorderless"
+        android:background="?attr/selectableItemBackgroundBorderless"
         android:scaleType="fitCenter"
         tools:ignore="UnusedAttribute" />
 

app/src/main/res/layout/item_app_log.xml

@@ -3,7 +3,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:padding="6dp"
-    android:background="?android:attr/selectableItemBackground"
+    android:background="?attr/selectableItemBackground"
     android:orientation="vertical">
 
     <TextView

app/src/main/res/layout/item_book_source.xml

@@ -4,9 +4,10 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="?android:attr/selectableItemBackground"
+    android:background="?attr/selectableItemBackground"
     android:clipToPadding="false"
-    android:padding="16dp"
+    android:paddingHorizontal="8dp"
+    android:paddingVertical="16dp"
     android:scrollbars="none">
 
     <TextView
@@ -51,6 +52,7 @@
         android:name="@string/enable"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginEnd="12dp"
         android:layout_marginRight="6dp"
         android:scrollbars="none"
         app:layout_constraintBottom_toTopOf="@id/iv_debug_text"
@@ -60,12 +62,13 @@
 
     <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/iv_edit"
-        android:layout_width="36dp"
-        android:layout_height="36dp"
+        android:layout_width="32dp"
+        android:layout_height="32dp"
+        android:layout_marginEnd="8dp"
+        android:background="?attr/selectableItemBackgroundBorderless"
         android:layout_gravity="center"
-        android:background="?android:attr/selectableItemBackgroundBorderless"
+        android:padding="4dp"
         android:contentDescription="@string/edit"
-        android:padding="6dp"
         android:scrollbars="none"
         android:src="@drawable/ic_edit"
         app:layout_constraintBottom_toTopOf="@id/iv_debug_text"
@@ -74,11 +77,11 @@
 
     <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/iv_menu_more"
-        android:layout_width="36dp"
-        android:layout_height="36dp"
+        android:layout_width="32dp"
+        android:layout_height="32dp"
+        android:padding="4dp"
         android:background="?attr/selectableItemBackgroundBorderless"
         android:contentDescription="@string/more_menu"
-        android:padding="6dp"
         android:scrollbars="none"
         android:src="@drawable/ic_more_vert"
         app:layout_constraintBottom_toTopOf="@id/iv_debug_text"

app/src/main/res/layout/item_change_source.xml

@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="?android:attr/selectableItemBackground"
+    android:background="?attr/selectableItemBackground"
     tools:ignore="RtlHardcoded,RtlSymmetry"
     android:paddingHorizontal="16dp">
 

app/src/main/res/layout/item_chapter_list.xml

@@ -5,7 +5,7 @@
     android:id="@+id/tv_chapter_item"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="?android:attr/selectableItemBackground"
+    android:background="?attr/selectableItemBackground"
     android:orientation="vertical"
     android:paddingHorizontal="16dp"
     android:paddingVertical="12dp">

app/src/main/res/layout/item_dict_rule.xml

@@ -6,13 +6,15 @@
     android:gravity="center"
     android:orientation="horizontal"
     android:background="?attr/selectableItemBackground"
-    android:padding="16dp">
+    android:paddingHorizontal="8dp"
+    android:paddingVertical="12dp">
 
     <io.legato.kazusa.lib.theme.view.ThemeCheckBox
         android:id="@+id/cb_name"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_weight="1"
+        android:layout_marginEnd="8dp"
         tools:ignore="RtlSymmetry" />
 
     <io.legato.kazusa.lib.theme.view.ThemeSwitch
@@ -20,25 +22,25 @@
         android:name="@string/enable"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="6dp"
-        android:layout_marginRight="6dp"
         tools:ignore="RtlSymmetry" />
 
     <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/iv_edit"
-        android:layout_width="36dp"
-        android:layout_height="36dp"
+        android:layout_width="32dp"
+        android:layout_height="32dp"
+        android:layout_marginStart="12dp"
+        android:background="?attr/selectableItemBackgroundBorderless"
         android:layout_gravity="center"
-        android:background="?android:attr/selectableItemBackgroundBorderless"
+        android:padding="4dp"
         android:contentDescription="@string/edit"
-        android:padding="6dp"
         android:src="@drawable/ic_edit" />
 
     <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/iv_delete"
-        android:layout_width="36dp"
-        android:layout_height="36dp"
-        android:padding="6dp"
+        android:layout_width="32dp"
+        android:layout_height="32dp"
+        android:layout_marginStart="8dp"
+        android:padding="4dp"
         android:background="?attr/selectableItemBackgroundBorderless"
         android:src="@drawable/ic_clear_all"
         android:contentDescription="@string/delete"

app/src/main/res/layout/item_font.xml

@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="?android:attr/selectableItemBackground"
+    android:background="?attr/selectableItemBackground"
     android:gravity="center_vertical"
     android:orientation="horizontal"
     android:padding="8dp">

app/src/main/res/layout/item_read_style.xml

@@ -2,8 +2,8 @@
 <com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/rv_style"
-    android:layout_width="64dp"
-    android:layout_height="72dp"
+    android:layout_width="48dp"
+    android:layout_height="54dp"
     android:layout_marginLeft="4dp"
     android:layout_marginRight="4dp"
     app:cardBackgroundColor="@android:color/transparent"
@@ -17,8 +17,8 @@
 
         <com.google.android.material.card.MaterialCardView
             android:id="@+id/cd_style"
-            android:layout_width="64dp"
-            android:layout_height="64dp"
+            android:layout_width="48dp"
+            android:layout_height="48dp"
             android:foreground="?android:attr/selectableItemBackground">
 
             <ImageView
@@ -28,9 +28,14 @@
 
             <TextView
                 android:id="@+id/tv_style"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:autoSizeMaxTextSize="12sp"
+                android:autoSizeMinTextSize="6sp"
+                android:autoSizeStepGranularity="1sp"
+                android:autoSizeTextType="uniform"
+                android:gravity="center"
+                android:singleLine="true"
                 android:text="@string/text" />
         </com.google.android.material.card.MaterialCardView>
     </LinearLayout>

app/src/main/res/layout/item_replace_rule.xml

@@ -6,15 +6,15 @@
     android:layout_height="wrap_content"
     android:gravity="center"
     android:orientation="horizontal"
-    android:padding="8dp"
-    android:paddingStart="16dp"
-    android:paddingEnd="16dp"
+    android:paddingHorizontal="8dp"
+    android:paddingVertical="12dp"
     android:background="?attr/selectableItemBackground">
 
     <com.google.android.material.checkbox.MaterialCheckBox
         android:id="@+id/cb_name"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
+        android:layout_marginEnd="8dp"
         android:scrollbars="none"
         android:maxLines="2"
         app:layout_constraintBottom_toBottomOf="parent"
@@ -29,7 +29,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
-        android:layout_marginEnd="8dp"
+        android:layout_marginEnd="12dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintRight_toLeftOf="@id/iv_edit"
         app:layout_constraintTop_toTopOf="parent"
@@ -37,10 +37,11 @@
 
     <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/iv_edit"
-        android:layout_width="24dp"
-        android:layout_height="24dp"
+        android:layout_width="32dp"
+        android:layout_height="32dp"
+        android:background="?attr/selectableItemBackgroundBorderless"
         android:layout_gravity="center"
-        android:background="?android:attr/selectableItemBackgroundBorderless"
+        android:padding="4dp"
         android:contentDescription="@string/edit"
         android:layout_marginEnd="8dp"
         android:src="@drawable/ic_edit"
@@ -50,11 +51,11 @@
 
     <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/iv_menu_more"
-        android:layout_width="24dp"
-        android:layout_height="24dp"
+        android:layout_width="32dp"
+        android:layout_height="32dp"
+        android:padding="4dp"
         android:background="?attr/selectableItemBackgroundBorderless"
         android:contentDescription="@string/more_menu"
-
         android:src="@drawable/ic_more_vert"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintRight_toRightOf="parent"

app/src/main/res/layout/item_rss_read_record.xml

@@ -3,7 +3,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:padding="8dp"
-    android:background="?android:attr/selectableItemBackground"
+    android:background="?attr/selectableItemBackground"
     android:orientation="vertical">
 
     <HorizontalScrollView

app/src/main/res/layout/item_rss_source.xml

@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="?android:attr/selectableItemBackground"
+    android:background="?attr/selectableItemBackground"
     android:gravity="center_vertical"
     android:orientation="horizontal"
     android:padding="12dp">
@@ -30,7 +30,7 @@
         android:layout_width="36dp"
         android:layout_height="36dp"
         android:layout_gravity="center"
-        android:background="?android:attr/selectableItemBackgroundBorderless"
+        android:background="?attr/selectableItemBackgroundBorderless"
         android:contentDescription="@string/edit"
         android:padding="6dp"
         android:src="@drawable/ic_edit"

app/src/main/res/layout/item_server_select.xml

@@ -21,7 +21,7 @@
         android:layout_width="36dp"
         android:layout_height="36dp"
         android:layout_gravity="center"
-        android:background="?android:attr/selectableItemBackgroundBorderless"
+        android:background="?attr/selectableItemBackgroundBorderless"
         android:contentDescription="@string/edit"
         android:padding="6dp"
         android:src="@drawable/ic_edit" />

app/src/main/res/layout/item_theme_config.xml

@@ -23,7 +23,7 @@
         android:layout_width="36dp"
         android:layout_height="36dp"
         android:layout_gravity="center"
-        android:background="?android:attr/selectableItemBackgroundBorderless"
+        android:background="?attr/selectableItemBackgroundBorderless"
         android:contentDescription="@string/edit"
         android:padding="6dp"
         android:tooltipText="@string/edit"

app/src/main/res/layout/item_toc_regex.xml

@@ -32,7 +32,7 @@
         android:layout_width="36dp"
         android:layout_height="36dp"
         android:layout_gravity="center"
-        android:background="?android:attr/selectableItemBackgroundBorderless"
+        android:background="?attr/selectableItemBackgroundBorderless"
         android:contentDescription="@string/edit"
         android:padding="6dp"
         android:src="@drawable/ic_edit"

app/src/main/res/layout/item_txt_toc_rule.xml

@@ -7,7 +7,7 @@
     android:background="?attr/selectableItemBackground"
     android:clickable="true"
     android:focusable="true"
-    android:paddingHorizontal="16dp"
+    android:paddingHorizontal="8dp"
     android:paddingVertical="8dp">
 
     <com.google.android.material.checkbox.MaterialCheckBox
@@ -28,7 +28,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
-        android:layout_marginEnd="8dp"
+        android:layout_marginEnd="12dp"
         app:layout_constraintBottom_toTopOf="@id/title_example"
         app:layout_constraintRight_toLeftOf="@id/iv_edit"
         app:layout_constraintTop_toTopOf="parent"
@@ -36,10 +36,11 @@
 
     <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/iv_edit"
-        android:layout_width="24dp"
-        android:layout_height="24dp"
+        android:layout_width="32dp"
+        android:layout_height="32dp"
+        android:background="?attr/selectableItemBackgroundBorderless"
         android:layout_gravity="center"
-        android:background="?android:attr/selectableItemBackgroundBorderless"
+        android:padding="4dp"
         android:contentDescription="@string/edit"
         android:layout_marginEnd="8dp"
         android:src="@drawable/ic_edit"
@@ -49,11 +50,11 @@
 
     <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/iv_menu_more"
-        android:layout_width="24dp"
-        android:layout_height="24dp"
+        android:layout_width="32dp"
+        android:layout_height="32dp"
+        android:padding="4dp"
         android:background="?attr/selectableItemBackgroundBorderless"
         android:contentDescription="@string/more_menu"
-        android:layout_marginEnd="8dp"
         android:src="@drawable/ic_more_vert"
         app:layout_constraintBottom_toTopOf="@id/title_example"
         app:layout_constraintRight_toRightOf="parent"
@@ -65,6 +66,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="6dp"
+        android:layout_marginBottom="8dp"
         android:textSize="12sp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintLeft_toLeftOf="parent" />

app/src/main/res/layout/view_manga_menu.xml

@@ -138,7 +138,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 style="@style/Widget.Material3Expressive.Button.IconButton"
-                android:background="?android:attr/selectableItemBackgroundBorderless"
+                android:background="?attr/selectableItemBackgroundBorderless"
                 app:iconTint="?attr/colorPrimary"
                 android:contentDescription="@string/chapter_list"
                 android:maxHeight="24dp"
@@ -158,7 +158,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 style="@style/Widget.Material3Expressive.Button.IconButton"
-                android:background="?android:attr/selectableItemBackgroundBorderless"
+                android:background="?attr/selectableItemBackgroundBorderless"
                 app:iconTint="?attr/colorPrimary"
                 android:contentDescription="@string/auto_next_page"
                 android:tooltipText="@string/auto_next_page"
@@ -177,7 +177,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 style="@style/Widget.Material3Expressive.Button.IconButton"
-                android:background="?android:attr/selectableItemBackgroundBorderless"
+                android:background="?attr/selectableItemBackgroundBorderless"
                 app:iconTint="?attr/colorPrimary"
                 android:contentDescription="@string/setting"
                 android:maxHeight="24dp"

app/src/main/res/layout/view_read_menu.xml

@@ -195,7 +195,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         style="@style/Widget.Material3Expressive.Button.IconButton"
-                        android:background="?android:attr/selectableItemBackgroundBorderless"
+                        android:background="?attr/selectableItemBackgroundBorderless"
                         app:iconTint="?attr/colorPrimary"
                         android:contentDescription="@string/search_content"
                         android:tooltipText="@string/search_content"
@@ -213,7 +213,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         style="@style/Widget.Material3Expressive.Button.IconButton"
-                        android:background="?android:attr/selectableItemBackgroundBorderless"
+                        android:background="?attr/selectableItemBackgroundBorderless"
                         app:iconTint="?attr/colorPrimary"
                         android:contentDescription="@string/read_aloud"
                         android:maxHeight="24dp"
@@ -232,7 +232,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         style="@style/Widget.Material3Expressive.Button.IconButton"
-                        android:background="?android:attr/selectableItemBackgroundBorderless"
+                        android:background="?attr/selectableItemBackgroundBorderless"
                         app:iconTint="?attr/colorPrimary"
                         android:contentDescription="@string/chapter_list"
                         android:tooltipText="@string/chapter_list"
@@ -252,7 +252,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         style="@style/Widget.Material3Expressive.Button.IconButton"
-                        android:background="?android:attr/selectableItemBackgroundBorderless"
+                        android:background="?attr/selectableItemBackgroundBorderless"
                         app:iconTint="?attr/colorPrimary"
                         android:contentDescription="@string/auto_next_page"
                         android:tooltipText="@string/auto_next_page"
@@ -271,7 +271,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         style="@style/Widget.Material3Expressive.Button.IconButton"
-                        android:background="?android:attr/selectableItemBackgroundBorderless"
+                        android:background="?attr/selectableItemBackgroundBorderless"
                         app:iconTint="?attr/colorPrimary"
                         android:contentDescription="@string/setting"
                         android:tooltipText="@string/setting"

app/src/main/res/layout/view_search_menu.xml

@@ -69,7 +69,7 @@
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
                 android:layout_weight="1"
-                android:background="?android:attr/selectableItemBackgroundBorderless"
+                android:background="?attr/selectableItemBackgroundBorderless"
                 android:ellipsize="middle"
                 android:gravity="center_vertical"
                 android:paddingLeft="10dp"
@@ -121,7 +121,7 @@
                 android:id="@+id/ll_search_results"
                 android:layout_width="60dp"
                 android:layout_height="wrap_content"
-                android:background="?android:attr/selectableItemBackgroundBorderless"
+                android:background="?attr/selectableItemBackgroundBorderless"
                 android:clickable="true"
                 android:contentDescription="结果"
                 android:focusable="true"
@@ -161,7 +161,7 @@
                 android:id="@+id/ll_main_menu"
                 android:layout_width="60dp"
                 android:layout_height="wrap_content"
-                android:background="?android:attr/selectableItemBackgroundBorderless"
+                android:background="?attr/selectableItemBackgroundBorderless"
                 android:clickable="true"
                 android:contentDescription="@string/read_aloud"
                 android:focusable="true"
@@ -199,7 +199,7 @@
                 android:id="@+id/ll_search_exit"
                 android:layout_width="60dp"
                 android:layout_height="wrap_content"
-                android:background="?android:attr/selectableItemBackgroundBorderless"
+                android:background="?attr/selectableItemBackgroundBorderless"
                 android:clickable="true"
                 android:contentDescription="退出"
                 android:focusable="true"
@@ -237,7 +237,7 @@
             <!--            android:id="@+id/ll_setting"-->
             <!--            android:layout_width="50dp"-->
             <!--            android:layout_height="50dp"-->
-            <!--            android:background="?android:attr/selectableItemBackgroundBorderless"-->
+            <!--            android:background="?attr/selectableItemBackgroundBorderless"-->
             <!--            android:clickable="true"-->
             <!--            android:contentDescription="@string/setting"-->
             <!--            android:focusable="true"-->

app/src/main/res/layout/view_select_action_bar.xml

@@ -1,15 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:gravity="center_vertical"
     android:orientation="horizontal"
-    android:paddingEnd="16dp"
-    android:paddingTop="8dp"
-    android:paddingStart="16dp"
-    android:paddingBottom="8dp"
+    android:paddingHorizontal="8dp"
+    android:paddingVertical="8dp"
     tools:ignore="RtlHardcoded">
 
     <io.legato.kazusa.lib.theme.view.ThemeCheckBox
@@ -24,30 +21,30 @@
         style="@style/Widget.Material3Expressive.Button.TonalButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:minWidth="0dp"
         android:layout_marginEnd="8dp"
-        android:gravity="center"
-        android:text="@string/revert_selection"
-        app:isBottomBackground="true" />
+        android:text="@string/revert_selection" />
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/btn_select_action_main"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:gravity="center"
+        style="@style/Widget.Material3Expressive.Button"
+        android:layout_marginEnd="8dp"
         android:text="@string/app_name"
-        android:visibility="gone"
-        app:isBottomBackground="true" />
+        android:minWidth="0dp"
+        android:visibility="visible" />
 
     <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/iv_menu_more"
-        android:layout_width="36dp"
-        android:layout_height="36dp"
+        android:layout_width="32dp"
+        android:layout_height="32dp"
+        android:padding="4dp"
         android:background="?attr/selectableItemBackgroundBorderless"
         android:contentDescription="@string/more_menu"
-        android:padding="6dp"
         android:src="@drawable/ic_more_vert"
         android:tooltipText="@string/more_menu"
-        android:visibility="gone"
+        android:visibility="visible"
         tools:ignore="RtlHardcoded,UnusedAttribute" />
 
 </LinearLayout>

app/src/main/res/layout/view_simple_counter.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <LinearLayout
@@ -16,10 +17,11 @@
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:paddingEnd="8dp"
-            android:text="标题"
+            android:text="@string/text"
             android:textSize="12sp"
             android:textStyle="bold"
-            android:textColor="?android:attr/textColorSecondary" />
+            android:textColor="?android:attr/textColorSecondary"
+            tools:ignore="RtlSymmetry" />
 
         <com.google.android.material.card.MaterialCardView
             android:layout_width="wrap_content"
@@ -28,7 +30,7 @@
             app:cardCornerRadius="24dp"
             app:cardBackgroundColor="?attr/colorSurfaceVariant">
             <LinearLayout
-                android:layout_width="116dp"
+                android:layout_width="112dp"
                 android:layout_height="wrap_content"
                 android:orientation="horizontal"
                 android:gravity="center_vertical">
@@ -37,6 +39,7 @@
                     android:layout_width="40dp"
                     android:layout_height="40dp"
                     style="@style/Widget.Material3.Button.IconButton.Filled.Tonal"
+                    android:elevation="2dp"
                     app:backgroundTint="?attr/colorSurfaceContainer"
                     android:contentDescription="@string/reduce"
                     app:icon="@drawable/ic_reduce"
@@ -48,14 +51,15 @@
                     android:layout_height="wrap_content"
                     android:gravity="center"
                     android:layout_weight="1"
-                    android:text="16"
-                    android:textSize="14sp" />
+                    android:text="@string/text"
+                    android:textSize="12sp" />
 
                 <com.google.android.material.button.MaterialButton
                     android:id="@+id/iv_seek_plus"
                     android:layout_width="40dp"
                     android:layout_height="40dp"
                     style="@style/Widget.Material3.Button.IconButton.Filled.Tonal"
+                    android:elevation="2dp"
                     app:backgroundTint="?attr/colorSurfaceContainer"
                     android:contentDescription="@string/plus"
                     app:icon="@drawable/ic_add"