From 861be7614eb0a02c2869720161afc8cd4477e682 Mon Sep 17 00:00:00 2001 From: Koitharu Date: Wed, 4 Oct 2023 11:44:49 +0300 Subject: [PATCH] Fix back navigation --- .../org/koitharu/kotatsu/main/ui/MainNavigationDelegate.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/main/ui/MainNavigationDelegate.kt b/app/src/main/kotlin/org/koitharu/kotatsu/main/ui/MainNavigationDelegate.kt index 039bb68db..ea1e11959 100644 --- a/app/src/main/kotlin/org/koitharu/kotatsu/main/ui/MainNavigationDelegate.kt +++ b/app/src/main/kotlin/org/koitharu/kotatsu/main/ui/MainNavigationDelegate.kt @@ -72,7 +72,7 @@ class MainNavigationDelegate( } override fun handleOnBackPressed() { - navBar.selectedItemId = R.id.nav_history + navBar.selectedItemId = firstItem()?.itemId ?: return } fun onCreate(lifecycleOwner: LifecycleOwner, savedInstanceState: Bundle?) { @@ -171,7 +171,7 @@ class MainNavigationDelegate( } private fun onFragmentChanged(fragment: Fragment, fromUser: Boolean) { - isEnabled = fragment !is HistoryListFragment + isEnabled = getItemId(fragment) != firstItem()?.itemId listeners.forEach { it.onFragmentChanged(fragment, fromUser) } }