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

Export screen: move filename field close to buttons

Browse Source
This commit is contained in:
Pierre-Yves Nicolas
2026-02-01 18:10:36 +01:00
parent a4822d3c9e
commit 0c8974af9a
1 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
app/src/main/java/org/fairscan/app/ui/screens/export/ExportScreen.kt
View File

@@ -37,7 +37,9 @@ import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.width
import androidx.compose.foundation.layout.widthIn
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.foundation.verticalScroll
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.automirrored.filled.OpenInNew
import androidx.compose.material.icons.filled.Clear
@@ -191,15 +193,15 @@ fun ExportScreen(
val containerModifier = Modifier
.padding(innerPadding)
.padding(16.dp)
val onThumbnailClick = navigation.toDocumentScreen
if (!isLandscape(LocalConfiguration.current)) {
Column(
modifier = containerModifier.fillMaxSize(),
verticalArrangement = Arrangement.spacedBy(16.dp)
) {
TextFieldAndPdfInfos(filename, onFilenameChange, uiState, currentDocument, onOpen,
onThumbnailClick = navigation.toDocumentScreen)
PdfInfosAndResultBar(uiState, currentDocument, onOpen, onThumbnailClick)
Spacer(Modifier.weight(1f)) // push buttons down
MainActions(uiState, onShare, onSave, onCloseScan)
MainActions(filename, onFilenameChange, uiState, onShare, onSave, onCloseScan)
}
} else {
Row(
@@ -207,14 +209,14 @@ fun ExportScreen(
horizontalArrangement = Arrangement.spacedBy(16.dp)
) {
Column(
modifier = Modifier.weight(1f),
modifier = Modifier.weight(1f)
.verticalScroll(rememberScrollState()),
verticalArrangement = Arrangement.spacedBy(16.dp)
) {
TextFieldAndPdfInfos(filename, onFilenameChange, uiState, currentDocument, onOpen,
onThumbnailClick = navigation.toDocumentScreen)
PdfInfosAndResultBar(uiState, currentDocument, onOpen, onThumbnailClick)
}
Column(modifier = Modifier.weight(1f)) {
MainActions(uiState, onShare, onSave, onCloseScan)
MainActions(filename, onFilenameChange, uiState, onShare, onSave, onCloseScan)
}
}
@@ -223,15 +225,12 @@ fun ExportScreen(
}
@Composable
private fun TextFieldAndPdfInfos(
filename: MutableState<String>,
onFilenameChange: (String) -> Unit,
private fun PdfInfosAndResultBar(
uiState: ExportUiState,
currentDocument: DocumentUiModel,
onOpen: (SavedItem) -> Unit,
onThumbnailClick: () -> Unit,
) {
FilenameTextField(filename, onFilenameChange)
val result = uiState.result
@@ -339,6 +338,8 @@ private fun FilenameTextField(
@Composable
private fun MainActions(
filename: MutableState<String>,
onFilenameChange: (String) -> Unit,
uiState: ExportUiState,
onShare: () -> Unit,
onSave: () -> Unit,
@@ -347,6 +348,8 @@ private fun MainActions(
Column(
verticalArrangement = Arrangement.spacedBy(12.dp)
) {
FilenameTextField(filename, onFilenameChange)
Row(
horizontalArrangement = Arrangement.spacedBy(8.dp),
modifier = Modifier.fillMaxWidth()