Apply alpha to hidden tasks on Android Wear

pull/3074/head
Alex Baker 1 year ago
parent 1a346d5922
commit 7c23d48117

@ -13,6 +13,7 @@ import org.tasks.GrpcProto.ToggleGroupRequest
import org.tasks.GrpcProto.ToggleGroupResponse import org.tasks.GrpcProto.ToggleGroupResponse
import org.tasks.WearServiceGrpcKt import org.tasks.WearServiceGrpcKt
import org.tasks.copy import org.tasks.copy
import org.tasks.data.isHidden
import org.tasks.filters.AstridOrderingFilter import org.tasks.filters.AstridOrderingFilter
import org.tasks.filters.MyTasksFilter import org.tasks.filters.MyTasksFilter
import org.tasks.preferences.Preferences import org.tasks.preferences.Preferences
@ -64,6 +65,7 @@ class WearService(
.setId(item.task.id) .setId(item.task.id)
.setPriority(item.task.priority) .setPriority(item.task.priority)
.setCompleted(item.task.isCompleted) .setCompleted(item.task.isCompleted)
.setHidden(item.task.task.isHidden)
.apply { .apply {
if (item.task.title != null) { if (item.task.title != null) {
setTitle(item.task.title) setTitle(item.task.title)

@ -18,6 +18,7 @@ message UiItem {
uint32 priority = 5; uint32 priority = 5;
bool repeating = 6; bool repeating = 6;
bool collapsed = 7; bool collapsed = 7;
bool hidden = 8;
} }
message Tasks { message Tasks {

@ -23,6 +23,7 @@ import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue import androidx.compose.runtime.getValue
import androidx.compose.ui.Alignment import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.alpha
import androidx.compose.ui.draw.clip import androidx.compose.ui.draw.clip
import androidx.compose.ui.draw.rotate import androidx.compose.ui.draw.rotate
import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.Color
@ -94,6 +95,7 @@ fun TaskListScreen(
GrpcProto.UiItemType.Task -> GrpcProto.UiItemType.Task ->
TaskCard( TaskCard(
text = item.title, text = item.title,
hidden = item.hidden,
icon = { icon = {
Button( Button(
onClick = { onComplete(item.id, !item.completed) }, onClick = { onComplete(item.id, !item.completed) },
@ -177,6 +179,7 @@ private fun Chevron(collapsed: Boolean) {
@Composable @Composable
fun TaskCard( fun TaskCard(
text: String, text: String,
hidden: Boolean = false,
icon: @Composable () -> Unit = {}, icon: @Composable () -> Unit = {},
backgroundColor: Color = MaterialTheme.colors.surface, backgroundColor: Color = MaterialTheme.colors.surface,
contentColor: Color = MaterialTheme.colors.onSurface, contentColor: Color = MaterialTheme.colors.onSurface,
@ -196,6 +199,7 @@ fun TaskCard(
maxLines = 2, maxLines = 2,
overflow = TextOverflow.Ellipsis, overflow = TextOverflow.Ellipsis,
color = contentColor, color = contentColor,
modifier = Modifier.alpha(if (hidden) .6f else 1f)
) )
} }
} }
@ -237,7 +241,7 @@ fun TitleHeader(
) { ) {
Icon( Icon(
imageVector = Icons.Outlined.Add, imageVector = Icons.Outlined.Add,
contentDescription = org.jetbrains.compose.resources.stringResource(Res.string.add_task), contentDescription = stringResource(Res.string.add_task),
) )
} }
} }

Loading…
Cancel
Save