From c582f2107d135d97b711e4c985f2451f1ab9e685 Mon Sep 17 00:00:00 2001 From: MM20 <15646950+MM2-0@users.noreply.github.com> Date: Sun, 29 May 2022 20:52:01 +0200 Subject: [PATCH] Sort hidden items --- .../launcher2/ui/launcher/modals/HiddenItemsSheet.kt | 2 +- .../launcher2/ui/launcher/modals/HiddenItemsSheetVM.kt | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/modals/HiddenItemsSheet.kt b/ui/src/main/java/de/mm20/launcher2/ui/launcher/modals/HiddenItemsSheet.kt index 23d909e2..6fb56e2e 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/launcher/modals/HiddenItemsSheet.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/launcher/modals/HiddenItemsSheet.kt @@ -161,7 +161,7 @@ fun HiddenItemsSheet( } ) - val items by viewModel.hiddenItems.collectAsState(emptyList()) + val items by remember { viewModel.hiddenItems }.collectAsState(emptyList()) SearchResultGrid( items, modifier = Modifier diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/modals/HiddenItemsSheetVM.kt b/ui/src/main/java/de/mm20/launcher2/ui/launcher/modals/HiddenItemsSheetVM.kt index ae62c14d..b4046554 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/launcher/modals/HiddenItemsSheetVM.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/launcher/modals/HiddenItemsSheetVM.kt @@ -2,21 +2,19 @@ package de.mm20.launcher2.ui.launcher.modals import android.content.Context import android.content.Intent -import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel import de.mm20.launcher2.favorites.FavoritesRepository -import de.mm20.launcher2.search.data.Searchable import de.mm20.launcher2.ui.settings.SettingsActivity -import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.flow.collectLatest -import kotlinx.coroutines.withContext +import kotlinx.coroutines.flow.map import org.koin.core.component.KoinComponent import org.koin.core.component.inject class HiddenItemsSheetVM: ViewModel(), KoinComponent { private val repository: FavoritesRepository by inject() - val hiddenItems = repository.getHiddenItems() + val hiddenItems = repository.getHiddenItems().map { + it.sorted() + } fun showHiddenItems(context: Context) { context.startActivity(