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 - 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 + app:liftOnScroll="false" + android:fitsSystemWindows="true" + app:statusBarForeground="?attr/colorSurface"> @@ -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"/> - - - - - + android:clipToPadding="false" + tools:listitem="@layout/item_search" + app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior"/>