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

Fix crash

Browse Source
This commit is contained in:
MM20 2023-08-20 21:15:11 +02:00
parent d8f11a04c7
commit cfbb4e786c
No known key found for this signature in database
GPG Key ID: 0B61A8F2DEAFA389
8 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/ui/src/main/java/de/mm20/launcher2/ui/common/SearchablePickerVM.kt
View File

@ -57,7 +57,7 @@ class SearchablePickerVM: ViewModel(), KoinComponent {
} }
} }
fun getIcon(searchable: SavableSearchable, size: Int): Flow<LauncherIcon> { fun getIcon(searchable: SavableSearchable, size: Int): Flow<LauncherIcon?> {
return iconService.getIcon(searchable, size) return iconService.getIcon(searchable, size)
} }
} }

2
app/ui/src/main/java/de/mm20/launcher2/ui/launcher/sheets/CustomizeSearchableSheetVM.kt
View File

@ -28,7 +28,7 @@ class CustomizeSearchableSheetVM(
val isIconPickerOpen = mutableStateOf(false) val isIconPickerOpen = mutableStateOf(false)
fun getIcon(size: Int): Flow<LauncherIcon> { fun getIcon(size: Int): Flow<LauncherIcon?> {
return iconService.getIcon(searchable, size) return iconService.getIcon(searchable, size)
} }

2
app/ui/src/main/java/de/mm20/launcher2/ui/settings/gestures/GestureSettingsScreenVM.kt
View File

@ -236,7 +236,7 @@ class GestureSettingsScreenVM : ViewModel(), KoinComponent {
permissionsManager.requestPermission(context, PermissionGroup.Accessibility) permissionsManager.requestPermission(context, PermissionGroup.Accessibility)
} }
fun getIcon(searchable: SavableSearchable?, size: Int): Flow<LauncherIcon> { fun getIcon(searchable: SavableSearchable?, size: Int): Flow<LauncherIcon?> {
if (searchable == null) return emptyFlow() if (searchable == null) return emptyFlow()
return iconService.getIcon(searchable, size) return iconService.getIcon(searchable, size)
} }

2
app/ui/src/main/java/de/mm20/launcher2/ui/settings/hiddenitems/HiddenItemsSettingsScreenVM.kt
View File

@ -55,7 +55,7 @@ class HiddenItemsSettingsScreenVM : ViewModel(), KoinComponent {
} }
} }
fun getIcon(searchable: SavableSearchable, size: Int): Flow<LauncherIcon> { fun getIcon(searchable: SavableSearchable, size: Int): Flow<LauncherIcon?> {
return iconService.getIcon(searchable, size) return iconService.getIcon(searchable, size)
} }

2
app/ui/src/main/java/de/mm20/launcher2/ui/settings/icons/IconsSettingsScreenVM.kt
View File

@ -221,7 +221,7 @@ class IconsSettingsScreenVM(
} }
} }
fun getPreviewIcons(size: Int): Flow<List<LauncherIcon>> { fun getPreviewIcons(size: Int): Flow<List<LauncherIcon?>> {
return columnCount.flatMapLatest { cols -> return columnCount.flatMapLatest { cols ->
favoritesService.getFavorites( favoritesService.getFavorites(
includeTypes = listOf(LauncherApp.Domain), includeTypes = listOf(LauncherApp.Domain),

2
app/ui/src/main/java/de/mm20/launcher2/ui/settings/media/MediaIntegrationSettingsScreenVM.kt
View File

@ -113,5 +113,5 @@ data class AppListItem(
val packageName: String, val packageName: String,
val isMusicApp: Boolean, val isMusicApp: Boolean,
val isChecked: Boolean, val isChecked: Boolean,
val icon: Flow<LauncherIcon>, val icon: Flow<LauncherIcon?>,
) )

2
app/ui/src/main/java/de/mm20/launcher2/ui/settings/tags/EditTagSheetVM.kt
View File

@ -81,7 +81,7 @@ class EditTagSheetVM : ViewModel(), KoinComponent {
oldTagName = tagName oldTagName = tagName
} }
fun getIcon(item: SavableSearchable, size: Int): Flow<LauncherIcon> { fun getIcon(item: SavableSearchable, size: Int): Flow<LauncherIcon?> {
return iconService.getIcon(item, size) return iconService.getIcon(item, size)
} }

2
services/icons/src/main/java/de/mm20/launcher2/icons/IconService.kt
View File

@ -139,7 +139,7 @@ class IconService(
} }
fun getIcon(searchable: SavableSearchable, size: Int): Flow<LauncherIcon> { fun getIcon(searchable: SavableSearchable, size: Int): Flow<LauncherIcon?> {
val customIcon = customAttributesRepository.getCustomIcon(searchable) val customIcon = customAttributesRepository.getCustomIcon(searchable)
return combine(iconProviders, transformations, customIcon) { providers, transformations, ci -> return combine(iconProviders, transformations, customIcon) { providers, transformations, ci ->
var icon = cache.get(searchable.key + ci.hashCode()) var icon = cache.get(searchable.key + ci.hashCode())