From 6ccdf09551feab50043cdf0f38e22e731b9c173a Mon Sep 17 00:00:00 2001
From: 0123456789 <8640397-0123456789@users.noreply.gitlab.com>
Date: Fri, 9 Apr 2021 19:55:20 +0000
Subject: [PATCH] Sort app lists alphabetially

---
 .../com/aurora/store/viewmodel/all/BlacklistViewModel.kt   | 5 +++--
 .../com/aurora/store/viewmodel/all/InstalledViewModel.kt   | 7 ++++---
 .../com/aurora/store/viewmodel/all/UpdatesViewModel.kt     | 5 +++--
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/com/aurora/store/viewmodel/all/BlacklistViewModel.kt b/app/src/main/java/com/aurora/store/viewmodel/all/BlacklistViewModel.kt
index bb3d71b58..b174311a9 100644
--- a/app/src/main/java/com/aurora/store/viewmodel/all/BlacklistViewModel.kt
+++ b/app/src/main/java/com/aurora/store/viewmodel/all/BlacklistViewModel.kt
@@ -31,6 +31,7 @@ import com.aurora.store.viewmodel.BaseAndroidViewModel
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.supervisorScope
+import java.util.*
 
 class BlacklistViewModel(application: Application) : BaseAndroidViewModel(application) {
 
@@ -70,7 +71,7 @@ class BlacklistViewModel(application: Application) : BaseAndroidViewModel(applic
                             }
                             blackList.add(black)
                         }
-                    liveData.postValue(blackList.sortedBy { it.displayName })
+                    liveData.postValue(blackList.sortedBy { it.displayName.toLowerCase(Locale.getDefault()) })
                     requestState = RequestState.Complete
                 } catch (e: Exception) {
                     e.printStackTrace()
@@ -83,4 +84,4 @@ class BlacklistViewModel(application: Application) : BaseAndroidViewModel(applic
     override fun onCleared() {
         super.onCleared()
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/aurora/store/viewmodel/all/InstalledViewModel.kt b/app/src/main/java/com/aurora/store/viewmodel/all/InstalledViewModel.kt
index 75c7e89e4..994e006ac 100644
--- a/app/src/main/java/com/aurora/store/viewmodel/all/InstalledViewModel.kt
+++ b/app/src/main/java/com/aurora/store/viewmodel/all/InstalledViewModel.kt
@@ -29,6 +29,7 @@ import kotlinx.coroutines.launch
 import org.greenrobot.eventbus.EventBus
 import org.greenrobot.eventbus.Subscribe
 import org.greenrobot.eventbus.ThreadMode
+import java.util.*
 
 class InstalledViewModel(application: Application) : BaseAppsViewModel(application) {
 
@@ -43,7 +44,7 @@ class InstalledViewModel(application: Application) : BaseAppsViewModel(applicati
         viewModelScope.launch(Dispatchers.IO) {
             try {
                 appList.flushAndAdd(getFilteredApps())
-                liveData.postValue(appList.sortedBy { it.displayName })
+                liveData.postValue(appList.sortedBy { it.displayName.toLowerCase(Locale.getDefault()) })
                 requestState = RequestState.Complete
             } catch (e: Exception) {
                 requestState = RequestState.Pending
@@ -78,11 +79,11 @@ class InstalledViewModel(application: Application) : BaseAppsViewModel(applicati
         appList.flushAndAdd(updatedList)
 
         //Post new update list
-        liveData.postValue(appList.sortedBy { it.displayName })
+        liveData.postValue(appList.sortedBy { it.displayName.toLowerCase(Locale.getDefault()) })
     }
 
     override fun onCleared() {
         EventBus.getDefault().unregister(this)
         super.onCleared()
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/aurora/store/viewmodel/all/UpdatesViewModel.kt b/app/src/main/java/com/aurora/store/viewmodel/all/UpdatesViewModel.kt
index 90bf41fd0..495ce4be1 100644
--- a/app/src/main/java/com/aurora/store/viewmodel/all/UpdatesViewModel.kt
+++ b/app/src/main/java/com/aurora/store/viewmodel/all/UpdatesViewModel.kt
@@ -34,6 +34,7 @@ import kotlinx.coroutines.launch
 import org.greenrobot.eventbus.EventBus
 import org.greenrobot.eventbus.Subscribe
 import org.greenrobot.eventbus.ThreadMode
+import java.util.*
 
 class UpdatesViewModel(application: Application) : BaseAppsViewModel(application) {
 
@@ -67,7 +68,7 @@ class UpdatesViewModel(application: Application) : BaseAppsViewModel(application
             } else {
                 false
             }
-        }.also { apps ->
+        }.sortedBy { it.displayName.toLowerCase(Locale.getDefault()) }.also { apps ->
             apps.forEach {
                 updateFileMap[it.id] = UpdateFile(it)
             }
@@ -154,4 +155,4 @@ class UpdatesViewModel(application: Application) : BaseAppsViewModel(application
         EventBus.getDefault().unregister(this)
         super.onCleared()
     }
-}
\ No newline at end of file
+}