athaliar/APKDownloader
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sort app lists alphabetially

Browse Source
This commit is contained in:
0123456789
2021-04-09 19:55:20 +00:00
committed by Rahul Kumar Patel
parent de0fc90cfe
commit 6ccdf09551
3 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/com/aurora/store/viewmodel/all/BlacklistViewModel.kt
View File

@@ -31,6 +31,7 @@ import com.aurora.store.viewmodel.BaseAndroidViewModel
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import kotlinx.coroutines.supervisorScope import kotlinx.coroutines.supervisorScope
import java.util.*
class BlacklistViewModel(application: Application) : BaseAndroidViewModel(application) { class BlacklistViewModel(application: Application) : BaseAndroidViewModel(application) {
@@ -70,7 +71,7 @@ class BlacklistViewModel(application: Application) : BaseAndroidViewModel(applic
} }
blackList.add(black) blackList.add(black)
} }
liveData.postValue(blackList.sortedBy { it.displayName }) liveData.postValue(blackList.sortedBy { it.displayName.toLowerCase(Locale.getDefault()) })
requestState = RequestState.Complete requestState = RequestState.Complete
} catch (e: Exception) { } catch (e: Exception) {
e.printStackTrace() e.printStackTrace()
@@ -83,4 +84,4 @@ class BlacklistViewModel(application: Application) : BaseAndroidViewModel(applic
override fun onCleared() { override fun onCleared() {
super.onCleared() super.onCleared()
} }
} }

7
app/src/main/java/com/aurora/store/viewmodel/all/InstalledViewModel.kt
View File

@@ -29,6 +29,7 @@ import kotlinx.coroutines.launch
import org.greenrobot.eventbus.EventBus import org.greenrobot.eventbus.EventBus
import org.greenrobot.eventbus.Subscribe import org.greenrobot.eventbus.Subscribe
import org.greenrobot.eventbus.ThreadMode import org.greenrobot.eventbus.ThreadMode
import java.util.*
class InstalledViewModel(application: Application) : BaseAppsViewModel(application) { class InstalledViewModel(application: Application) : BaseAppsViewModel(application) {
@@ -43,7 +44,7 @@ class InstalledViewModel(application: Application) : BaseAppsViewModel(applicati
viewModelScope.launch(Dispatchers.IO) { viewModelScope.launch(Dispatchers.IO) {
try { try {
appList.flushAndAdd(getFilteredApps()) appList.flushAndAdd(getFilteredApps())
liveData.postValue(appList.sortedBy { it.displayName }) liveData.postValue(appList.sortedBy { it.displayName.toLowerCase(Locale.getDefault()) })
requestState = RequestState.Complete requestState = RequestState.Complete
} catch (e: Exception) { } catch (e: Exception) {
requestState = RequestState.Pending requestState = RequestState.Pending
@@ -78,11 +79,11 @@ class InstalledViewModel(application: Application) : BaseAppsViewModel(applicati
appList.flushAndAdd(updatedList) appList.flushAndAdd(updatedList)
//Post new update list //Post new update list
liveData.postValue(appList.sortedBy { it.displayName }) liveData.postValue(appList.sortedBy { it.displayName.toLowerCase(Locale.getDefault()) })
} }
override fun onCleared() { override fun onCleared() {
EventBus.getDefault().unregister(this) EventBus.getDefault().unregister(this)
super.onCleared() super.onCleared()
} }
} }

5
app/src/main/java/com/aurora/store/viewmodel/all/UpdatesViewModel.kt
View File

@@ -34,6 +34,7 @@ import kotlinx.coroutines.launch
import org.greenrobot.eventbus.EventBus import org.greenrobot.eventbus.EventBus
import org.greenrobot.eventbus.Subscribe import org.greenrobot.eventbus.Subscribe
import org.greenrobot.eventbus.ThreadMode import org.greenrobot.eventbus.ThreadMode
import java.util.*
class UpdatesViewModel(application: Application) : BaseAppsViewModel(application) { class UpdatesViewModel(application: Application) : BaseAppsViewModel(application) {
@@ -67,7 +68,7 @@ class UpdatesViewModel(application: Application) : BaseAppsViewModel(application
} else { } else {
false false
} }
}.also { apps -> }.sortedBy { it.displayName.toLowerCase(Locale.getDefault()) }.also { apps ->
apps.forEach { apps.forEach {
updateFileMap[it.id] = UpdateFile(it) updateFileMap[it.id] = UpdateFile(it)
} }
@@ -154,4 +155,4 @@ class UpdatesViewModel(application: Application) : BaseAppsViewModel(application
EventBus.getDefault().unregister(this) EventBus.getDefault().unregister(this)
super.onCleared() super.onCleared()
} }
} }