PDF export: ensure the file name is correct (trim and avoid empty name)
This commit is contained in:
@@ -88,6 +88,17 @@ fun PdfGenerationBottomSheetWrapper(
|
|||||||
sheetState.expand()
|
sheetState.expand()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
val onFilenameChange = { newName:String ->
|
||||||
|
filename.value = newName
|
||||||
|
pdfActions.setFilename(newName)
|
||||||
|
}
|
||||||
|
val ensureCorrectFileName = {
|
||||||
|
val value = filename.value.trim().ifEmpty { defaultFilename() }
|
||||||
|
if (value != filename.value) {
|
||||||
|
onFilenameChange(value)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
ModalBottomSheet(
|
ModalBottomSheet(
|
||||||
onDismissRequest = onDismiss,
|
onDismissRequest = onDismiss,
|
||||||
sheetState = sheetState,
|
sheetState = sheetState,
|
||||||
@@ -95,17 +106,20 @@ fun PdfGenerationBottomSheetWrapper(
|
|||||||
) {
|
) {
|
||||||
PdfGenerationBottomSheet(
|
PdfGenerationBottomSheet(
|
||||||
filename = filename,
|
filename = filename,
|
||||||
onFilenameChange = {
|
onFilenameChange = onFilenameChange,
|
||||||
filename.value = it
|
|
||||||
pdfActions.setFilename(it)
|
|
||||||
},
|
|
||||||
uiState = uiState,
|
uiState = uiState,
|
||||||
onDismiss = {
|
onDismiss = {
|
||||||
pdfActions.cancelGeneration()
|
pdfActions.cancelGeneration()
|
||||||
onDismiss()
|
onDismiss()
|
||||||
},
|
},
|
||||||
onShare = { pdfActions.sharePdf() },
|
onShare = {
|
||||||
onSave = { pdfActions.savePdf() },
|
ensureCorrectFileName()
|
||||||
|
pdfActions.sharePdf()
|
||||||
|
},
|
||||||
|
onSave = {
|
||||||
|
ensureCorrectFileName()
|
||||||
|
pdfActions.savePdf()
|
||||||
|
},
|
||||||
onOpen = { pdfActions.openPdf() },
|
onOpen = { pdfActions.openPdf() },
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user