From aad386ab0433e95e85b1009f57be80ece820e63a Mon Sep 17 00:00:00 2001
From: johan12345 <johan.forstner@gmail.com>
Date: Sat, 9 Oct 2021 13:44:17 +0200
Subject: [PATCH] MultiSelectDialog: put common choices on top even when
 selected

---
 .../java/net/vonforst/evmap/fragment/MultiSelectDialog.kt  | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/net/vonforst/evmap/fragment/MultiSelectDialog.kt b/app/src/main/java/net/vonforst/evmap/fragment/MultiSelectDialog.kt
index 150ad081..5696e4fc 100644
--- a/app/src/main/java/net/vonforst/evmap/fragment/MultiSelectDialog.kt
+++ b/app/src/main/java/net/vonforst/evmap/fragment/MultiSelectDialog.kt
@@ -81,9 +81,10 @@ class MultiSelectDialog : AppCompatDialogFragment() {
             .sortedBy { it.value.toLowerCase(Locale.getDefault()) }
             .sortedBy {
                 when {
-                    selected.contains(it.key) -> 0
-                    commonChoices?.contains(it.key) == true -> 1
-                    else -> 2
+                    selected.contains(it.key) && commonChoices?.contains(it.key) == true -> 0
+                    selected.contains(it.key) -> 1
+                    commonChoices?.contains(it.key) == true -> 2
+                    else -> 3
                 }
             }
             .map { MultiSelectItem(it.key, it.value, it.key in selected) }