From 50dd119ab55a3d5b35d6b19f7f11f85cc85984af Mon Sep 17 00:00:00 2001
From: Koitharu <nvasya95@gmail.com>
Date: Tue, 3 Sep 2024 17:47:36 +0300
Subject: [PATCH] Fixes

---
 .../kotatsu/filter/ui/sheet/FilterSheetFragment.kt        | 8 ++++----
 .../kotlin/org/koitharu/kotatsu/main/ui/MainActivity.kt   | 1 +
 app/src/main/res/layout/activity_main.xml                 | 6 +++---
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/filter/ui/sheet/FilterSheetFragment.kt b/app/src/main/kotlin/org/koitharu/kotatsu/filter/ui/sheet/FilterSheetFragment.kt
index 58960a50f..1eb906384 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/filter/ui/sheet/FilterSheetFragment.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/filter/ui/sheet/FilterSheetFragment.kt
@@ -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 {
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/main/ui/MainActivity.kt b/app/src/main/kotlin/org/koitharu/kotatsu/main/ui/MainActivity.kt
index 1c01fa4c2..0db277b0b 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/main/ui/MainActivity.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/main/ui/MainActivity.kt
@@ -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(
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index b3e29bed0..9cadc7a44 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -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