Skip to content

Commit 0c4cefe

Browse files
author
sds100
committed
#37 fix: content padding misaligned the crosshairs and location
Signed-off-by: sds100 <developer.sds100@gmail.com>
1 parent 2749f4a commit 0c4cefe

File tree

1 file changed

+11
-5
lines changed

1 file changed

+11
-5
lines changed

app/src/main/java/com/mapcode/map/MapScreen.kt

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -363,17 +363,22 @@ fun MapWithCrossHairs(
363363
viewModel: MapViewModel,
364364
renderGoogleMaps: Boolean = true
365365
) {
366+
val contentPadding = WindowInsets.statusBars.asPaddingValues()
367+
366368
Box(modifier) {
367369
if (renderGoogleMaps) {
368370
Map(
369371
properties = viewModel.mapProperties,
370372
onCameraMoved = viewModel::onCameraMoved,
371-
cameraPositionState = viewModel.cameraPositionState
373+
cameraPositionState = viewModel.cameraPositionState,
374+
contentPadding = contentPadding
372375
)
373376
}
374377

375378
Icon(
376-
modifier = Modifier.align(Alignment.Center),
379+
modifier = Modifier
380+
.align(Alignment.Center)
381+
.padding(contentPadding),
377382
painter = painterResource(R.drawable.crosshairs),
378383
contentDescription = null,
379384
tint = Color.Black
@@ -389,7 +394,8 @@ fun Map(
389394
modifier: Modifier = Modifier,
390395
properties: MapProperties,
391396
onCameraMoved: (Double, Double, Float) -> Unit,
392-
cameraPositionState: CameraPositionState
397+
cameraPositionState: CameraPositionState,
398+
contentPadding: PaddingValues
393399
) {
394400
LaunchedEffect(cameraPositionState.isMoving) {
395401
if (!cameraPositionState.isMoving) {
@@ -435,7 +441,7 @@ fun Map(
435441
)
436442
}
437443
},
438-
contentPadding = WindowInsets.statusBars.asPaddingValues()
444+
contentPadding = contentPadding
439445
)
440446
}
441447

@@ -718,7 +724,7 @@ fun MapScreen(
718724
fun VerticalInfoAreaLayout(viewModel: MapViewModel, scaffoldState: ScaffoldState, renderGoogleMaps: Boolean) {
719725
Row(Modifier.fillMaxSize(), horizontalArrangement = Arrangement.End) {
720726
Box(Modifier.weight(1f)) {
721-
MapWithCrossHairs(Modifier.fillMaxSize(), viewModel)
727+
MapWithCrossHairs(Modifier.fillMaxSize(), viewModel, renderGoogleMaps = renderGoogleMaps)
722728

723729
MapControls(
724730
Modifier

0 commit comments

Comments
 (0)