From 84a1ea9f275eb5c001b0ccc846b852cbc7e88a1b Mon Sep 17 00:00:00 2001 From: b-dev-mobile Date: Fri, 10 Jul 2026 03:22:53 +0000 Subject: [PATCH] =?UTF-8?q?design(calendar):=20=D0=B4=D0=B5=D1=82=D0=B0?= =?UTF-8?q?=D0=BB=D1=8C=20=D1=81=D0=BE=D0=B1=D1=8B=D1=82=D0=B8=D1=8F=20?= =?UTF-8?q?=D0=B8=20=D0=BF=D0=B8=D0=BB=D1=8E=D0=BB=D0=B8=20=D0=BF=D0=BE=20?= =?UTF-8?q?=D0=B6=D0=B8=D0=B2=D0=BE=D0=B9=20=D1=82=D0=B5=D0=BC=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Заголовок события 18/600 (модалки темы); пилюля события в неделе — #ECF9DE с рамкой #70B62B r4 (был полупрозрачный зелёный r6). Лейблы детали уже серые, кнопки — дизайн-система (градиентные пилюли) — совпадали. Наш bottom-sheet и список дня — осознанная моб. адаптация. Co-Authored-By: Claude Fable 5 --- .../f7cloud/feature/calendar/CalendarComponents.kt | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/feature/calendar/src/main/java/ru/forbion/f7cloud/feature/calendar/CalendarComponents.kt b/feature/calendar/src/main/java/ru/forbion/f7cloud/feature/calendar/CalendarComponents.kt index dc4a3c0..ffd62f8 100644 --- a/feature/calendar/src/main/java/ru/forbion/f7cloud/feature/calendar/CalendarComponents.kt +++ b/feature/calendar/src/main/java/ru/forbion/f7cloud/feature/calendar/CalendarComponents.kt @@ -829,12 +829,14 @@ fun CalendarEventRow( @Composable private fun CalendarEventChip(event: CalendarEventItem, onClick: () -> Unit) { + // Живая тема: пилюля события — #ECF9DE с рамкой #70B62B, r4, текст 12/16 Text( event.summary, modifier = Modifier .fillMaxWidth() - .clip(RoundedCornerShape(6.dp)) - .background(F7Colors.Primary.copy(alpha = 0.15f)) + .clip(RoundedCornerShape(4.dp)) + .background(F7Colors.PrimaryLight) + .border(1.dp, F7Colors.Primary, RoundedCornerShape(4.dp)) .clickable(onClick = onClick) .padding(horizontal = 6.dp, vertical = 4.dp), style = MaterialTheme.typography.labelSmall, @@ -1093,7 +1095,13 @@ fun CalendarEventDetailSheet( .padding(bottom = 28.dp), verticalArrangement = Arrangement.spacedBy(12.dp), ) { - Text(event.summary, style = MaterialTheme.typography.titleLarge, fontWeight = FontWeight.Bold) + // Живая тема: заголовки модалок 18/600 + Text( + event.summary, + style = MaterialTheme.typography.titleMedium.copy(fontSize = 18.sp), + fontWeight = FontWeight.SemiBold, + color = F7Colors.TextPrimary, + ) CalendarDetailRow( iconUrl = "$base/themes/forbion/images/calendar/event-clock.svg", label = "Время",