From c6731694565eb0f821eff53059df7f8bd168477a Mon Sep 17 00:00:00 2001
From: HapeLee <1321903405@qq.com>
Date: Sat, 18 Oct 2025 01:29:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=95=8C=E9=9D=A2=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../io/legato/kazusa/ui/widget/TitleBar.kt    | 49 -------------------
 app/src/main/res/layout/activity_about.xml    |  2 +
 .../main/res/layout/activity_all_bookmark.xml |  1 +
 .../main/res/layout/activity_book_search.xml  |  2 +-
 .../main/res/layout/activity_chapter_list.xml |  1 +
 app/src/main/res/layout/activity_config.xml   |  1 +
 .../main/res/layout/activity_rss_artivles.xml |  1 +
 app/src/main/res/layout/view_title_bar.xml    |  3 +-
 8 files changed, 9 insertions(+), 51 deletions(-)

diff --git a/app/src/main/java/io/legato/kazusa/ui/widget/TitleBar.kt b/app/src/main/java/io/legato/kazusa/ui/widget/TitleBar.kt
index ffcba240a..137b565c3 100644
--- a/app/src/main/java/io/legato/kazusa/ui/widget/TitleBar.kt
+++ b/app/src/main/java/io/legato/kazusa/ui/widget/TitleBar.kt
@@ -188,55 +188,6 @@ class TitleBar @JvmOverloads constructor(
         toolbar.setSubtitle(subtitleId)
     }
 
-//    fun setTitleTextColor(@ColorInt color: Int) {
-//        toolbar.setTitleTextColor(color)
-//    }
-//
-//    fun setTitleTextAppearance(@StyleRes resId: Int) {
-//        toolbar.setTitleTextAppearance(context, resId)
-//    }
-//
-//    fun setSubTitleTextColor(@ColorInt color: Int) {
-//        toolbar.setSubtitleTextColor(color)
-//    }
-//
-//    fun setSubTitleTextAppearance(@StyleRes resId: Int) {
-//        toolbar.setSubtitleTextAppearance(context, resId)
-//    }
-//
-//    fun setTextColor(@ColorInt color: Int) {
-//        setTitleTextColor(color)
-//        setSubTitleTextColor(color)
-//    }
-//
-//    fun setColorFilter(@ColorInt color: Int) {
-//        val colorFilter = PorterDuffColorFilter(color, PorterDuff.Mode.SRC_ATOP)
-//        toolbar.children.firstOrNull { it is ImageView }?.background?.colorFilter = colorFilter
-//        toolbar.navigationIcon?.colorFilter = colorFilter
-//        toolbar.overflowIcon?.colorFilter = colorFilter
-//        toolbar.menu.children.forEach {
-//            it.icon?.colorFilter = colorFilter
-//        }
-//    }
-//
-//    override fun setBackgroundColor(color: Int) {
-//        if (color.alpha < 255) {
-//            //这里不能改为0f,改为0f在横屏模式下文字和图标颜色会变
-//            elevation = 0.1f
-//        }
-//        super.setBackgroundColor(color)
-//    }
-//
-//    override fun setBackground(background: Drawable?) {
-//        if (background is ColorDrawable) {
-//            if (background.alpha < 255) {
-//                //这里不能改为0f,改为0f在横屏模式下文字和图标颜色会变
-//                elevation = 0.1f
-//            }
-//        }
-//        super.setBackground(background)
-//    }
-
     fun onMultiWindowModeChanged(isInMultiWindowMode: Boolean, fullScreen: Boolean) {
 //        if (fitStatusBar) {
 //            val topPadding = if (!isInMultiWindowMode && fullScreen) context.statusBarHeight else 0
diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml
index 17e619ba3..182c19756 100644
--- a/app/src/main/res/layout/activity_about.xml
+++ b/app/src/main/res/layout/activity_about.xml
@@ -24,6 +24,8 @@
             app:titleCollapseMode="scale">
 
             <com.google.android.material.appbar.MaterialToolbar
+android:theme="@style/ThemeOverlay.Material3.Toolbar.CircleNavigationButton"
+
                 android:id="@+id/top_bar"
                 android:layout_width="match_parent"
                 android:layout_height="?attr/actionBarSize"
diff --git a/app/src/main/res/layout/activity_all_bookmark.xml b/app/src/main/res/layout/activity_all_bookmark.xml
index aee317a7c..c1ef83a96 100644
--- a/app/src/main/res/layout/activity_all_bookmark.xml
+++ b/app/src/main/res/layout/activity_all_bookmark.xml
@@ -21,6 +21,7 @@
             app:layout_scrollFlags="scroll|exitUntilCollapsed|snap">
 
             <com.google.android.material.appbar.MaterialToolbar
+                android:theme="@style/ThemeOverlay.Material3.Toolbar.CircleNavigationButton"
                 android:id="@+id/top_bar"
                 android:layout_width="match_parent"
                 android:layout_height="?attr/actionBarSize"
diff --git a/app/src/main/res/layout/activity_book_search.xml b/app/src/main/res/layout/activity_book_search.xml
index a0f61ca5f..83816bc1e 100644
--- a/app/src/main/res/layout/activity_book_search.xml
+++ b/app/src/main/res/layout/activity_book_search.xml
@@ -33,7 +33,7 @@
                 android:id="@+id/refresh_progress_bar"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:visibility="gone"
+                android:visibility="invisible"
                 app:waveAmplitude="2dp"
                 app:waveSpeed="50dp"
                 app:wavelength="40dp" />
diff --git a/app/src/main/res/layout/activity_chapter_list.xml b/app/src/main/res/layout/activity_chapter_list.xml
index 2809f62f2..ef5b96695 100644
--- a/app/src/main/res/layout/activity_chapter_list.xml
+++ b/app/src/main/res/layout/activity_chapter_list.xml
@@ -14,6 +14,7 @@
         app:layout_constraintTop_toTopOf="parent">
 
         <com.google.android.material.appbar.MaterialToolbar
+            android:theme="@style/ThemeOverlay.Material3.Toolbar.CircleNavigationButton"
             android:id="@+id/top_bar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
diff --git a/app/src/main/res/layout/activity_config.xml b/app/src/main/res/layout/activity_config.xml
index 188824aea..655062ae8 100644
--- a/app/src/main/res/layout/activity_config.xml
+++ b/app/src/main/res/layout/activity_config.xml
@@ -24,6 +24,7 @@
             app:layout_scrollFlags="scroll|exitUntilCollapsed|snap">
 
             <com.google.android.material.appbar.MaterialToolbar
+                android:theme="@style/ThemeOverlay.Material3.Toolbar.CircleNavigationButton"
                 android:id="@+id/top_bar"
                 android:layout_width="match_parent"
                 android:layout_height="?attr/actionBarSize"
diff --git a/app/src/main/res/layout/activity_rss_artivles.xml b/app/src/main/res/layout/activity_rss_artivles.xml
index b7e8c1e09..8b44bf114 100644
--- a/app/src/main/res/layout/activity_rss_artivles.xml
+++ b/app/src/main/res/layout/activity_rss_artivles.xml
@@ -26,6 +26,7 @@
             app:layout_scrollFlags="scroll|exitUntilCollapsed|snap">
 
             <com.google.android.material.appbar.MaterialToolbar
+                android:theme="@style/ThemeOverlay.Material3.Toolbar.CircleNavigationButton"
                 android:id="@+id/top_bar"
                 android:layout_width="match_parent"
                 android:layout_height="?attr/actionBarSize"
diff --git a/app/src/main/res/layout/view_title_bar.xml b/app/src/main/res/layout/view_title_bar.xml
index ac1febe9d..0a7b6c390 100644
--- a/app/src/main/res/layout/view_title_bar.xml
+++ b/app/src/main/res/layout/view_title_bar.xml
@@ -3,4 +3,5 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/toolbar"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content" />
+    android:layout_height="wrap_content"
+    android:theme="@style/ThemeOverlay.Material3.Toolbar.CircleNavigationButton"/>