Merge pull request #3235 from CruGlobal/GT-2193-filterLanguageSort

GT-2193 simplify filter languages sorting
CruGlobal · Nov 20, 2023 · b1dcdaa · b1dcdaa
2 parents 6d691da + a9d11ef
commit b1dcdaa
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/app/src/main/kotlin/org/cru/godtools/ui/dashboard/tools/ToolsViewModel.kt b/app/src/main/kotlin/org/cru/godtools/ui/dashboard/tools/ToolsViewModel.kt
@@ -87,11 +87,7 @@ class ToolsViewModel @Inject constructor(
             }
         }
         .combine(settings.appLanguageFlow) { langs, appLang ->
-            langs.sortedWith(
-                compareByDescending<Language> { it.code == appLang }
-                    .then(compareByDescending { it.isAdded })
-                    .then(Language.displayNameComparator(context, appLang))
-            ) to appLang
+            langs.sortedWith(Language.displayNameComparator(context, appLang)) to appLang
         }
         .combine(languageQuery) { (langs, appLang), q -> langs.filterByDisplayAndNativeName(q, context, appLang) }
         .flowOn(Dispatchers.Default)