From bacc2bc8dc9890fc1935c6635256710d95822969 Mon Sep 17 00:00:00 2001 From: xfy Date: Thu, 14 May 2026 17:53:33 +0800 Subject: [PATCH] Use primaryContainer colors when today is also selected Distinguish the selected-today state from regular selection by using primaryContainer/onPrimaryContainer instead of primary/onPrimary, providing a softer visual treatment for the combined state. Co-Authored-By: Claude Opus 4.7 --- shared/src/commonMain/kotlin/plus/rua/project/ui/DayCell.kt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/shared/src/commonMain/kotlin/plus/rua/project/ui/DayCell.kt b/shared/src/commonMain/kotlin/plus/rua/project/ui/DayCell.kt index 2658e5d..e6e2855 100644 --- a/shared/src/commonMain/kotlin/plus/rua/project/ui/DayCell.kt +++ b/shared/src/commonMain/kotlin/plus/rua/project/ui/DayCell.kt @@ -37,6 +37,7 @@ fun DayCell( modifier: Modifier = Modifier ) { val contentColor = when { + isSelected && isToday -> MaterialTheme.colorScheme.onPrimaryContainer isSelected -> MaterialTheme.colorScheme.onPrimary isToday -> MaterialTheme.colorScheme.primary !isCurrentMonth -> MaterialTheme.colorScheme.onSurface.copy(alpha = 0.38f) @@ -49,6 +50,7 @@ fun DayCell( .clip(CircleShape) .then( when { + isSelected && isToday -> Modifier.background(MaterialTheme.colorScheme.primaryContainer) isSelected -> Modifier.background(MaterialTheme.colorScheme.primary) isToday -> Modifier.border(BorderStroke(1.5.dp, MaterialTheme.colorScheme.primary), CircleShape) else -> Modifier