lun_admin/NeoLaunch_From_Kvaesitso
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Remove favorites enabled check from shared FavoritesVM

Browse Source
This commit is contained in:
MM20 2022-09-20 23:03:27 +02:00
parent b7871aa743
commit e50a908591
No known key found for this signature in database
GPG Key ID: 0B61A8F2DEAFA389
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ui/src/main/java/de/mm20/launcher2/ui/common/FavoritesVM.kt
View File

@ -24,13 +24,11 @@ open class FavoritesVM : ViewModel(), KoinComponent {
if (tag == null) { if (tag == null) {
val columns = dataStore.data.map { it.grid.columnCount } val columns = dataStore.data.map { it.grid.columnCount }
val excludeCalendar = widgetRepository.isCalendarWidgetEnabled() val excludeCalendar = widgetRepository.isCalendarWidgetEnabled()
val favoritesEnabled = dataStore.data.map { it.favorites.enabled }
val includeFrequentlyUsed = dataStore.data.map { it.favorites.frequentlyUsed } val includeFrequentlyUsed = dataStore.data.map { it.favorites.frequentlyUsed }
val frequentlyUsedRows = dataStore.data.map { it.favorites.frequentlyUsedRows } val frequentlyUsedRows = dataStore.data.map { it.favorites.frequentlyUsedRows }
combine( combine(
listOf( listOf(
favoritesEnabled,
columns, columns,
excludeCalendar, excludeCalendar,
includeFrequentlyUsed, includeFrequentlyUsed,
@ -38,15 +36,10 @@ open class FavoritesVM : ViewModel(), KoinComponent {
) )
) { it }.transformLatest { ) { it }.transformLatest {
val favoritesEnabled = it[0] as Boolean val columns = it[0] as Int
val columns = it[1] as Int val excludeCalendar = it[1] as Boolean
val excludeCalendar = it[2] as Boolean val includeFrequentlyUsed = it[2] as Boolean
val includeFrequentlyUsed = it[3] as Boolean val frequentlyUsedRows = it[3] as Int
val frequentlyUsedRows = it[4] as Int
if (!favoritesEnabled) {
return@transformLatest
}
val pinned = favoritesRepository.getFavorites( val pinned = favoritesRepository.getFavorites(
excludeTypes = if (excludeCalendar) listOf("calendar") else null, excludeTypes = if (excludeCalendar) listOf("calendar") else null,