From 3a93af4b0a12a956d01c98ea6928bbd811008116 Mon Sep 17 00:00:00 2001
From: Alex Baker <alex@tasks.org>
Date: Mon, 20 Jun 2022 09:06:42 -0500
Subject: [PATCH] Update collect method

---
 app/src/main/java/com/todoroo/astrid/tags/TagsControlSet.kt | 4 ++--
 app/src/main/java/org/tasks/ui/ListFragment.kt              | 4 ++--
 app/src/main/java/org/tasks/ui/PriorityControlSet.kt        | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/com/todoroo/astrid/tags/TagsControlSet.kt b/app/src/main/java/com/todoroo/astrid/tags/TagsControlSet.kt
index afb5ef6e3..7b66986bd 100644
--- a/app/src/main/java/com/todoroo/astrid/tags/TagsControlSet.kt
+++ b/app/src/main/java/com/todoroo/astrid/tags/TagsControlSet.kt
@@ -6,13 +6,13 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.collectAsState
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.colorResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import dagger.hilt.android.AndroidEntryPoint
 import org.tasks.R
+import org.tasks.compose.collectAsStateLifecycleAware
 import org.tasks.data.TagData
 import org.tasks.tags.TagPickerActivity
 import org.tasks.ui.ChipGroup
@@ -32,7 +32,7 @@ class TagsControlSet : TaskEditControlComposeFragment() {
 
     @Composable
     override fun Body() {
-        val tags = viewModel.selectedTags.collectAsState()
+        val tags = viewModel.selectedTags.collectAsStateLifecycleAware()
         ChipGroup(modifier = Modifier.padding(top = 20.dp, bottom = 20.dp, end = 16.dp)) {
             if (tags.value.isEmpty()) {
                 Text(
diff --git a/app/src/main/java/org/tasks/ui/ListFragment.kt b/app/src/main/java/org/tasks/ui/ListFragment.kt
index bcc206815..d344ea9b5 100644
--- a/app/src/main/java/org/tasks/ui/ListFragment.kt
+++ b/app/src/main/java/org/tasks/ui/ListFragment.kt
@@ -4,7 +4,6 @@ import android.app.Activity
 import android.content.Intent
 import androidx.compose.foundation.layout.padding
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.collectAsState
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
 import com.todoroo.astrid.api.CaldavFilter
@@ -13,6 +12,7 @@ import com.todoroo.astrid.api.GtasksFilter
 import dagger.hilt.android.AndroidEntryPoint
 import org.tasks.R
 import org.tasks.activities.ListPicker
+import org.tasks.compose.collectAsStateLifecycleAware
 import javax.inject.Inject
 
 @AndroidEntryPoint
@@ -21,7 +21,7 @@ class ListFragment : TaskEditControlComposeFragment() {
 
     @Composable
     override fun Body() {
-        val list = viewModel.selectedList.collectAsState()
+        val list = viewModel.selectedList.collectAsStateLifecycleAware()
         val selectedList = list.value ?: return
         ChipGroup(modifier = Modifier.padding(vertical = 20.dp)) {
             chipProvider.FilterChip(
diff --git a/app/src/main/java/org/tasks/ui/PriorityControlSet.kt b/app/src/main/java/org/tasks/ui/PriorityControlSet.kt
index f832138c0..81cc04907 100644
--- a/app/src/main/java/org/tasks/ui/PriorityControlSet.kt
+++ b/app/src/main/java/org/tasks/ui/PriorityControlSet.kt
@@ -7,7 +7,6 @@ import androidx.compose.material.RadioButton
 import androidx.compose.material.RadioButtonDefaults
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.collectAsState
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.Modifier
@@ -20,13 +19,14 @@ import com.google.android.material.composethemeadapter.MdcTheme
 import com.todoroo.astrid.data.Task
 import dagger.hilt.android.AndroidEntryPoint
 import org.tasks.R
+import org.tasks.compose.collectAsStateLifecycleAware
 
 @AndroidEntryPoint
 class PriorityControlSet : TaskEditControlComposeFragment() {
 
     @Composable
     override fun Body() {
-        val priority = viewModel.priority.collectAsState()
+        val priority = viewModel.priority.collectAsStateLifecycleAware()
         PriorityRow(
             selected = priority.value,
             onClick = { viewModel.priority.value = it })