diff --git a/app/src/main/java/org/mydomain/myscan/MainViewModel.kt b/app/src/main/java/org/mydomain/myscan/MainViewModel.kt index 2e2ee04..d8ce352 100644 --- a/app/src/main/java/org/mydomain/myscan/MainViewModel.kt +++ b/app/src/main/java/org/mydomain/myscan/MainViewModel.kt @@ -17,11 +17,9 @@ package org.mydomain.myscan import android.content.Context import android.graphics.Bitmap import android.graphics.BitmapFactory -import android.net.Uri import android.os.Environment import android.util.Log import androidx.camera.core.ImageProxy -import androidx.core.net.toFile import androidx.core.net.toUri import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModelProvider @@ -277,14 +275,11 @@ class MainViewModel( fun saveFile(pdfFile: File): File { val copiedFile = pdfFileManager.copyToExternalDir(pdfFile) - markFileSaved(pdfFile.toUri()) + val dirName = copiedFile.parentFile?.name + _pdfUiState.update { it.copy(savedFileUri = pdfFile.toUri(), saveDirectoryName = dirName) } return copiedFile } - fun markFileSaved(uri: Uri) { - _pdfUiState.update { it.copy(savedFileUri = uri) } - } - fun cleanUpOldPdfs(thresholdInMillis: Int) { pdfFileManager.cleanUpOldFiles(thresholdInMillis) } diff --git a/app/src/main/java/org/mydomain/myscan/ui/UiState.kt b/app/src/main/java/org/mydomain/myscan/ui/UiState.kt index 9731263..8a477ef 100644 --- a/app/src/main/java/org/mydomain/myscan/ui/UiState.kt +++ b/app/src/main/java/org/mydomain/myscan/ui/UiState.kt @@ -22,5 +22,6 @@ data class PdfGenerationUiState( val generatedPdf: GeneratedPdf? = null, val desiredFilename: String = "", val savedFileUri: Uri? = null, + val saveDirectoryName: String? = null, val errorMessage: String? = null ) diff --git a/app/src/main/java/org/mydomain/myscan/view/PdfGenerationBottomSheet.kt b/app/src/main/java/org/mydomain/myscan/view/PdfGenerationBottomSheet.kt index 5618bbc..8021147 100644 --- a/app/src/main/java/org/mydomain/myscan/view/PdfGenerationBottomSheet.kt +++ b/app/src/main/java/org/mydomain/myscan/view/PdfGenerationBottomSheet.kt @@ -157,8 +157,8 @@ fun PdfGenerationBottomSheet( MainActions(pdf, onShare, onSave) } - if (uiState.savedFileUri != null) { - SavePdfBar(onOpen) + if (uiState.saveDirectoryName != null) { + SavePdfBar(onOpen, uiState.saveDirectoryName) } if (uiState.errorMessage != null) { ErrorBar(uiState.errorMessage) @@ -196,7 +196,7 @@ private fun MainActions( } @Composable -private fun SavePdfBar(onOpen: () -> Unit) { +private fun SavePdfBar(onOpen: () -> Unit, saveDirectoryName: String) { Row( verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.Absolute.SpaceBetween, @@ -206,7 +206,7 @@ private fun SavePdfBar(onOpen: () -> Unit) { .padding(vertical = 8.dp, horizontal = 16.dp), ) { Text( - text = "PDF saved to Downloads", + text = "PDF saved to $saveDirectoryName", style = MaterialTheme.typography.bodyMedium ) MainActionButton(