From e50a9085914c790c6f72305bc7625e372b019978 Mon Sep 17 00:00:00 2001 From: MM20 <15646950+MM2-0@users.noreply.github.com> Date: Tue, 20 Sep 2022 23:03:27 +0200 Subject: [PATCH] Remove favorites enabled check from shared FavoritesVM --- .../de/mm20/launcher2/ui/common/FavoritesVM.kt | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/ui/src/main/java/de/mm20/launcher2/ui/common/FavoritesVM.kt b/ui/src/main/java/de/mm20/launcher2/ui/common/FavoritesVM.kt index 79422944..d2120cdb 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/common/FavoritesVM.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/common/FavoritesVM.kt @@ -24,13 +24,11 @@ open class FavoritesVM : ViewModel(), KoinComponent { if (tag == null) { val columns = dataStore.data.map { it.grid.columnCount } val excludeCalendar = widgetRepository.isCalendarWidgetEnabled() - val favoritesEnabled = dataStore.data.map { it.favorites.enabled } val includeFrequentlyUsed = dataStore.data.map { it.favorites.frequentlyUsed } val frequentlyUsedRows = dataStore.data.map { it.favorites.frequentlyUsedRows } combine( listOf( - favoritesEnabled, columns, excludeCalendar, includeFrequentlyUsed, @@ -38,15 +36,10 @@ open class FavoritesVM : ViewModel(), KoinComponent { ) ) { it }.transformLatest { - val favoritesEnabled = it[0] as Boolean - val columns = it[1] as Int - val excludeCalendar = it[2] as Boolean - val includeFrequentlyUsed = it[3] as Boolean - val frequentlyUsedRows = it[4] as Int - - if (!favoritesEnabled) { - return@transformLatest - } + val columns = it[0] as Int + val excludeCalendar = it[1] as Boolean + val includeFrequentlyUsed = it[2] as Boolean + val frequentlyUsedRows = it[3] as Int val pinned = favoritesRepository.getFavorites( excludeTypes = if (excludeCalendar) listOf("calendar") else null,