diff --git a/core/src/main/kotlin/plus/rua/project/ui/CalendarMonthPage.kt b/core/src/main/kotlin/plus/rua/project/ui/CalendarMonthPage.kt index db44186..60683e1 100644 --- a/core/src/main/kotlin/plus/rua/project/ui/CalendarMonthPage.kt +++ b/core/src/main/kotlin/plus/rua/project/ui/CalendarMonthPage.kt @@ -15,8 +15,7 @@ import androidx.compose.runtime.produceState import androidx.compose.runtime.remember import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clipToBounds -import androidx.compose.ui.draw.alpha -import androidx.compose.foundation.layout.offset +import androidx.compose.ui.graphics.graphicsLayer import androidx.compose.ui.layout.onSizeChanged import androidx.compose.ui.platform.LocalDensity import androidx.compose.ui.unit.dp @@ -216,8 +215,10 @@ private fun WeekRow( if (isAnchor && phase1 >= 1f) Modifier.background(MaterialTheme.colorScheme.surface) else Modifier ) - .offset(y = with(density) { yOffsetPx.toDp() }) - .alpha(rowAlpha) + .graphicsLayer { + translationY = yOffsetPx + alpha = rowAlpha + } .then( if (weekIndex == 0 && rowHeightPx == 0) { Modifier.onSizeChanged { size -> 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..fb60809 100644 --- a/core/src/main/kotlin/plus/rua/project/ui/CalendarMonthView.kt +++ b/core/src/main/kotlin/plus/rua/project/ui/CalendarMonthView.kt @@ -720,9 +720,10 @@ private fun BottomCardArea( composeTraceEndSection() }, dragRangePx = dragRangePx, - modifier = modifier - .offset(y = with(density) { (slideProgress * 300).dp }) - .alpha(1f - slideProgress) + modifier = modifier.graphicsLayer { + translationY = (slideProgress * 300).dp.toPx() + alpha = 1f - slideProgress + } ) } }