Home screen: remove the "current document" card, change the scan button behavior

Author: pynicolas

app/src/main/java/org/fairscan/app/MainActivity.kt

@@ -78,9 +78,7 @@ class MainActivity : ComponentActivity() {
                         val recentDocs by viewModel.recentDocuments.collectAsStateWithLifecycle()
                         HomeScreen(
                             cameraPermission = cameraPermission,
-                            currentDocument = document,
                             navigation = navigation,
-                            onStartNewScan = navigation.toCameraScreen,
                             recentDocuments = recentDocs,
                             onOpenPdf = { file -> openPdf(file.toUri()) }
                         )

app/src/main/java/org/fairscan/app/view/HomeScreen.kt

@@ -14,16 +14,13 @@
  */
 package org.fairscan.app.view
 
-import androidx.compose.foundation.Image
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.icons.Icons
@@ -41,11 +38,7 @@ import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
 import androidx.compose.material3.TopAppBar
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.saveable.rememberSaveable
-import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.asImageBitmap
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
@@ -63,13 +56,10 @@ import kotlin.math.min
 @Composable
 fun HomeScreen(
     cameraPermission: CameraPermissionState,
-    currentDocument: DocumentUiModel,
     navigation: Navigation,
-    onStartNewScan: () -> Unit,
     recentDocuments: List<RecentDocumentUiState>,
     onOpenPdf: (File) -> Unit,
 ) {
-    val showCloseDocDialog = rememberSaveable { mutableStateOf(false) }
     Scaffold (
         topBar = {
             TopAppBar(
@@ -83,15 +73,9 @@ fun HomeScreen(
             BottomAppBar {
                 Spacer(Modifier.weight(1f))
                 MainActionButton(
-                    onClick = {
-                        if (currentDocument.isEmpty()) {
-                            onStartNewScan()
-                        } else {
-                            showCloseDocDialog.value = true
-                        }
-                    },
+                    onClick = navigation.toCameraScreen,
                     icon = Icons.Default.PhotoCamera,
-                    text = stringResource(R.string.start_a_new_scan),
+                    text = stringResource(R.string.scan_button),
                     modifier = Modifier
                         .padding(12.dp)
                         .height(48.dp),
@@ -109,22 +93,10 @@ fun HomeScreen(
                 CameraPermissionRationale(cameraPermission)
             }
 
-            if (!currentDocument.isEmpty()) {
-                SectionTitle(stringResource(R.string.current_document))
-                CurrentDocumentCard(currentDocument, navigation)
-            }
-
             if (recentDocuments.isNotEmpty()) {
                 SectionTitle(stringResource(R.string.last_saved_documents))
                 RecentDocumentList(recentDocuments, onOpenPdf)
             }
-
-            if (showCloseDocDialog.value) {
-                NewDocumentDialog(
-                    onConfirm = onStartNewScan,
-                    showCloseDocDialog,
-                    stringResource(R.string.new_document))
-            }
         }
     }
 }
@@ -149,38 +121,6 @@ private fun CameraPermissionRationale(cameraPermission: CameraPermissionState) {
     }
 }
 
-@Composable
-private fun CurrentDocumentCard(
-    currentDocument: DocumentUiModel,
-    navigation: Navigation,
-) {
-    Card(
-        modifier = Modifier
-            .fillMaxWidth()
-            .padding(horizontal = 12.dp, vertical = 6.dp)
-    ) {
-        Row(
-            verticalAlignment = Alignment.CenterVertically,
-            modifier = Modifier.padding(12.dp)
-        ) {
-            currentDocument.load(0)?.let {
-                Image(
-                    bitmap = it.asImageBitmap(),
-                    contentDescription = null,
-                    modifier = Modifier
-                        .height(100.dp)
-                        .padding(4.dp)
-                )
-            }
-            Spacer(Modifier.width(12.dp))
-            Column(Modifier.weight(1f)) {
-                Text(pageCountText(currentDocument.pageCount()))
-            }
-            MainActionButton(navigation.toDocumentScreen, stringResource(R.string.open))
-        }
-    }
-}
-
 @Composable
 private fun RecentDocumentList(
     recentDocuments: List<RecentDocumentUiState>,
@@ -222,9 +162,7 @@ fun HomeScreenPreviewOnFirstLaunch() {
     MyScanTheme {
         HomeScreen(
             cameraPermission = rememberCameraPermissionState(),
-            currentDocument = DocumentUiModel(listOf()) { _ -> null },
             navigation = dummyNavigation(),
-            onStartNewScan = {},
             recentDocuments = listOf(),
             onOpenPdf = {},
         )
@@ -233,15 +171,11 @@ fun HomeScreenPreviewOnFirstLaunch() {
 
 @Preview
 @Composable
-fun HomeScreenPreviewWithCurrentDocument() {
+fun HomeScreenPreviewWithLastSavedFiles() {
     MyScanTheme {
         HomeScreen(
             cameraPermission = rememberCameraPermissionState(),
-            currentDocument = fakeDocument(
-                listOf("gallica.bnf.fr-bpt6k5530456s-1.jpg"),
-                LocalContext.current),
             navigation = dummyNavigation(),
-            onStartNewScan = {},
             recentDocuments = listOf(
                 RecentDocumentUiState(File("/path/my_file.pdf"), 1755971180000, 3),
                 RecentDocumentUiState(File("/path/scan2.pdf"), 1755000500000, 1)

app/src/main/res/values-de/strings.xml

@@ -35,9 +35,9 @@
     <string name="open_pdf">PDF öffnen</string>
     <string name="pdf_saved_to">PDF gespeichert unter %1$s</string>
     <string name="save">Speichern</string>
+    <string name="scan_button">Scannen</string>
     <string name="share">Teilen</string>
     <string name="share_pdf">PDF teilen</string>
-    <string name="start_a_new_scan">Neuen Scan starten</string>
     <string name="unknown_size">Unbekannte Größe</string>
     <string name="version">Version</string>
     <string name="view_the_full_license">Vollständige Lizenz anzeigen</string>

app/src/main/res/values-fr/strings.xml

@@ -35,9 +35,9 @@
     <string name="open_pdf">Ouvrir le PDF</string>
     <string name="pdf_saved_to">PDF enregistré dans %1$s</string>
     <string name="save">Enregistrer</string>
+    <string name="scan_button">Scanner</string>
     <string name="share">Partager</string>
     <string name="share_pdf">Partager le PDF</string>
-    <string name="start_a_new_scan">Nouveau scan</string>
     <string name="unknown_size">Taille inconnue</string>
     <string name="version">Version</string>
     <string name="view_the_full_license">Voir la licence complète</string>

app/src/main/res/values/strings.xml

@@ -36,9 +36,9 @@
     <string name="open_pdf">Open PDF</string>
     <string name="pdf_saved_to">PDF saved to %1$s</string>
     <string name="save">Save</string>
+    <string name="scan_button">Scan</string>
     <string name="share">Share</string>
     <string name="share_pdf">Share PDF</string>
-    <string name="start_a_new_scan">Start a new scan</string>
     <string name="unknown_size">Unknown size</string>
     <string name="version">Version</string>
     <string name="view_the_full_license">View the full license</string>