@@ -48,7 +48,7 @@ import androidx.compose.ui.Modifier
48
48
import androidx.compose.ui.graphics.Brush
49
49
import androidx.compose.ui.graphics.graphicsLayer
50
50
import androidx.compose.ui.layout.Layout
51
- import androidx.compose.ui.platform.AmbientDensity
51
+ import androidx.compose.ui.platform.LocalDensity
52
52
import androidx.compose.ui.res.stringResource
53
53
import androidx.compose.ui.tooling.preview.Preview
54
54
import androidx.compose.ui.unit.Constraints
@@ -213,8 +213,8 @@ private fun Body(
213
213
214
214
@Composable
215
215
private fun Title (snack : Snack , scroll : Float ) {
216
- val maxOffset = with (AmbientDensity .current) { MaxTitleOffset .toPx() }
217
- val minOffset = with (AmbientDensity .current) { MinTitleOffset .toPx() }
216
+ val maxOffset = with (LocalDensity .current) { MaxTitleOffset .toPx() }
217
+ val minOffset = with (LocalDensity .current) { MinTitleOffset .toPx() }
218
218
val offset = (maxOffset - scroll).coerceAtLeast(minOffset)
219
219
Column (
220
220
verticalArrangement = Arrangement .Bottom ,
@@ -256,7 +256,7 @@ private fun Image(
256
256
imageUrl : String ,
257
257
scroll : Float
258
258
) {
259
- val collapseRange = with (AmbientDensity .current) { (MaxTitleOffset - MinTitleOffset ).toPx() }
259
+ val collapseRange = with (LocalDensity .current) { (MaxTitleOffset - MinTitleOffset ).toPx() }
260
260
val collapseFraction = (scroll / collapseRange).coerceIn(0f , 1f )
261
261
262
262
CollapsingImageLayout (
@@ -283,12 +283,12 @@ private fun CollapsingImageLayout(
283
283
) { measurables, constraints ->
284
284
check(measurables.size == 1 )
285
285
286
- val imageMaxSize = min(ExpandedImageSize .toIntPx (), constraints.maxWidth)
287
- val imageMinSize = max(CollapsedImageSize .toIntPx (), constraints.minWidth)
286
+ val imageMaxSize = min(ExpandedImageSize .roundToPx (), constraints.maxWidth)
287
+ val imageMinSize = max(CollapsedImageSize .roundToPx (), constraints.minWidth)
288
288
val imageWidth = lerp(imageMaxSize, imageMinSize, collapseFraction)
289
289
val imagePlaceable = measurables[0 ].measure(Constraints .fixed(imageWidth, imageWidth))
290
290
291
- val imageY = lerp(MinTitleOffset , MinImageOffset , collapseFraction).toIntPx ()
291
+ val imageY = lerp(MinTitleOffset , MinImageOffset , collapseFraction).roundToPx ()
292
292
val imageX = lerp(
293
293
(constraints.maxWidth - imageWidth) / 2 , // centered when expanded
294
294
constraints.maxWidth - imageWidth, // right aligned when collapsed
0 commit comments