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

Adjust style of the DocumentScreen

Browse Source
This commit is contained in:
Pierre-Yves Nicolas
2025-07-06 11:36:04 +02:00
parent f3cce71891
commit a165563a25
2 changed files with 25 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -7,6 +7,7 @@
/.idea/workspace.xml /.idea/workspace.xml
/.idea/navEditor.xml /.idea/navEditor.xml
/.idea/assetWizardSettings.xml /.idea/assetWizardSettings.xml
/.idea/androidTestResultsUserPreferences.xml
.DS_Store .DS_Store
/build /build
/captures /captures

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

@@ -18,11 +18,14 @@ import android.graphics.Bitmap
import android.graphics.BitmapFactory import android.graphics.BitmapFactory
import androidx.compose.foundation.Image import androidx.compose.foundation.Image
import androidx.compose.foundation.background import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
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.width import androidx.compose.foundation.layout.width
@@ -34,7 +37,6 @@ import androidx.compose.material.icons.filled.PictureAsPdf
import androidx.compose.material.icons.filled.RestartAlt import androidx.compose.material.icons.filled.RestartAlt
import androidx.compose.material.icons.outlined.Delete import androidx.compose.material.icons.outlined.Delete
import androidx.compose.material3.AlertDialog import androidx.compose.material3.AlertDialog
import androidx.compose.material3.BottomAppBar
import androidx.compose.material3.Button import androidx.compose.material3.Button
import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.FilledIconButton import androidx.compose.material3.FilledIconButton
@@ -99,7 +101,7 @@ fun DocumentScreen(
containerColor = MaterialTheme.colorScheme.surfaceContainerHigh, containerColor = MaterialTheme.colorScheme.surfaceContainerHigh,
titleContentColor = MaterialTheme.colorScheme.onSurface, titleContentColor = MaterialTheme.colorScheme.onSurface,
), ),
title = { Text("Finalize document") }, title = { Text("Document") },
navigationIcon = { navigationIcon = {
IconButton(onClick = toCameraScreen) { IconButton(onClick = toCameraScreen) {
Icon(Icons.AutoMirrored.Filled.ArrowBack, contentDescription = "Back") Icon(Icons.AutoMirrored.Filled.ArrowBack, contentDescription = "Back")
@@ -110,24 +112,27 @@ fun DocumentScreen(
bottomBar = { bottomBar = {
Column { Column {
PageList(pageIds, imageLoader, currentPageIndex, toCameraScreen) PageList(pageIds, imageLoader, currentPageIndex, toCameraScreen)
BottomAppBar( Row(
containerColor = MaterialTheme.colorScheme.surfaceContainerHigh, modifier = Modifier
actions = { .fillMaxWidth()
Button(onClick = { showPdfDialog.value = true }) { .background(MaterialTheme.colorScheme.surfaceContainerHigh)
Icon(Icons.Default.PictureAsPdf, contentDescription = "Generate PDF") .padding(start = 8.dp, end = 8.dp, top = 16.dp, bottom = 32.dp),
Spacer(Modifier.width(8.dp)) verticalAlignment = Alignment.CenterVertically,
Text("Generate PDF") horizontalArrangement = Arrangement.End
} ) {
}, Button(onClick = { showPdfDialog.value = true }) {
floatingActionButton = { Icon(Icons.Default.PictureAsPdf, contentDescription = "Generate PDF")
MyIconButton( Spacer(Modifier.width(8.dp))
icon = Icons.Default.RestartAlt, Text("Generate PDF")
contentDescription = "Restart",
onClick = { showNewDocDialog.value = true },
modifier = Modifier.padding(vertical = 8.dp)
)
} }
) Spacer(modifier = Modifier.width(8.dp))
MyIconButton(
icon = Icons.Default.RestartAlt,
contentDescription = "Restart",
onClick = { showNewDocDialog.value = true },
modifier = Modifier.padding(vertical = 8.dp)
)
}
} }
} }
) { padding -> ) { padding ->