Fix edge-to-edge insets on camera and crop overlays
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
@@ -13,8 +13,10 @@ import androidx.compose.foundation.layout.Box
|
|||||||
import androidx.compose.foundation.layout.Row
|
import androidx.compose.foundation.layout.Row
|
||||||
import androidx.compose.foundation.layout.fillMaxSize
|
import androidx.compose.foundation.layout.fillMaxSize
|
||||||
import androidx.compose.foundation.layout.fillMaxWidth
|
import androidx.compose.foundation.layout.fillMaxWidth
|
||||||
|
import androidx.compose.foundation.layout.navigationBarsPadding
|
||||||
import androidx.compose.foundation.layout.padding
|
import androidx.compose.foundation.layout.padding
|
||||||
import androidx.compose.foundation.layout.size
|
import androidx.compose.foundation.layout.size
|
||||||
|
import androidx.compose.foundation.layout.statusBarsPadding
|
||||||
import androidx.compose.foundation.shape.CircleShape
|
import androidx.compose.foundation.shape.CircleShape
|
||||||
import androidx.compose.material.icons.Icons
|
import androidx.compose.material.icons.Icons
|
||||||
import androidx.compose.material.icons.filled.Check
|
import androidx.compose.material.icons.filled.Check
|
||||||
@@ -118,7 +120,7 @@ private fun CameraContent(vm: ScanViewModel, navController: androidx.navigation.
|
|||||||
// Top bar: settings.
|
// Top bar: settings.
|
||||||
IconButton(
|
IconButton(
|
||||||
onClick = { navController.navigate(Routes.SETTINGS) },
|
onClick = { navController.navigate(Routes.SETTINGS) },
|
||||||
modifier = Modifier.align(Alignment.TopEnd).padding(8.dp),
|
modifier = Modifier.align(Alignment.TopEnd).statusBarsPadding().padding(8.dp),
|
||||||
) {
|
) {
|
||||||
Icon(Icons.Filled.Settings, contentDescription = "Instellingen", tint = Color.White)
|
Icon(Icons.Filled.Settings, contentDescription = "Instellingen", tint = Color.White)
|
||||||
}
|
}
|
||||||
@@ -129,6 +131,7 @@ private fun CameraContent(vm: ScanViewModel, navController: androidx.navigation.
|
|||||||
.align(Alignment.BottomCenter)
|
.align(Alignment.BottomCenter)
|
||||||
.fillMaxWidth()
|
.fillMaxWidth()
|
||||||
.background(Color(0x66000000))
|
.background(Color(0x66000000))
|
||||||
|
.navigationBarsPadding()
|
||||||
.padding(24.dp),
|
.padding(24.dp),
|
||||||
horizontalArrangement = Arrangement.SpaceBetween,
|
horizontalArrangement = Arrangement.SpaceBetween,
|
||||||
verticalAlignment = Alignment.CenterVertically,
|
verticalAlignment = Alignment.CenterVertically,
|
||||||
|
|||||||
@@ -13,6 +13,7 @@ import androidx.compose.foundation.layout.fillMaxSize
|
|||||||
import androidx.compose.foundation.layout.fillMaxWidth
|
import androidx.compose.foundation.layout.fillMaxWidth
|
||||||
import androidx.compose.foundation.layout.offset
|
import androidx.compose.foundation.layout.offset
|
||||||
import androidx.compose.foundation.layout.padding
|
import androidx.compose.foundation.layout.padding
|
||||||
|
import androidx.compose.foundation.layout.safeDrawingPadding
|
||||||
import androidx.compose.foundation.layout.size
|
import androidx.compose.foundation.layout.size
|
||||||
import androidx.compose.foundation.shape.CircleShape
|
import androidx.compose.foundation.shape.CircleShape
|
||||||
import androidx.compose.material3.Button
|
import androidx.compose.material3.Button
|
||||||
@@ -59,7 +60,7 @@ fun CropScreen(vm: ScanViewModel, navController: NavController, pageId: String)
|
|||||||
var boxSize by remember { mutableStateOf(IntSize.Zero) }
|
var boxSize by remember { mutableStateOf(IntSize.Zero) }
|
||||||
val density = LocalDensity.current
|
val density = LocalDensity.current
|
||||||
|
|
||||||
Column(Modifier.fillMaxSize().background(Color.Black)) {
|
Column(Modifier.fillMaxSize().background(Color.Black).safeDrawingPadding()) {
|
||||||
Box(
|
Box(
|
||||||
modifier = Modifier
|
modifier = Modifier
|
||||||
.weight(1f)
|
.weight(1f)
|
||||||
|
|||||||
Reference in New Issue
Block a user