master
Koitharu 2 years ago
parent d0ef177d56
commit 50dd119ab5
Signed by: Koitharu
GPG Key ID: 676DEE768C17A9D7

@ -71,7 +71,7 @@ class FilterSheetFragment : BaseAdaptiveSheet<SheetFilterBinding>(),
override fun onButtonChecked(group: MaterialButtonToggleGroup?, checkedId: Int, isChecked: Boolean) { override fun onButtonChecked(group: MaterialButtonToggleGroup?, checkedId: Int, isChecked: Boolean) {
if (isChecked) { if (isChecked) {
setSortDirection(getSortDirection(checkedId)) setSortDirection(getSortDirection(checkedId) ?: return)
} }
} }
@ -81,7 +81,7 @@ class FilterSheetFragment : BaseAdaptiveSheet<SheetFilterBinding>(),
R.id.spinner_order -> { R.id.spinner_order -> {
val genericOrder = filter.filterSortOrder.value.availableItems[position] val genericOrder = filter.filterSortOrder.value.availableItems[position]
val direction = getSortDirection(requireViewBinding().layoutSortDirection.checkedButtonId) val direction = getSortDirection(requireViewBinding().layoutSortDirection.checkedButtonId)
filter.setSortOrder(genericOrder[direction]) filter.setSortOrder(genericOrder[direction ?: SortDirection.DESC])
} }
R.id.spinner_locale -> filter.setLanguage(filter.filterLocale.value.availableItems[position]) R.id.spinner_locale -> filter.setLanguage(filter.filterLocale.value.availableItems[position])
@ -280,10 +280,10 @@ class FilterSheetFragment : BaseAdaptiveSheet<SheetFilterBinding>(),
filter.setSortOrder(newOrder) filter.setSortOrder(newOrder)
} }
private fun getSortDirection(@IdRes buttonId: Int): SortDirection = when (buttonId) { private fun getSortDirection(@IdRes buttonId: Int): SortDirection? = when (buttonId) {
R.id.button_order_asc -> SortDirection.ASC R.id.button_order_asc -> SortDirection.ASC
R.id.button_order_desc -> SortDirection.DESC R.id.button_order_desc -> SortDirection.DESC
else -> throw IllegalArgumentException("Wrong button id $buttonId") else -> null
} }
companion object { companion object {

@ -213,6 +213,7 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), AppBarOwner, BottomNav
left = insets.left, left = insets.left,
right = insets.right, right = insets.right,
) )
viewBinding.bottomNav?.updatePadding(bottom = insets.bottom)
} }
override fun onLayoutChange( override fun onLayoutChange(

@ -22,15 +22,15 @@
android:fitsSystemWindows="false" android:fitsSystemWindows="false"
android:paddingHorizontal="16dp" android:paddingHorizontal="16dp"
android:stateListAnimator="@null" android:stateListAnimator="@null"
app:liftOnScrollColor="@null" app:liftOnScroll="false"
app:liftOnScroll="false"> app:liftOnScrollColor="@null">
<org.koitharu.kotatsu.core.ui.widgets.WindowInsetHolder <org.koitharu.kotatsu.core.ui.widgets.WindowInsetHolder
android:id="@+id/insetsHolder" android:id="@+id/insetsHolder"
android:fitsSystemWindows="true"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="top" android:layout_gravity="top"
android:fitsSystemWindows="true"
app:layout_scrollFlags="scroll|enterAlways|snap" /> app:layout_scrollFlags="scroll|enterAlways|snap" />
<FrameLayout <FrameLayout

Loading…
Cancel
Save