From 37af18ad8d799866138a71de9ab3ce9a17a879c7 Mon Sep 17 00:00:00 2001
From: xfy <i@rua.plus>
Date: Mon, 18 May 2026 11:49:45 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E7=8E=B0=E7=BC=A9=E6=94=BE=E5=8A=A8?=
 =?UTF-8?q?=E7=94=BB=E8=8F=9C=E5=8D=95=E5=92=8C=20Scrim=20=E5=85=B3?=
 =?UTF-8?q?=E9=97=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
---
 .../plus/rua/project/ui/CalendarMonthView.kt  | 78 +++++++++++--------
 1 file changed, 45 insertions(+), 33 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 f3325c9..31db49e 100644
--- a/shared/src/commonMain/kotlin/plus/rua/project/ui/CalendarMonthView.kt
+++ b/shared/src/commonMain/kotlin/plus/rua/project/ui/CalendarMonthView.kt
@@ -5,6 +5,7 @@ import androidx.compose.animation.fadeIn
 import androidx.compose.animation.fadeOut
 import androidx.compose.animation.scaleIn
 import androidx.compose.animation.scaleOut
+import androidx.compose.animation.core.FastOutSlowInEasing
 import androidx.compose.animation.core.tween
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
@@ -18,6 +19,8 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.statusBarsPadding
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.Card
+import androidx.compose.material3.CardDefaults
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.foundation.pager.HorizontalPager
@@ -368,7 +371,11 @@ fun CalendarMonthView(
         }
 
         // Scrim：菜单展开时覆盖全屏，点击关闭
-        if (isMenuExpanded) {
+        AnimatedVisibility(
+            visible = isMenuExpanded,
+            enter = fadeIn(tween(300)),
+            exit = fadeOut(tween(200))
+        ) {
             Box(
                 modifier = Modifier
                     .fillMaxSize()
@@ -383,43 +390,45 @@ fun CalendarMonthView(
         AnimatedVisibility(
             visible = isMenuExpanded,
             enter = scaleIn(
-                initialScale = 0.6f,
-                animationSpec = tween(150),
+                initialScale = 0.2f,
+                animationSpec = tween(durationMillis = 300, easing = FastOutSlowInEasing),
                 transformOrigin = TransformOrigin(0f, 1f)
-            ) + fadeIn(tween(150)),
+            ) + fadeIn(tween(300)),
             exit = scaleOut(
-                targetScale = 0.6f,
-                animationSpec = tween(100),
+                targetScale = 0.2f,
+                animationSpec = tween(durationMillis = 200, easing = FastOutSlowInEasing),
                 transformOrigin = TransformOrigin(0f, 1f)
-            ) + fadeOut(tween(100)),
+            ) + fadeOut(tween(200)),
             modifier = Modifier
                 .align(Alignment.BottomStart)
-                .padding(start = 16.dp, bottom = with(density) { cardHeightPx.toDp() } + 72.dp)
+                .padding(
+                    start = 16.dp,
+                    bottom = with(density) { cardHeightPx.toDp() } + 16.dp + 56.dp + 8.dp
+                )
         ) {
-            Column(
-                modifier = Modifier
-                    .background(
-                        MaterialTheme.colorScheme.surfaceContainerHigh,
-                        RoundedCornerShape(12.dp)
-                    )
-                    .width(140.dp)
+            Card(
+                shape = RoundedCornerShape(12.dp),
+                elevation = CardDefaults.cardElevation(defaultElevation = 3.dp),
+                colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.surfaceContainerHigh)
             ) {
-                MenuItem(
-                    text = "月视图",
-                    selected = !viewModel.isYearView,
-                    onClick = {
-                        isMenuExpanded = false
-                        if (viewModel.isYearView) viewModel.toggleYearView()
-                    }
-                )
-                MenuItem(
-                    text = "年视图",
-                    selected = viewModel.isYearView,
-                    onClick = {
-                        isMenuExpanded = false
-                        if (!viewModel.isYearView) viewModel.toggleYearView()
-                    }
-                )
+                Column(modifier = Modifier.width(140.dp)) {
+                    MenuItem(
+                        text = "月视图",
+                        selected = !viewModel.isYearView,
+                        onClick = {
+                            isMenuExpanded = false
+                            if (viewModel.isYearView) viewModel.toggleYearView()
+                        }
+                    )
+                    MenuItem(
+                        text = "年视图",
+                        selected = viewModel.isYearView,
+                        onClick = {
+                            isMenuExpanded = false
+                            if (!viewModel.isYearView) viewModel.toggleYearView()
+                        }
+                    )
+                }
             }
         }
     }
@@ -436,8 +445,11 @@ private fun MenuItem(
         modifier = modifier
             .fillMaxWidth()
             .clickable(onClick = onClick)
-            .background(
-                if (selected) MaterialTheme.colorScheme.primaryContainer else Color.Transparent
+            .then(
+                if (selected) Modifier.background(
+                    MaterialTheme.colorScheme.primaryContainer,
+                    RoundedCornerShape(8.dp)
+                ) else Modifier
             )
             .padding(horizontal = 16.dp, vertical = 12.dp)
     ) {