cyy/Fairscan_cyy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

DocumentScreen: fix padding of the bottom bar

Browse Source
This commit is contained in:
Pierre-Yves Nicolas
2025-07-16 16:18:33 +02:00
parent 1bc78da999
commit f4840e1ee3
2 changed files with 17 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
app/src/main/java/org/mydomain/myscan/view/DocumentScreen.kt
View File

@@ -36,7 +36,6 @@ import androidx.compose.material.icons.filled.PictureAsPdf
import androidx.compose.material.icons.filled.RestartAlt
import androidx.compose.material.icons.outlined.Delete
import androidx.compose.material3.AlertDialog
import androidx.compose.material3.BottomAppBar
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text
@@ -193,27 +192,23 @@ private fun BottomBar(
showPdfDialog: MutableState<Boolean>,
showNewDocDialog: MutableState<Boolean>,
) {
BottomAppBar (
containerColor = MaterialTheme.colorScheme.surfaceContainerHigh
Row(
modifier = Modifier.fillMaxWidth(),
verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.End
) {
Row(
modifier = Modifier.fillMaxWidth(),
verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.End
) {
MainActionButton(
onClick = { showPdfDialog.value = true },
icon = Icons.Default.PictureAsPdf,
text = stringResource(R.string.export_pdf),
)
Spacer(modifier = Modifier.width(8.dp))
SecondaryActionButton(
icon = Icons.Default.RestartAlt,
contentDescription = stringResource(R.string.restart),
onClick = { showNewDocDialog.value = true },
modifier = Modifier.padding(vertical = 8.dp)
)
}
MainActionButton(
onClick = { showPdfDialog.value = true },
icon = Icons.Default.PictureAsPdf,
text = stringResource(R.string.export_pdf),
)
Spacer(modifier = Modifier.width(8.dp))
SecondaryActionButton(
icon = Icons.Default.RestartAlt,
contentDescription = stringResource(R.string.restart),
onClick = { showNewDocDialog.value = true },
modifier = Modifier.padding(vertical = 8.dp)
)
}
}

2
app/src/main/java/org/mydomain/myscan/view/Scaffold.kt
View File

@@ -125,7 +125,7 @@ fun DocumentBar(
} else {
Row(
modifier = Modifier
.padding(horizontal = 16.dp, vertical = 1.dp)
.padding(horizontal = 8.dp)
.fillMaxWidth(),
verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.SpaceBetween