From 2bdb83ff28cd225b9d9f6fdb638d8cfa9bf3c1b3 Mon Sep 17 00:00:00 2001
From: Koitharu <nvasya95@gmail.com>
Date: Tue, 12 Sep 2023 13:30:14 +0300
Subject: [PATCH] Fix navigation reordering

---
 .../koitharu/kotatsu/settings/nav/NavConfigFragment.kt    | 2 +-
 .../koitharu/kotatsu/settings/nav/NavConfigViewModel.kt   | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/settings/nav/NavConfigFragment.kt b/app/src/main/kotlin/org/koitharu/kotatsu/settings/nav/NavConfigFragment.kt
index 573232ea4..ec9bca2d3 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/settings/nav/NavConfigFragment.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/settings/nav/NavConfigFragment.kt
@@ -114,7 +114,7 @@ class NavConfigFragment : BaseFragment<FragmentSettingsSourcesBinding>(), Recycl
 			recyclerView: RecyclerView,
 			viewHolder: RecyclerView.ViewHolder,
 			target: RecyclerView.ViewHolder,
-		): Boolean = true
+		): Boolean = target.itemViewType == ListItemType.NAV_ITEM.ordinal
 
 		override fun onMoved(
 			recyclerView: RecyclerView,
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/settings/nav/NavConfigViewModel.kt b/app/src/main/kotlin/org/koitharu/kotatsu/settings/nav/NavConfigViewModel.kt
index 9b10d3b92..c9a88a6ab 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/settings/nav/NavConfigViewModel.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/settings/nav/NavConfigViewModel.kt
@@ -63,9 +63,13 @@ class NavConfigViewModel @Inject constructor(
 	}
 
 	fun removeItem(item: NavItem) {
-		items.value = items.value.minus(item).also {
-			commit(it)
+		val newList = items.value.toMutableList()
+		newList.remove(item)
+		if (newList.isEmpty()) {
+			newList.add(NavItem.EXPLORE)
 		}
+		items.value = newList
+		commit(newList)
 	}
 
 	private fun commit(value: List<NavItem>) {