From b8082b5335cb704f3fe60ea92743cb843a96a4e3 Mon Sep 17 00:00:00 2001
From: HapeLee <1321903405@qq.com>
Date: Sun, 19 Oct 2025 13:53:52 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=90=9C=E7=B4=A2=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../kazusa/ui/book/search/SearchActivity.kt   | 21 +++------------
 .../main/res/layout/activity_book_search.xml  | 27 +++++++------------
 2 files changed, 13 insertions(+), 35 deletions(-)

diff --git a/app/src/main/java/io/legato/kazusa/ui/book/search/SearchActivity.kt b/app/src/main/java/io/legato/kazusa/ui/book/search/SearchActivity.kt
index d8b84ff1a..9aeaa9d8b 100644
--- a/app/src/main/java/io/legato/kazusa/ui/book/search/SearchActivity.kt
+++ b/app/src/main/java/io/legato/kazusa/ui/book/search/SearchActivity.kt
@@ -18,6 +18,7 @@ import androidx.lifecycle.repeatOnLifecycle
 import androidx.recyclerview.widget.DefaultItemAnimator
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
+import androidx.transition.TransitionManager
 import com.google.android.flexbox.FlexboxLayoutManager
 import com.google.android.material.search.SearchBar
 import com.google.android.material.search.SearchView
@@ -181,24 +182,9 @@ class SearchActivity : VMBaseActivity<ActivityBookSearchBinding, SearchViewModel
 
     private fun initMaterialSearch() {
 
-        binding.appBar.applyStatusBarPadding()
 
-        binding.appBar.post {
-            val maxPaddingTop = binding.appBar.paddingTop
-            binding.appBar.addOnOffsetChangedListener { appBarLayout, verticalOffset ->
-                val totalScrollRange = appBarLayout.totalScrollRange
-                val scrollRatio =
-                    (1f - (abs(verticalOffset).toFloat() / totalScrollRange)).coerceIn(0f, 1f)
 
-                appBarLayout.alpha = scrollRatio
-                appBarLayout.setPadding(
-                    appBarLayout.paddingLeft,
-                    (maxPaddingTop * scrollRatio).toInt(),
-                    appBarLayout.paddingRight,
-                    appBarLayout.paddingBottom
-                )
-            }
-        }
+
 
         searchBar.setOnMenuItemClickListener { item ->
             onCompatOptionsItemSelected(item)
@@ -450,7 +436,8 @@ class SearchActivity : VMBaseActivity<ActivityBookSearchBinding, SearchViewModel
      * 搜索结束
      */
     private fun searchFinally() {
-        binding.refreshProgressBar.invisible()
+        TransitionManager.beginDelayedTransition(binding.root)
+        binding.refreshProgressBar.gone()
         binding.cdProgress.gone()
         if (!isManualStopSearch && viewModel.hasMore) {
             binding.fbStartStop.setImageResource(R.drawable.ic_play)
diff --git a/app/src/main/res/layout/activity_book_search.xml b/app/src/main/res/layout/activity_book_search.xml
index 83816bc1e..d15b22f52 100644
--- a/app/src/main/res/layout/activity_book_search.xml
+++ b/app/src/main/res/layout/activity_book_search.xml
@@ -14,17 +14,15 @@
             android:id="@+id/app_bar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:backgroundTint="?attr/colorSurface"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent">
+            app:liftOnScroll="false"
+            android:fitsSystemWindows="true"
+            app:statusBarForeground="?attr/colorSurface">
 
             <com.google.android.material.search.SearchBar
                 android:id="@+id/search_bar"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:hint="@string/search_book_key"
-                app:layout_scrollFlags="scroll|enterAlways"
                 app:menu="@menu/book_search"
                 app:navigationIcon="@drawable/ic_arrow_back"
                 app:navigationIconTint="?attr/colorOnSurface" />
@@ -47,7 +45,7 @@
                 android:layout_marginHorizontal="16dp"
                 android:layout_marginVertical="4dp"
                 android:scaleType="centerCrop"
-                android:visibility="gone"
+                android:visibility="invisible"
                 app:cardBackgroundColor="?attr/colorTertiaryContainer"
                 app:cardCornerRadius="4dp"
                 app:strokeWidth="0dp">
@@ -77,20 +75,13 @@
             android:orientation="vertical"
             android:visibility="visible"/>
 
-        <io.legato.kazusa.ui.widget.dynamiclayout.DynamicFrameLayout
-            android:id="@+id/content_view"
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/recycler_view"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior">
-
-            <androidx.recyclerview.widget.RecyclerView
-                android:id="@+id/recycler_view"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:clipToPadding="false"
-                tools:listitem="@layout/item_search" />
-
-        </io.legato.kazusa.ui.widget.dynamiclayout.DynamicFrameLayout>
+            android:clipToPadding="false"
+            tools:listitem="@layout/item_search"
+            app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior"/>
 
         <LinearLayout
             android:id="@+id/ll_stop"