xfy/yayacal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

年视图切换动画计算移入 graphicsLayer lambda 避免重组

Browse Source 
monthScale/yearScale/targetAlpha 从 composable body 移入 graphicsLayer lambda，
state 读取只触发 draw-phase redraw 而非重组。

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
This commit is contained in:
xfy 2026-05-18 14:58:16 +08:00
parent 1ddba1881b
commit 3b3988251a
1 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
shared/src/commonMain/kotlin/plus/rua/project/ui/CalendarMonthView.kt
View File

@ -137,7 +137,6 @@ fun CalendarMonthView(
} }
val collapseProgress = viewModel.collapseProgress val collapseProgress = viewModel.collapseProgress
val yearProgress = viewModel.yearViewProgress
val headerHeightPx = monthHeaderHeightPx + weekdayHeaderHeightPx val headerHeightPx = monthHeaderHeightPx + weekdayHeaderHeightPx
val rowPaddingPx = with(density) { ROW_PADDING_DP.dp.toPx() }.toInt() val rowPaddingPx = with(density) { ROW_PADDING_DP.dp.toPx() }.toInt()
val cardGapPx = with(density) { val cardGapPx = with(density) {
@ -198,16 +197,6 @@ fun CalendarMonthView(
val anchorPivotX = ((currentMonth - 1) % 3 + 0.5f) / 3f val anchorPivotX = ((currentMonth - 1) % 3 + 0.5f) / 3f
val anchorPivotY = ((currentMonth - 1) / 3 + 0.5f) / 4f val anchorPivotY = ((currentMonth - 1) / 3 + 0.5f) / 4f
// 过渡进度：0=目标视图刚出现，1=目标视图完全到位。
// 月→年时 yearProgress 从 0→1，年→月时从 1→0，因此用 isYearView 同步翻转方向。
val transitionProgress = if (viewModel.isYearView) yearProgress else 1f - yearProgress
val targetAlpha = transitionProgress.coerceIn(0f, 1f)
// 月视图层缩放：从 0.3f（年网格单格大小）放大到 1f
val monthScale = lerp(0.3f, 1f, transitionProgress)
// 年视图层缩放：从 3.3f（月视图被放大到一格那么大的反向比例）缩小到 1f
val yearScale = lerp(3.3f, 1f, transitionProgress)
Box( Box(
modifier = modifier modifier = modifier
.fillMaxSize() .fillMaxSize()
@ -230,9 +219,10 @@ fun CalendarMonthView(
modifier = Modifier modifier = Modifier
.fillMaxSize() .fillMaxSize()
.graphicsLayer { .graphicsLayer {
scaleX = monthScale val progress = if (viewModel.isYearView) viewModel.yearViewProgress else 1f - viewModel.yearViewProgress
scaleY = monthScale scaleX = lerp(0.3f, 1f, progress)
alpha = targetAlpha scaleY = lerp(0.3f, 1f, progress)
alpha = progress.coerceIn(0f, 1f)
transformOrigin = TransformOrigin(anchorPivotX, anchorPivotY) transformOrigin = TransformOrigin(anchorPivotX, anchorPivotY)
} }
) { ) {
@ -338,9 +328,11 @@ fun CalendarMonthView(
modifier = Modifier modifier = Modifier
.fillMaxSize() .fillMaxSize()
.graphicsLayer { .graphicsLayer {
scaleX = yearScale val progress = if (viewModel.isYearView) viewModel.yearViewProgress else 1f - viewModel.yearViewProgress
scaleY = yearScale val scale = lerp(3.3f, 1f, progress)
alpha = targetAlpha scaleX = scale
scaleY = scale
alpha = progress.coerceIn(0f, 1f)
transformOrigin = TransformOrigin(anchorPivotX, anchorPivotY) transformOrigin = TransformOrigin(anchorPivotX, anchorPivotY)
} }
.padding(horizontal = HORIZONTAL_PADDING_DP.dp) .padding(horizontal = HORIZONTAL_PADDING_DP.dp)