From 62924eff3e2b9cf6a3dd8f247c4f04b161bf6176 Mon Sep 17 00:00:00 2001 From: xfy Date: Mon, 18 May 2026 13:29:25 +0800 Subject: [PATCH] =?UTF-8?q?FAB=20=E5=9B=BA=E5=AE=9A=E5=9C=A8=E5=B1=8F?= =?UTF-8?q?=E5=B9=95=E5=B7=A6=E4=B8=8B=E8=A7=92=EF=BC=8C=E4=B8=8D=E5=86=8D?= =?UTF-8?q?=E8=B7=9F=E9=9A=8F=20BottomCard=20=E9=AB=98=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Claude Opus 4.7 --- .../plus/rua/project/ui/CalendarMonthView.kt | 28 +++++++------------ 1 file changed, 10 insertions(+), 18 deletions(-) diff --git a/shared/src/commonMain/kotlin/plus/rua/project/ui/CalendarMonthView.kt b/shared/src/commonMain/kotlin/plus/rua/project/ui/CalendarMonthView.kt index 756f8b8..2506784 100644 --- a/shared/src/commonMain/kotlin/plus/rua/project/ui/CalendarMonthView.kt +++ b/shared/src/commonMain/kotlin/plus/rua/project/ui/CalendarMonthView.kt @@ -375,20 +375,15 @@ fun CalendarMonthView( } // FAB 浮动按钮 - if (cardHeightPx > 0) { - FloatingActionButton( - onClick = { isMenuExpanded = !isMenuExpanded }, - modifier = Modifier - .align(Alignment.BottomStart) - .padding( - start = 16.dp, - bottom = with(density) { cardHeightPx.toDp() } + 16.dp - ), - containerColor = MaterialTheme.colorScheme.primaryContainer, - contentColor = MaterialTheme.colorScheme.onPrimaryContainer - ) { - MenuIcon() - } + FloatingActionButton( + onClick = { isMenuExpanded = !isMenuExpanded }, + modifier = Modifier + .align(Alignment.BottomStart) + .padding(start = 24.dp, bottom = 32.dp), + containerColor = MaterialTheme.colorScheme.primaryContainer, + contentColor = MaterialTheme.colorScheme.onPrimaryContainer + ) { + MenuIcon() } // Scrim：菜单展开时覆盖全屏，点击关闭 @@ -422,10 +417,7 @@ fun CalendarMonthView( ) + fadeOut(tween(100)), modifier = Modifier .align(Alignment.BottomStart) - .padding( - start = 16.dp, - bottom = with(density) { cardHeightPx.toDp() } + 16.dp + 56.dp + 8.dp - ) + .padding(start = 24.dp, bottom = 32.dp + 56.dp + 8.dp) ) { Card( shape = RoundedCornerShape(12.dp),