Priority control set preview

pull/1911/head
Alex Baker 2 years ago
parent 708e2b14e6
commit ba87311759

@ -16,7 +16,7 @@ class PriorityTests : BaseTaskEditViewModelTest() {
fun changePriorityCausesChange() {
setup(TaskMaker.newTask(MakeItEasy.with(TaskMaker.PRIORITY, Task.Priority.HIGH)))
viewModel.priority = Task.Priority.MEDIUM
viewModel.priority.value = Task.Priority.MEDIUM
Assert.assertTrue(viewModel.hasChanges())
}
@ -25,7 +25,7 @@ class PriorityTests : BaseTaskEditViewModelTest() {
fun applyPriorityChange() {
val task = TaskMaker.newTask(MakeItEasy.with(TaskMaker.PRIORITY, Task.Priority.HIGH))
setup(task)
viewModel.priority = Task.Priority.MEDIUM
viewModel.priority.value = Task.Priority.MEDIUM
save()
@ -36,8 +36,8 @@ class PriorityTests : BaseTaskEditViewModelTest() {
fun noChangeWhenRevertingPriority() {
setup(TaskMaker.newTask(MakeItEasy.with(TaskMaker.PRIORITY, Task.Priority.HIGH)))
viewModel.priority = Task.Priority.MEDIUM
viewModel.priority = Task.Priority.HIGH
viewModel.priority.value = Task.Priority.MEDIUM
viewModel.priority.value = Task.Priority.HIGH
Assert.assertFalse(viewModel.hasChanges())
}

@ -33,7 +33,7 @@ class TaskEditViewModelTest : BaseTaskEditViewModelTest() {
fun dontSaveTaskTwice() = runBlocking {
setup(newTask())
viewModel.priority = Task.Priority.HIGH
viewModel.priority.value = Task.Priority.HIGH
assertTrue(save())

@ -29,7 +29,7 @@ class TitleTests : BaseTaskEditViewModelTest() {
val task = newTask()
setup(task)
viewModel.priority = HIGH
viewModel.priority.value = HIGH
save()

@ -1,5 +1,6 @@
package org.tasks.ui
import android.content.res.Configuration
import android.view.ViewGroup
import androidx.compose.foundation.layout.*
import androidx.compose.material.MaterialTheme
@ -9,11 +10,13 @@ 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
import androidx.compose.ui.platform.ComposeView
import androidx.compose.ui.res.colorResource
import androidx.compose.ui.res.dimensionResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import com.google.android.material.composethemeadapter.MdcTheme
import com.todoroo.astrid.data.Task
@ -67,10 +70,9 @@ fun PriorityRow(
style = MaterialTheme.typography.body1,
)
Spacer(modifier = Modifier.weight(1f))
PriorityButton(priority = Task.Priority.HIGH, selected = selected, onClick = onClick)
PriorityButton(priority = Task.Priority.MEDIUM, selected = selected, onClick = onClick)
PriorityButton(priority = Task.Priority.LOW, selected = selected, onClick = onClick)
PriorityButton(priority = Task.Priority.NONE, selected = selected, onClick = onClick)
for (i in Task.Priority.HIGH..Task.Priority.NONE) {
PriorityButton(priority = i, selected = selected, onClick = onClick)
}
}
}
@ -94,4 +96,14 @@ fun PriorityButton(
unselectedColor = color,
),
)
}
@ExperimentalComposeUiApi
@Preview(showBackground = true)
@Preview(showBackground = true, uiMode = Configuration.UI_MODE_NIGHT_YES)
@Composable
fun PriorityPreview() {
MdcTheme {
PriorityRow(selected = Task.Priority.MEDIUM)
}
}
Loading…
Cancel
Save