refactor: 优化已完成待办显示效果

app/build.gradle.kts

@@ -38,7 +38,7 @@ android {
         applicationId = "cn.super12138.todo"
         minSdk = 24
         targetSdk = 36
-        versionCode = 981
+        versionCode = 985
         versionName = "2.3.3"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"

app/src/main/kotlin/cn/super12138/todo/ui/pages/tasks/components/TodoCard.kt

@@ -21,22 +21,25 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.material3.Badge
 import androidx.compose.material3.ButtonShapes
+import androidx.compose.material3.CardDefaults
 import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
+import androidx.compose.material3.LocalContentColor
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.material3.contentColorFor
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
+import androidx.compose.ui.draw.drawBehind
 import androidx.compose.ui.platform.LocalView
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.style.TextDecoration
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import cn.super12138.todo.R
@@ -45,6 +48,8 @@ import cn.super12138.todo.ui.TodoDefaults
 import cn.super12138.todo.ui.theme.shapeByInteraction
 import cn.super12138.todo.utils.VibrationUtils
 import cn.super12138.todo.utils.containerColor
+import cn.super12138.todo.utils.disabledContainerColor
+import cn.super12138.todo.utils.disabledContentColor
 
 @OptIn(ExperimentalMaterial3ExpressiveApi::class)
 @Composable
@@ -63,7 +68,8 @@ fun TodoCard(
 ) {
     val view = LocalView.current
     // TODO: 滑动删除
-    val animatedContainerColor by animateColorAsState(if (selected) MaterialTheme.colorScheme.secondaryContainer else TodoDefaults.ContainerColor)
+    val cardColors = CardDefaults.cardColors(containerColor = TodoDefaults.ContainerColor)
+    val animatedContainerColor by animateColorAsState(targetValue = if (selected) MaterialTheme.colorScheme.secondaryContainer else if (completed) cardColors.disabledContainerColor else cardColors.containerColor)
 
     val interactionSource = remember { MutableInteractionSource() }
     val pressed by interactionSource.collectIsPressedAsState()
@@ -89,7 +95,9 @@ fun TodoCard(
                 // 因为 combinedClickable 在更新的 Compose 里已经处理好了触感反馈
                 onLongClick = onCardLongClick
             )
-            .background(animatedContainerColor)
+            .drawBehind {
+                drawRect(animatedContainerColor)
+            }
             .padding(horizontal = TodoDefaults.screenHorizontalPadding)
     ) {
         AnimatedVisibility(
@@ -125,33 +133,36 @@ fun TodoCard(
                 .weight(1f)
                 .fillMaxSize()
         ) {
-            Text(
+            CompositionLocalProvider(
-                text = content,
+                LocalContentColor provides if (completed) cardColors.disabledContentColor else cardColors.contentColor,
-                style = MaterialTheme.typography.titleLarge,
-                maxLines = 1,
-                overflow = TextOverflow.Ellipsis,
-                textDecoration = if (completed) TextDecoration.LineThrough else TextDecoration.None,
-                // modifier = Modifier.basicMarquee()
-            )
-
-            Row(
-                verticalAlignment = Alignment.CenterVertically,
-                horizontalArrangement = Arrangement.spacedBy(5.dp)
             ) {
-                Badge(containerColor = MaterialTheme.colorScheme.primary) {
+                Text(
+                    text = content,
+                    style = MaterialTheme.typography.titleLarge,
+                    maxLines = 1,
+                    overflow = TextOverflow.Ellipsis,
+                    // modifier = Modifier.basicMarquee()
+                )
+
+                Row(
+                    verticalAlignment = Alignment.CenterVertically,
+                    horizontalArrangement = Arrangement.spacedBy(5.dp)
+                ) {
+                    Badge(containerColor = if (completed) disabledContainerColor() else MaterialTheme.colorScheme.primary) {
+                        Text(
+                            text = category.ifEmpty { stringResource(R.string.tip_default_category) },
+                            style = MaterialTheme.typography.labelMedium,
+                            maxLines = 1
+                        )
+                    }
+
                     Text(
-                        text = category.ifEmpty { stringResource(R.string.tip_default_category) },
+                        text = stringResource(priority.nameRes),
-                        style = MaterialTheme.typography.labelMedium,
+                        style = MaterialTheme.typography.labelMedium.copy(
-                        textDecoration = if (completed) TextDecoration.LineThrough else TextDecoration.None,
+                            color = if (completed) disabledContentColor() else priority.containerColor()
-                        maxLines = 1
+                        ),
                     )
                 }
-
-                Text(
-                    text = stringResource(priority.nameRes),
-                    style = MaterialTheme.typography.labelMedium.copy(priority.containerColor()),
-                    textDecoration = if (completed) TextDecoration.LineThrough else TextDecoration.None,
-                )
             }
         }
 

app/src/main/kotlin/cn/super12138/todo/utils/TodoExt.kt

@@ -2,8 +2,11 @@ package cn.super12138.todo.utils
 
 import android.content.Context
 import androidx.compose.foundation.shape.CornerBasedShape
+import androidx.compose.material3.LocalContentColor
+import androidx.compose.material3.LocalTextStyle
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.Stable
 import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.geometry.Size
@@ -11,12 +14,14 @@ import androidx.compose.ui.graphics.BlendMode
 import androidx.compose.ui.graphics.Brush
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.drawscope.ContentDrawScope
+import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.unit.Dp
 import cn.super12138.todo.R
 import cn.super12138.todo.logic.model.Priority
 import java.text.SimpleDateFormat
 import java.util.Calendar
 import java.util.Date
+import java.util.Locale
 import kotlin.time.Duration.Companion.days
 import kotlin.time.Duration.Companion.milliseconds
 
@@ -86,7 +91,7 @@ fun ContentDrawScope.drawFadedEdge(
 fun Long?.toLocalDateString(): String {
     if (this == null) return ""
     val date = Date(this)
-    val format = SimpleDateFormat("yyyy-MM-dd", java.util.Locale.getDefault())
+    val format = SimpleDateFormat("yyyy-MM-dd", Locale.getDefault())
     return format.format(date)
 }
 
@@ -131,4 +136,10 @@ fun Long?.toRelativeTimeString(context: Context): String {
             else -> context.getString(R.string.time_today)
         }
     }
-}
+}
+
+@Composable
+fun disabledContentColor(alpha: Float = 0.38f): Color = MaterialTheme.colorScheme.onSurface.copy(alpha = alpha)
+
+@Composable
+fun disabledContainerColor(alpha: Float = 0.12f): Color = MaterialTheme.colorScheme.onSurface.copy(alpha = alpha)