From cfbb4e786c8f557feef53f8b01ff731cf9709422 Mon Sep 17 00:00:00 2001 From: MM20 <15646950+MM2-0@users.noreply.github.com> Date: Sun, 20 Aug 2023 21:15:11 +0200 Subject: [PATCH] Fix crash --- .../main/java/de/mm20/launcher2/ui/common/SearchablePickerVM.kt | 2 +- .../launcher2/ui/launcher/sheets/CustomizeSearchableSheetVM.kt | 2 +- .../launcher2/ui/settings/gestures/GestureSettingsScreenVM.kt | 2 +- .../ui/settings/hiddenitems/HiddenItemsSettingsScreenVM.kt | 2 +- .../mm20/launcher2/ui/settings/icons/IconsSettingsScreenVM.kt | 2 +- .../ui/settings/media/MediaIntegrationSettingsScreenVM.kt | 2 +- .../java/de/mm20/launcher2/ui/settings/tags/EditTagSheetVM.kt | 2 +- .../icons/src/main/java/de/mm20/launcher2/icons/IconService.kt | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/common/SearchablePickerVM.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/common/SearchablePickerVM.kt index 2069314a..18d1c93b 100644 --- a/app/ui/src/main/java/de/mm20/launcher2/ui/common/SearchablePickerVM.kt +++ b/app/ui/src/main/java/de/mm20/launcher2/ui/common/SearchablePickerVM.kt @@ -57,7 +57,7 @@ class SearchablePickerVM: ViewModel(), KoinComponent { } } - fun getIcon(searchable: SavableSearchable, size: Int): Flow { + fun getIcon(searchable: SavableSearchable, size: Int): Flow { return iconService.getIcon(searchable, size) } } \ No newline at end of file diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/sheets/CustomizeSearchableSheetVM.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/sheets/CustomizeSearchableSheetVM.kt index 2e9d0c52..5925ead1 100644 --- a/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/sheets/CustomizeSearchableSheetVM.kt +++ b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/sheets/CustomizeSearchableSheetVM.kt @@ -28,7 +28,7 @@ class CustomizeSearchableSheetVM( val isIconPickerOpen = mutableStateOf(false) - fun getIcon(size: Int): Flow { + fun getIcon(size: Int): Flow { return iconService.getIcon(searchable, size) } diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/settings/gestures/GestureSettingsScreenVM.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/gestures/GestureSettingsScreenVM.kt index 3fe59bb6..afc32c05 100644 --- a/app/ui/src/main/java/de/mm20/launcher2/ui/settings/gestures/GestureSettingsScreenVM.kt +++ b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/gestures/GestureSettingsScreenVM.kt @@ -236,7 +236,7 @@ class GestureSettingsScreenVM : ViewModel(), KoinComponent { permissionsManager.requestPermission(context, PermissionGroup.Accessibility) } - fun getIcon(searchable: SavableSearchable?, size: Int): Flow { + fun getIcon(searchable: SavableSearchable?, size: Int): Flow { if (searchable == null) return emptyFlow() return iconService.getIcon(searchable, size) } diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/settings/hiddenitems/HiddenItemsSettingsScreenVM.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/hiddenitems/HiddenItemsSettingsScreenVM.kt index c6d9313f..e5941548 100644 --- a/app/ui/src/main/java/de/mm20/launcher2/ui/settings/hiddenitems/HiddenItemsSettingsScreenVM.kt +++ b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/hiddenitems/HiddenItemsSettingsScreenVM.kt @@ -55,7 +55,7 @@ class HiddenItemsSettingsScreenVM : ViewModel(), KoinComponent { } } - fun getIcon(searchable: SavableSearchable, size: Int): Flow { + fun getIcon(searchable: SavableSearchable, size: Int): Flow { return iconService.getIcon(searchable, size) } diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/settings/icons/IconsSettingsScreenVM.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/icons/IconsSettingsScreenVM.kt index c9723d09..5aebbd00 100644 --- a/app/ui/src/main/java/de/mm20/launcher2/ui/settings/icons/IconsSettingsScreenVM.kt +++ b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/icons/IconsSettingsScreenVM.kt @@ -221,7 +221,7 @@ class IconsSettingsScreenVM( } } - fun getPreviewIcons(size: Int): Flow> { + fun getPreviewIcons(size: Int): Flow> { return columnCount.flatMapLatest { cols -> favoritesService.getFavorites( includeTypes = listOf(LauncherApp.Domain), diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/settings/media/MediaIntegrationSettingsScreenVM.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/media/MediaIntegrationSettingsScreenVM.kt index 8afa8454..a99c4d10 100644 --- a/app/ui/src/main/java/de/mm20/launcher2/ui/settings/media/MediaIntegrationSettingsScreenVM.kt +++ b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/media/MediaIntegrationSettingsScreenVM.kt @@ -113,5 +113,5 @@ data class AppListItem( val packageName: String, val isMusicApp: Boolean, val isChecked: Boolean, - val icon: Flow, + val icon: Flow, ) \ No newline at end of file diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/settings/tags/EditTagSheetVM.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/tags/EditTagSheetVM.kt index d7a5a567..ff090ab5 100644 --- a/app/ui/src/main/java/de/mm20/launcher2/ui/settings/tags/EditTagSheetVM.kt +++ b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/tags/EditTagSheetVM.kt @@ -81,7 +81,7 @@ class EditTagSheetVM : ViewModel(), KoinComponent { oldTagName = tagName } - fun getIcon(item: SavableSearchable, size: Int): Flow { + fun getIcon(item: SavableSearchable, size: Int): Flow { return iconService.getIcon(item, size) } diff --git a/services/icons/src/main/java/de/mm20/launcher2/icons/IconService.kt b/services/icons/src/main/java/de/mm20/launcher2/icons/IconService.kt index f224eae7..5fdcc9b1 100644 --- a/services/icons/src/main/java/de/mm20/launcher2/icons/IconService.kt +++ b/services/icons/src/main/java/de/mm20/launcher2/icons/IconService.kt @@ -139,7 +139,7 @@ class IconService( } - fun getIcon(searchable: SavableSearchable, size: Int): Flow { + fun getIcon(searchable: SavableSearchable, size: Int): Flow { val customIcon = customAttributesRepository.getCustomIcon(searchable) return combine(iconProviders, transformations, customIcon) { providers, transformations, ci -> var icon = cache.get(searchable.key + ci.hashCode())