From 380056bf4895cf5be2118fb6a887760b0ba8e436 Mon Sep 17 00:00:00 2001 From: xfy Date: Wed, 20 May 2026 01:11:24 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=BA=95=E9=83=A8=E5=8D=A1=E7=89=87?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E7=8F=AD=E6=AC=A1=E7=8A=B6=E6=80=81=E6=8F=90?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 根据选中日期的班次类型(WORK/OFF)在底部卡片展示对应提示语。 Co-Authored-By: Claude Opus 4.7 (1M context) --- .../kotlin/plus/rua/project/ui/BottomCard.kt | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/shared/src/commonMain/kotlin/plus/rua/project/ui/BottomCard.kt b/shared/src/commonMain/kotlin/plus/rua/project/ui/BottomCard.kt index 6f9a474..9946ec5 100644 --- a/shared/src/commonMain/kotlin/plus/rua/project/ui/BottomCard.kt +++ b/shared/src/commonMain/kotlin/plus/rua/project/ui/BottomCard.kt @@ -26,6 +26,7 @@ import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import kotlinx.datetime.LocalDate import plus.rua.project.CalendarViewModel +import plus.rua.project.ShiftKind /** * 底部卡片,折叠状态下支持垂直拖拽触发折叠动画。 @@ -55,6 +56,11 @@ fun BottomCard( @Suppress("DEPRECATION") // monthNumber 无替代 API,kotlinx-datetime 尚未提供新接口 val solarDesc = "${selectedDate.monthNumber}月${selectedDate.day}日" val lunarDesc = formatLunarDate(selectedDate) + val shiftMessage = when (viewModel.shiftKindAt(selectedDate)) { + ShiftKind.WORK -> "小小上班,轻松拿下!" + ShiftKind.OFF -> "耶耶耶,美美休息!" + null -> null + } Surface( modifier = modifier @@ -147,6 +153,17 @@ fun BottomCard( fontSize = 14.sp ) } + if (shiftMessage != null) { + Text( + text = shiftMessage, + modifier = Modifier + .align(Alignment.CenterHorizontally) + .padding(top = 12.dp, bottom = 6.dp), + style = MaterialTheme.typography.bodyMedium, + color = MaterialTheme.colorScheme.onSurfaceVariant, + fontSize = 14.sp + ) + } Spacer(modifier = Modifier.height(12.dp)) AnimatedGif( modifier = Modifier