diff --git a/app/src/main/java/org/mydomain/myscan/view/DocumentScreen.kt b/app/src/main/java/org/mydomain/myscan/view/DocumentScreen.kt index 2fc9ef4..94bfb67 100644 --- a/app/src/main/java/org/mydomain/myscan/view/DocumentScreen.kt +++ b/app/src/main/java/org/mydomain/myscan/view/DocumentScreen.kt @@ -112,27 +112,7 @@ fun DocumentScreen( bottomBar = { Column { PageList(pageIds, imageLoader, currentPageIndex, toCameraScreen) - Row( - modifier = Modifier - .fillMaxWidth() - .background(MaterialTheme.colorScheme.surfaceContainerHigh) - .padding(start = 8.dp, end = 8.dp, top = 16.dp, bottom = 32.dp), - verticalAlignment = Alignment.CenterVertically, - horizontalArrangement = Arrangement.End - ) { - Button(onClick = { showPdfDialog.value = true }) { - Icon(Icons.Default.PictureAsPdf, contentDescription = "Generate PDF") - Spacer(Modifier.width(8.dp)) - Text("Generate PDF") - } - Spacer(modifier = Modifier.width(8.dp)) - MyIconButton( - icon = Icons.Default.RestartAlt, - contentDescription = "Restart", - onClick = { showNewDocDialog.value = true }, - modifier = Modifier.padding(vertical = 8.dp) - ) - } + BottomBar(showPdfDialog, showNewDocDialog) } } ) { padding -> @@ -236,6 +216,34 @@ private fun PageList( } } +@Composable +private fun BottomBar( + showPdfDialog: MutableState, + showNewDocDialog: MutableState, +) { + Row( + modifier = Modifier + .fillMaxWidth() + .background(MaterialTheme.colorScheme.surfaceContainerHigh) + .padding(start = 8.dp, end = 8.dp, top = 16.dp, bottom = 32.dp), + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.End + ) { + Button(onClick = { showPdfDialog.value = true }) { + Icon(Icons.Default.PictureAsPdf, contentDescription = "Generate PDF") + Spacer(Modifier.width(8.dp)) + Text("Generate PDF") + } + Spacer(modifier = Modifier.width(8.dp)) + MyIconButton( + icon = Icons.Default.RestartAlt, + contentDescription = "Restart", + onClick = { showNewDocDialog.value = true }, + modifier = Modifier.padding(vertical = 8.dp) + ) + } +} + @Composable fun NewDocumentDialog(onConfirm: () -> Unit, showDialog: MutableState) { AlertDialog( @@ -281,7 +289,6 @@ fun MyIconButton( } } - @Composable @Preview fun DocumentScreenPreview() {