From 1f8d786d054bcad6cf123f145a91a823cea2246e Mon Sep 17 00:00:00 2001 From: GG Bond Date: Sat, 20 Apr 2024 17:33:06 +0800 Subject: [PATCH] Simplify to use Modifier.offset --- .../kotlin/com/hippo/ehviewer/ui/main/FabLayout.kt | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/app/src/main/kotlin/com/hippo/ehviewer/ui/main/FabLayout.kt b/app/src/main/kotlin/com/hippo/ehviewer/ui/main/FabLayout.kt index 5b834baef..7ba53247f 100644 --- a/app/src/main/kotlin/com/hippo/ehviewer/ui/main/FabLayout.kt +++ b/app/src/main/kotlin/com/hippo/ehviewer/ui/main/FabLayout.kt @@ -11,6 +11,7 @@ import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.navigationBarsPadding +import androidx.compose.foundation.layout.offset import androidx.compose.foundation.layout.padding import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.Close @@ -30,7 +31,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.graphicsLayer import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.input.pointer.pointerInput -import androidx.compose.ui.layout.layout +import androidx.compose.ui.unit.IntOffset import androidx.compose.ui.unit.dp import androidx.compose.ui.util.lerp import com.hippo.ehviewer.ui.tools.PredictiveBackEasing @@ -176,12 +177,9 @@ fun FabLayout( onExpandChanged(false) } }, - modifier = Modifier.padding(20.dp).layout { measurable, constraints -> - val placeable = measurable.measure(constraints) - layout(placeable.width, placeable.height) { - val distance = lerp(0, 150 * (size - index) + 50, animatedProgress) - placeable.placeRelative(0, -distance) - } + modifier = Modifier.padding(20.dp).offset { + val distance = lerp(0, 150 * (size - index) + 50, animatedProgress) + IntOffset(0, -distance) }, ) { Icon(imageVector = imageVector, contentDescription = null)