prifak/Kotatsu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes

Browse Source
This commit is contained in:
Koitharu
2024-09-03 17:47:36 +03:00
parent d0ef177d56
commit 50dd119ab5
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/kotlin/org/koitharu/kotatsu/filter/ui/sheet/FilterSheetFragment.kt
View File

@@ -71,7 +71,7 @@ class FilterSheetFragment : BaseAdaptiveSheet<SheetFilterBinding>(),
override fun onButtonChecked(group: MaterialButtonToggleGroup?, checkedId: Int, isChecked: Boolean) {
if (isChecked) {
setSortDirection(getSortDirection(checkedId))
setSortDirection(getSortDirection(checkedId) ?: return)
}
}
@@ -81,7 +81,7 @@ class FilterSheetFragment : BaseAdaptiveSheet<SheetFilterBinding>(),
R.id.spinner_order -> {
val genericOrder = filter.filterSortOrder.value.availableItems[position]
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])
@@ -280,10 +280,10 @@ class FilterSheetFragment : BaseAdaptiveSheet<SheetFilterBinding>(),
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_desc -> SortDirection.DESC
else -> throw IllegalArgumentException("Wrong button id $buttonId")
else -> null
}
companion object {

1
app/src/main/kotlin/org/koitharu/kotatsu/main/ui/MainActivity.kt
View File

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

6
app/src/main/res/layout/activity_main.xml
View File

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