From 79be6559499a4dc66e8272ae7a88605243a996f5 Mon Sep 17 00:00:00 2001
From: MM20 <15646950+MM2-0@users.noreply.github.com>
Date: Fri, 23 Sep 2022 22:40:58 +0200
Subject: [PATCH] Fix favorite disable preference having no effect

---
 .../de/mm20/launcher2/ui/launcher/search/SearchColumn.kt    | 6 ++++--
 .../java/de/mm20/launcher2/ui/launcher/search/SearchVM.kt   | 1 +
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/SearchColumn.kt b/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/SearchColumn.kt
index 7f1bec86..3b7e6300 100644
--- a/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/SearchColumn.kt
+++ b/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/SearchColumn.kt
@@ -57,6 +57,7 @@ fun SearchColumn(
     var showWorkProfileApps by remember { mutableStateOf(false) }
 
     val hideFavs by viewModel.hideFavorites.observeAsState(true)
+    val favoritesEnabled by viewModel.favoritesEnabled.collectAsState(false)
     val apps by viewModel.appResults.observeAsState(emptyList())
     val workApps by viewModel.workAppResults.observeAsState(emptyList())
     val appShortcuts by viewModel.appShortcutResults.observeAsState(emptyList())
@@ -80,7 +81,7 @@ fun SearchColumn(
         contentPadding = paddingValues,
         reverseLayout = reverse,
     ) {
-        if (!hideFavs) {
+        if (!hideFavs && favoritesEnabled) {
             GridResults(
                 items = favorites.toImmutableList(),
                 columns = columns,
@@ -101,7 +102,8 @@ fun SearchColumn(
                         Row(
                             modifier = Modifier
                                 .weight(1f)
-                                .horizontalScroll(tagsScrollState).padding(end = 12.dp),
+                                .horizontalScroll(tagsScrollState)
+                                .padding(end = 12.dp),
                         ) {
                             FilterChip(
                                 modifier = Modifier.padding(start = 16.dp),
diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/SearchVM.kt b/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/SearchVM.kt
index 20e1dff6..2bfa1cf5 100644
--- a/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/SearchVM.kt
+++ b/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/SearchVM.kt
@@ -66,6 +66,7 @@ class SearchVM : ViewModel(), KoinComponent {
 
     val hiddenResults = MutableLiveData<List<Searchable>>(emptyList())
 
+    val favoritesEnabled = dataStore.data.map { it.favorites.enabled }
     val hideFavorites = MutableLiveData(false)
 
     private val hiddenItemKeys = favoritesRepository