Update collect method

pull/1917/head
Alex Baker 2 years ago
parent b455e531d3
commit 3a93af4b0a

@ -6,13 +6,13 @@ import androidx.compose.foundation.layout.padding
import androidx.compose.material.MaterialTheme import androidx.compose.material.MaterialTheme
import androidx.compose.material.Text import androidx.compose.material.Text
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.runtime.collectAsState
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.res.colorResource import androidx.compose.ui.res.colorResource
import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import dagger.hilt.android.AndroidEntryPoint import dagger.hilt.android.AndroidEntryPoint
import org.tasks.R import org.tasks.R
import org.tasks.compose.collectAsStateLifecycleAware
import org.tasks.data.TagData import org.tasks.data.TagData
import org.tasks.tags.TagPickerActivity import org.tasks.tags.TagPickerActivity
import org.tasks.ui.ChipGroup import org.tasks.ui.ChipGroup
@ -32,7 +32,7 @@ class TagsControlSet : TaskEditControlComposeFragment() {
@Composable @Composable
override fun Body() { 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)) { ChipGroup(modifier = Modifier.padding(top = 20.dp, bottom = 20.dp, end = 16.dp)) {
if (tags.value.isEmpty()) { if (tags.value.isEmpty()) {
Text( Text(

@ -4,7 +4,6 @@ import android.app.Activity
import android.content.Intent import android.content.Intent
import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.padding
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.runtime.collectAsState
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import com.todoroo.astrid.api.CaldavFilter import com.todoroo.astrid.api.CaldavFilter
@ -13,6 +12,7 @@ import com.todoroo.astrid.api.GtasksFilter
import dagger.hilt.android.AndroidEntryPoint import dagger.hilt.android.AndroidEntryPoint
import org.tasks.R import org.tasks.R
import org.tasks.activities.ListPicker import org.tasks.activities.ListPicker
import org.tasks.compose.collectAsStateLifecycleAware
import javax.inject.Inject import javax.inject.Inject
@AndroidEntryPoint @AndroidEntryPoint
@ -21,7 +21,7 @@ class ListFragment : TaskEditControlComposeFragment() {
@Composable @Composable
override fun Body() { override fun Body() {
val list = viewModel.selectedList.collectAsState() val list = viewModel.selectedList.collectAsStateLifecycleAware()
val selectedList = list.value ?: return val selectedList = list.value ?: return
ChipGroup(modifier = Modifier.padding(vertical = 20.dp)) { ChipGroup(modifier = Modifier.padding(vertical = 20.dp)) {
chipProvider.FilterChip( chipProvider.FilterChip(

@ -7,7 +7,6 @@ import androidx.compose.material.RadioButton
import androidx.compose.material.RadioButtonDefaults import androidx.compose.material.RadioButtonDefaults
import androidx.compose.material.Text import androidx.compose.material.Text
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.runtime.collectAsState
import androidx.compose.ui.Alignment import androidx.compose.ui.Alignment
import androidx.compose.ui.ExperimentalComposeUiApi import androidx.compose.ui.ExperimentalComposeUiApi
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
@ -20,13 +19,14 @@ import com.google.android.material.composethemeadapter.MdcTheme
import com.todoroo.astrid.data.Task import com.todoroo.astrid.data.Task
import dagger.hilt.android.AndroidEntryPoint import dagger.hilt.android.AndroidEntryPoint
import org.tasks.R import org.tasks.R
import org.tasks.compose.collectAsStateLifecycleAware
@AndroidEntryPoint @AndroidEntryPoint
class PriorityControlSet : TaskEditControlComposeFragment() { class PriorityControlSet : TaskEditControlComposeFragment() {
@Composable @Composable
override fun Body() { override fun Body() {
val priority = viewModel.priority.collectAsState() val priority = viewModel.priority.collectAsStateLifecycleAware()
PriorityRow( PriorityRow(
selected = priority.value, selected = priority.value,
onClick = { viewModel.priority.value = it }) onClick = { viewModel.priority.value = it })

Loading…
Cancel
Save