AppBar behavior fixes

master
Koitharu 10 months ago
parent f7509b09c1
commit b53b8eefa3
Signed by: Koitharu
GPG Key ID: 676DEE768C17A9D7

@ -29,6 +29,7 @@ import org.koitharu.kotatsu.core.nav.AppRouter
import org.koitharu.kotatsu.core.nav.router import org.koitharu.kotatsu.core.nav.router
import org.koitharu.kotatsu.core.ui.BaseActivity import org.koitharu.kotatsu.core.ui.BaseActivity
import org.koitharu.kotatsu.core.ui.model.titleRes import org.koitharu.kotatsu.core.ui.model.titleRes
import org.koitharu.kotatsu.core.ui.util.FadingAppbarMediator
import org.koitharu.kotatsu.core.util.ViewBadge import org.koitharu.kotatsu.core.util.ViewBadge
import org.koitharu.kotatsu.core.util.ext.consumeSystemBarsInsets import org.koitharu.kotatsu.core.util.ext.consumeSystemBarsInsets
import org.koitharu.kotatsu.core.util.ext.end import org.koitharu.kotatsu.core.util.ext.end
@ -73,6 +74,9 @@ class MangaListActivity :
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
setContentView(ActivityMangaListBinding.inflate(layoutInflater)) setContentView(ActivityMangaListBinding.inflate(layoutInflater))
viewBinding.collapsingToolbarLayout?.let { collapsingToolbarLayout ->
FadingAppbarMediator(viewBinding.appbar, collapsingToolbarLayout).bind()
}
val filter = intent.getParcelableExtraCompat<ParcelableMangaListFilter>(AppRouter.KEY_FILTER)?.filter val filter = intent.getParcelableExtraCompat<ParcelableMangaListFilter>(AppRouter.KEY_FILTER)?.filter
val sortOrder = intent.getSerializableExtraCompat<SortOrder>(AppRouter.KEY_SORT_ORDER) val sortOrder = intent.getSerializableExtraCompat<SortOrder>(AppRouter.KEY_SORT_ORDER)
source = MangaSource(intent.getStringExtra(AppRouter.KEY_SOURCE)) source = MangaSource(intent.getStringExtra(AppRouter.KEY_SOURCE))

@ -101,16 +101,16 @@ class SearchActivity :
override fun onApplyWindowInsets(v: View, insets: WindowInsetsCompat): WindowInsetsCompat { override fun onApplyWindowInsets(v: View, insets: WindowInsetsCompat): WindowInsetsCompat {
val barsInsets = insets.systemBarsInsets val barsInsets = insets.systemBarsInsets
viewBinding.appbar.updatePadding( viewBinding.toolbar.updatePadding(
top = barsInsets.top, top = barsInsets.top,
left = barsInsets.left, left = barsInsets.left,
right = barsInsets.right, right = barsInsets.right,
) )
viewBinding.recyclerView.setPadding( viewBinding.recyclerView.setPadding(
barsInsets.left, left = barsInsets.left,
barsInsets.top, top = 0,
barsInsets.right, right = barsInsets.right,
barsInsets.bottom, bottom = barsInsets.bottom,
) )
return insets.consumeAllSystemBarsInsets() return insets.consumeAllSystemBarsInsets()
} }

@ -17,7 +17,7 @@
<com.google.android.material.appbar.MaterialToolbar <com.google.android.material.appbar.MaterialToolbar
android:id="@id/toolbar" android:id="@id/toolbar"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize" android:layout_height="wrap_content"
tools:title="Title" /> tools:title="Title" />
</com.google.android.material.appbar.AppBarLayout> </com.google.android.material.appbar.AppBarLayout>

@ -17,7 +17,7 @@
style="?attr/collapsingToolbarLayoutMediumStyle" style="?attr/collapsingToolbarLayoutMediumStyle"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="?attr/collapsingToolbarLayoutMediumSize" android:layout_height="?attr/collapsingToolbarLayoutMediumSize"
app:layout_scrollFlags="scroll|exitUntilCollapsed|snap" app:layout_scrollFlags="scroll|enterAlways"
app:toolbarId="@id/toolbar"> app:toolbarId="@id/toolbar">
<LinearLayout <LinearLayout
@ -54,7 +54,7 @@
android:id="@+id/container_filter_header" android:id="@+id/container_filter_header"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
app:layout_scrollFlags="scroll|exitUntilCollapsed" app:layout_scrollFlags="noScroll"
tools:layout="@layout/fragment_filter_header" /> tools:layout="@layout/fragment_filter_header" />
</com.google.android.material.appbar.AppBarLayout> </com.google.android.material.appbar.AppBarLayout>

@ -16,7 +16,7 @@
<com.google.android.material.appbar.MaterialToolbar <com.google.android.material.appbar.MaterialToolbar
android:id="@id/toolbar" android:id="@id/toolbar"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize" android:layout_height="wrap_content"
app:layout_scrollFlags="scroll|enterAlways" /> app:layout_scrollFlags="scroll|enterAlways" />
</com.google.android.material.appbar.AppBarLayout> </com.google.android.material.appbar.AppBarLayout>

@ -107,6 +107,7 @@
<style name="Widget.Kotatsu.RecyclerView" parent=""> <style name="Widget.Kotatsu.RecyclerView" parent="">
<item name="android:scrollbarStyle">outsideOverlay</item> <item name="android:scrollbarStyle">outsideOverlay</item>
<item name="android:clipToPadding">false</item>
</style> </style>
<style name="Widget.Kotatsu.FastScroller" parent=""> <style name="Widget.Kotatsu.FastScroller" parent="">

Loading…
Cancel
Save