From 6e5191bb9e62be7420eb90c6bc602079b02cf6f6 Mon Sep 17 00:00:00 2001 From: MM20 <15646950+MM2-0@users.noreply.github.com> Date: Sun, 30 Jan 2022 14:04:25 +0100 Subject: [PATCH] Don't repeat unnecessary work onResume or onStart --- .../ui/legacy/search/ApplicationDetailRepresentation.kt | 2 +- .../launcher2/ui/legacy/search/BasicGridRepresentation.kt | 2 +- .../launcher2/ui/legacy/search/ContactDetailRepresentation.kt | 2 +- .../launcher2/ui/legacy/search/ContactListRepresentation.kt | 2 +- .../launcher2/ui/legacy/search/FileDetailRepresentation.kt | 2 +- .../mm20/launcher2/ui/legacy/search/FileListRepresentation.kt | 2 +- .../java/de/mm20/launcher2/ui/legacy/search/SearchGridView.kt | 2 +- .../ui/legacy/search/ShortcutDetailRepresentation.kt | 2 +- .../launcher2/ui/legacy/search/WebsiteDetailRepresentation.kt | 2 +- .../launcher2/ui/legacy/search/WebsiteListRepresentation.kt | 2 +- .../java/de/mm20/launcher2/ui/legacy/view/InnerCardView.kt | 2 +- .../java/de/mm20/launcher2/ui/legacy/view/LauncherCardView.kt | 2 +- .../java/de/mm20/launcher2/ui/legacy/view/SwipeCardView.kt | 2 +- .../main/java/de/mm20/launcher2/ui/legacy/view/ToolbarView.kt | 4 ++-- 14 files changed, 15 insertions(+), 15 deletions(-) diff --git a/ui/src/main/java/de/mm20/launcher2/ui/legacy/search/ApplicationDetailRepresentation.kt b/ui/src/main/java/de/mm20/launcher2/ui/legacy/search/ApplicationDetailRepresentation.kt index 43caee3d..396ff63c 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/legacy/search/ApplicationDetailRepresentation.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/legacy/search/ApplicationDetailRepresentation.kt @@ -89,7 +89,7 @@ class ApplicationDetailRepresentation : Representation, KoinComponent { notificationView.layoutTransition = ChangingLayoutTransition() job = rootView.scope.launch { - rootView.lifecycleOwner.repeatOnLifecycle(Lifecycle.State.STARTED) { + rootView.lifecycleOwner.repeatOnLifecycle(Lifecycle.State.CREATED) { launch { iconRepository.getIcon(application, (84 * rootView.dp).toInt()) .collectLatest { diff --git a/ui/src/main/java/de/mm20/launcher2/ui/legacy/search/BasicGridRepresentation.kt b/ui/src/main/java/de/mm20/launcher2/ui/legacy/search/BasicGridRepresentation.kt index 2a54b43a..c5f7cdc3 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/legacy/search/BasicGridRepresentation.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/legacy/search/BasicGridRepresentation.kt @@ -59,7 +59,7 @@ class BasicGridRepresentation : Representation, KoinComponent { shape = LauncherIconView.currentShape job = rootView.scope.launch { - rootView.lifecycleOwner.repeatOnLifecycle(Lifecycle.State.STARTED) { + rootView.lifecycleOwner.repeatOnLifecycle(Lifecycle.State.CREATED) { launch { iconRepository.getIcon(searchable, (84 * rootView.dp).toInt()) .collectLatest { diff --git a/ui/src/main/java/de/mm20/launcher2/ui/legacy/search/ContactDetailRepresentation.kt b/ui/src/main/java/de/mm20/launcher2/ui/legacy/search/ContactDetailRepresentation.kt index 0af89fcb..8ff15930 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/legacy/search/ContactDetailRepresentation.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/legacy/search/ContactDetailRepresentation.kt @@ -56,7 +56,7 @@ class ContactDetailRepresentation : Representation, KoinComponent { icon = iconRepository.getIconIfCached(contact) shape = LauncherIconView.currentShape job = rootView.scope.launch { - rootView.lifecycleOwner.repeatOnLifecycle(Lifecycle.State.STARTED) { + rootView.lifecycleOwner.repeatOnLifecycle(Lifecycle.State.CREATED) { launch { iconRepository.getIcon(contact, (84 * rootView.dp).toInt()) .collectLatest { diff --git a/ui/src/main/java/de/mm20/launcher2/ui/legacy/search/ContactListRepresentation.kt b/ui/src/main/java/de/mm20/launcher2/ui/legacy/search/ContactListRepresentation.kt index bacb9fce..195b287f 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/legacy/search/ContactListRepresentation.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/legacy/search/ContactListRepresentation.kt @@ -40,7 +40,7 @@ class ContactListRepresentation : Representation, KoinComponent { icon = iconRepository.getIconIfCached(contact) shape = LauncherIconView.currentShape job = rootView.scope.launch { - rootView.lifecycleOwner.repeatOnLifecycle(Lifecycle.State.STARTED) { + rootView.lifecycleOwner.repeatOnLifecycle(Lifecycle.State.CREATED) { launch { iconRepository.getIcon(searchable, (84 * rootView.dp).toInt()) .collectLatest { diff --git a/ui/src/main/java/de/mm20/launcher2/ui/legacy/search/FileDetailRepresentation.kt b/ui/src/main/java/de/mm20/launcher2/ui/legacy/search/FileDetailRepresentation.kt index 581f4765..ed5f239b 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/legacy/search/FileDetailRepresentation.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/legacy/search/FileDetailRepresentation.kt @@ -51,7 +51,7 @@ class FileDetailRepresentation : Representation, KoinComponent { icon = iconRepository.getIconIfCached(file) shape = LauncherIconView.currentShape job = rootView.scope.launch { - rootView.lifecycleOwner.repeatOnLifecycle(Lifecycle.State.STARTED) { + rootView.lifecycleOwner.repeatOnLifecycle(Lifecycle.State.CREATED) { launch { iconRepository.getIcon(searchable, (84 * rootView.dp).toInt()) .collectLatest { diff --git a/ui/src/main/java/de/mm20/launcher2/ui/legacy/search/FileListRepresentation.kt b/ui/src/main/java/de/mm20/launcher2/ui/legacy/search/FileListRepresentation.kt index 6e2ef9d3..bc335461 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/legacy/search/FileListRepresentation.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/legacy/search/FileListRepresentation.kt @@ -47,7 +47,7 @@ class FileListRepresentation : Representation, KoinComponent { icon = iconRepository.getIconIfCached(file) shape = LauncherIconView.currentShape job = rootView.scope.launch { - rootView.lifecycleOwner.repeatOnLifecycle(Lifecycle.State.STARTED) { + rootView.lifecycleOwner.repeatOnLifecycle(Lifecycle.State.CREATED) { launch { iconRepository.getIcon(searchable, (84 * rootView.dp).toInt()) .collectLatest { diff --git a/ui/src/main/java/de/mm20/launcher2/ui/legacy/search/SearchGridView.kt b/ui/src/main/java/de/mm20/launcher2/ui/legacy/search/SearchGridView.kt index 4f357a35..83b1deb9 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/legacy/search/SearchGridView.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/legacy/search/SearchGridView.kt @@ -44,7 +44,7 @@ class SearchGridView : ViewGroup, KoinComponent { super.onAttachedToWindow() job?.cancel() lifecycleScope.launch { - lifecycleOwner.repeatOnLifecycle(Lifecycle.State.STARTED) { + lifecycleOwner.repeatOnLifecycle(Lifecycle.State.CREATED) { columnCountPreference.collectLatest { columnCount = it } diff --git a/ui/src/main/java/de/mm20/launcher2/ui/legacy/search/ShortcutDetailRepresentation.kt b/ui/src/main/java/de/mm20/launcher2/ui/legacy/search/ShortcutDetailRepresentation.kt index aef52eaa..1891126e 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/legacy/search/ShortcutDetailRepresentation.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/legacy/search/ShortcutDetailRepresentation.kt @@ -49,7 +49,7 @@ class AppShortcutDetailRepresentation : Representation, KoinComponent { icon = iconRepository.getIconIfCached(appShortcut) shape = LauncherIconView.currentShape job = rootView.scope.launch { - rootView.lifecycleOwner.repeatOnLifecycle(Lifecycle.State.STARTED) { + rootView.lifecycleOwner.repeatOnLifecycle(Lifecycle.State.CREATED) { launch { iconRepository.getIcon(searchable, (84 * rootView.dp).toInt()) .collectLatest { diff --git a/ui/src/main/java/de/mm20/launcher2/ui/legacy/search/WebsiteDetailRepresentation.kt b/ui/src/main/java/de/mm20/launcher2/ui/legacy/search/WebsiteDetailRepresentation.kt index 711742dc..ca3b79f1 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/legacy/search/WebsiteDetailRepresentation.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/legacy/search/WebsiteDetailRepresentation.kt @@ -76,7 +76,7 @@ class WebsiteDetailRepresentation : Representation, KoinComponent { icon = iconRepository.getIconIfCached(website) shape = LauncherIconView.currentShape job = rootView.scope.launch { - rootView.lifecycleOwner.repeatOnLifecycle(Lifecycle.State.STARTED) { + rootView.lifecycleOwner.repeatOnLifecycle(Lifecycle.State.CREATED) { launch { iconRepository.getIcon(website, (84 * rootView.dp).toInt()) .collectLatest { diff --git a/ui/src/main/java/de/mm20/launcher2/ui/legacy/search/WebsiteListRepresentation.kt b/ui/src/main/java/de/mm20/launcher2/ui/legacy/search/WebsiteListRepresentation.kt index bc3e95cc..00ad274c 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/legacy/search/WebsiteListRepresentation.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/legacy/search/WebsiteListRepresentation.kt @@ -80,7 +80,7 @@ class WebsiteListRepresentation : Representation, KoinComponent { icon = iconRepository.getIconIfCached(website) shape = LauncherIconView.currentShape job = rootView.scope.launch { - rootView.lifecycleOwner.repeatOnLifecycle(Lifecycle.State.STARTED) { + rootView.lifecycleOwner.repeatOnLifecycle(Lifecycle.State.CREATED) { launch { iconRepository.getIcon(searchable, (84 * rootView.dp).toInt()) .collectLatest { diff --git a/ui/src/main/java/de/mm20/launcher2/ui/legacy/view/InnerCardView.kt b/ui/src/main/java/de/mm20/launcher2/ui/legacy/view/InnerCardView.kt index 53f321df..82c722b6 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/legacy/view/InnerCardView.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/legacy/view/InnerCardView.kt @@ -37,7 +37,7 @@ open class InnerCardView @JvmOverloads constructor( super.onAttachedToWindow() job?.cancel() job = lifecycleScope.launch { - lifecycleOwner.repeatOnLifecycle(Lifecycle.State.RESUMED) { + lifecycleOwner.repeatOnLifecycle(Lifecycle.State.CREATED) { dataStore.data.map { it.cards.radius }.distinctUntilChanged().collectLatest { radius = it * dp } diff --git a/ui/src/main/java/de/mm20/launcher2/ui/legacy/view/LauncherCardView.kt b/ui/src/main/java/de/mm20/launcher2/ui/legacy/view/LauncherCardView.kt index 724d3345..68bdb245 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/legacy/view/LauncherCardView.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/legacy/view/LauncherCardView.kt @@ -82,7 +82,7 @@ open class LauncherCardView @JvmOverloads constructor( super.onAttachedToWindow() job?.cancel() job = lifecycleScope.launch { - lifecycleOwner.repeatOnLifecycle(Lifecycle.State.RESUMED) { + lifecycleOwner.repeatOnLifecycle(Lifecycle.State.CREATED) { dataStore.data.map { it.cards }.distinctUntilChanged().collectLatest { currentCardStyle = it if (!overrideBackgroundOpacity) { diff --git a/ui/src/main/java/de/mm20/launcher2/ui/legacy/view/SwipeCardView.kt b/ui/src/main/java/de/mm20/launcher2/ui/legacy/view/SwipeCardView.kt index 0f7610b0..9b09a2f6 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/legacy/view/SwipeCardView.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/legacy/view/SwipeCardView.kt @@ -372,7 +372,7 @@ class SwipeCardView @JvmOverloads constructor( super.onAttachedToWindow() job?.cancel() job = lifecycleScope.launch { - lifecycleOwner.repeatOnLifecycle(Lifecycle.State.RESUMED) { + lifecycleOwner.repeatOnLifecycle(Lifecycle.State.CREATED) { dataStore.data.map { it.cards.radius }.distinctUntilChanged().collectLatest { radius = it * dp } diff --git a/ui/src/main/java/de/mm20/launcher2/ui/legacy/view/ToolbarView.kt b/ui/src/main/java/de/mm20/launcher2/ui/legacy/view/ToolbarView.kt index f006c7ea..4ff5315a 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/legacy/view/ToolbarView.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/legacy/view/ToolbarView.kt @@ -251,7 +251,7 @@ class FavoriteToolbarAction(val context: Context, val item: Searchable) : Toolba (context as LifecycleOwner).apply { lifecycleScope.launch { - repeatOnLifecycle(Lifecycle.State.STARTED) { + repeatOnLifecycle(Lifecycle.State.CREATED) { repository.isPinned(item).collectLatest { isPinned = it } @@ -290,7 +290,7 @@ class VisibilityToolbarAction(val context: Context, val item: Searchable) : Tool (context as LifecycleOwner).apply { lifecycleScope.launch { - repeatOnLifecycle(Lifecycle.State.STARTED) { + repeatOnLifecycle(Lifecycle.State.CREATED) { repository.isHidden(item).collectLatest { isHidden = it }