From 13360029e17ce97522c1e4c3e4fb52a27ba9d678 Mon Sep 17 00:00:00 2001 From: xfy Date: Fri, 24 Jul 2026 13:18:25 +0800 Subject: [PATCH] fix(ui): animate FAB upward in year view to avoid obscuring october mini month --- .../kotlin/plus/rua/project/ui/CalendarMonthView.kt | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/core/src/main/kotlin/plus/rua/project/ui/CalendarMonthView.kt b/core/src/main/kotlin/plus/rua/project/ui/CalendarMonthView.kt index 4f71968..c535e0b 100644 --- a/core/src/main/kotlin/plus/rua/project/ui/CalendarMonthView.kt +++ b/core/src/main/kotlin/plus/rua/project/ui/CalendarMonthView.kt @@ -25,6 +25,7 @@ import androidx.compose.animation.core.Animatable import androidx.compose.animation.core.FastOutSlowInEasing import androidx.compose.animation.core.LinearOutSlowInEasing import androidx.compose.animation.core.Spring +import androidx.compose.animation.core.animateDpAsState import androidx.compose.animation.core.animateFloatAsState import androidx.compose.animation.core.spring import androidx.compose.animation.core.tween @@ -412,12 +413,18 @@ fun CalendarMonthView( ) } - // FAB 浮动按钮 + // FAB 浮动按钮（年视图下自动上移 110.dp 避免遮挡 10 月网格） + val fabBottomPadding by animateDpAsState( + targetValue = if (isYearView) 110.dp else 32.dp, + animationSpec = spring(stiffness = Spring.StiffnessMediumLow, dampingRatio = Spring.DampingRatioNoBouncy), + label = "fab_bottom_padding" + ) + FloatingActionButton( onClick = { isMenuExpanded = !isMenuExpanded }, modifier = Modifier .align(Alignment.BottomStart) - .padding(start = 24.dp, bottom = 32.dp) + .padding(start = 24.dp, bottom = fabBottomPadding) .testTag("fab_menu"), shape = CircleShape, containerColor = MaterialTheme.colorScheme.primaryContainer, @@ -465,7 +472,7 @@ fun CalendarMonthView( ) + fadeOut(tween(120)), modifier = Modifier .align(Alignment.BottomStart) - .padding(start = 24.dp, bottom = 32.dp + 56.dp + 8.dp) + .padding(start = 24.dp, bottom = fabBottomPadding + 56.dp + 8.dp) ) { Card( shape = RoundedCornerShape(16.dp),