From 1116ab9695c57648ac28be489d4776198586178f Mon Sep 17 00:00:00 2001
From: HapeLee <1321903405@qq.com>
Date: Tue, 30 Sep 2025 19:23:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/java/io/legato/kazusa/base/BaseActivity.kt       | 3 +--
 app/src/main/java/io/legato/kazusa/ui/main/MainActivity.kt    | 4 +++-
 .../kazusa/ui/main/bookshelf/books/BookshelfFragment2.kt      | 4 ++--
 app/src/main/res/layout/fragment_bookshelf2.xml               | 1 +
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/io/legato/kazusa/base/BaseActivity.kt b/app/src/main/java/io/legato/kazusa/base/BaseActivity.kt
index f8f437a09..d58727926 100644
--- a/app/src/main/java/io/legato/kazusa/base/BaseActivity.kt
+++ b/app/src/main/java/io/legato/kazusa/base/BaseActivity.kt
@@ -82,10 +82,9 @@ abstract class BaseActivity<VB : ViewBinding>(
         if (Build.VERSION.SDK_INT > Build.VERSION_CODES.Q)
             enableEdgeToEdge()
         else{
-            window.setNavigationBarColorAuto(themeColor(com.google.android.material.R.attr.colorSurface))
             setupSystemBar()
         }
-        //window.setNavigationBarColorAuto(themeColor(com.google.android.material.R.attr.colorSurface))
+        window.setNavigationBarColorAuto(themeColor(com.google.android.material.R.attr.colorSurface))
         //setupSystemBar()
         setContentView(binding.root)
         upBackgroundImage()
diff --git a/app/src/main/java/io/legato/kazusa/ui/main/MainActivity.kt b/app/src/main/java/io/legato/kazusa/ui/main/MainActivity.kt
index a6dbfbcfa..4b1bc2697 100644
--- a/app/src/main/java/io/legato/kazusa/ui/main/MainActivity.kt
+++ b/app/src/main/java/io/legato/kazusa/ui/main/MainActivity.kt
@@ -52,9 +52,11 @@ import io.legato.kazusa.ui.widget.dialog.TextDialog
 import io.legato.kazusa.utils.gone
 import io.legato.kazusa.utils.hideSoftInput
 import io.legato.kazusa.utils.observeEvent
+import io.legato.kazusa.utils.setNavigationBarColorAuto
 import io.legato.kazusa.utils.shouldHideSoftInput
 import io.legato.kazusa.utils.showDialogFragment
 import io.legato.kazusa.utils.startActivity
+import io.legato.kazusa.utils.themeColor
 import io.legato.kazusa.utils.toastOnUi
 import io.legato.kazusa.utils.viewbindingdelegate.viewBinding
 import io.legato.kazusa.utils.visible
@@ -209,7 +211,7 @@ class MainActivity : VMBaseActivity<ActivityMainBinding, MainViewModel>(),
         viewPagerMain.adapter = adapter
         viewPagerMain.registerOnPageChangeCallback(PageChangeCallback())
 
-        //window.setNavigationBarColorAuto(themeColor(com.google.android.material.R.attr.colorSurfaceContainer))
+        window.setNavigationBarColorAuto(themeColor(com.google.android.material.R.attr.colorSurfaceContainer))
     }
 
     /**
diff --git a/app/src/main/java/io/legato/kazusa/ui/main/bookshelf/books/BookshelfFragment2.kt b/app/src/main/java/io/legato/kazusa/ui/main/bookshelf/books/BookshelfFragment2.kt
index 4d5f4eb86..77f8f5854 100644
--- a/app/src/main/java/io/legato/kazusa/ui/main/bookshelf/books/BookshelfFragment2.kt
+++ b/app/src/main/java/io/legato/kazusa/ui/main/bookshelf/books/BookshelfFragment2.kt
@@ -182,7 +182,7 @@ class BookshelfFragment2() : BaseBookshelfFragment(R.layout.fragment_bookshelf2)
     private fun initBooksData() {
         if (groupId == BookGroup.Companion.IdRoot) {
             if (isAdded) {
-                binding.topBar.title = getString(R.string.bookshelf)
+                binding.collTopBar.title = getString(R.string.bookshelf)
                 binding.refreshLayout.isEnabled = true
                 enableRefresh = true
             }
@@ -190,7 +190,7 @@ class BookshelfFragment2() : BaseBookshelfFragment(R.layout.fragment_bookshelf2)
             bookGroups.firstOrNull {
                 groupId == it.groupId
             }?.let {
-                binding.topBar.title = it.groupName
+                binding.collTopBar.title = it.groupName
                 binding.refreshLayout.isEnabled = it.enableRefresh
                 enableRefresh = it.enableRefresh
             }
diff --git a/app/src/main/res/layout/fragment_bookshelf2.xml b/app/src/main/res/layout/fragment_bookshelf2.xml
index 089b4a67c..07d10d77e 100644
--- a/app/src/main/res/layout/fragment_bookshelf2.xml
+++ b/app/src/main/res/layout/fragment_bookshelf2.xml
@@ -15,6 +15,7 @@
         app:liftOnScroll="false">
 
         <com.google.android.material.appbar.CollapsingToolbarLayout
+            android:id="@+id/coll_top_bar"
             style="?attr/collapsingToolbarLayoutMediumStyle"
             android:layout_width="match_parent"
             android:layout_height="?attr/collapsingToolbarLayoutMediumSize"