Updating UI for Retrieval Metadata Screen/Dialog.

Upping versionCode to 135
zotero · Feb 17, 2025 · 5c67b42 · 5c67b42
1 parent 2dcbed8
commit 5c67b42
Show file tree

Hide file tree

Showing 15 changed files with 289 additions and 143 deletions.
diff --git a/app/src/main/java/org/zotero/android/architecture/navigation/CommonScreenNavigation.kt b/app/src/main/java/org/zotero/android/architecture/navigation/CommonScreenNavigation.kt
@@ -15,7 +15,6 @@ import org.zotero.android.screens.libraries.LibrariesScreen
 import org.zotero.android.screens.loading.LoadingScreen
 import org.zotero.android.screens.mediaviewer.image.ImageViewerScreen
 import org.zotero.android.screens.mediaviewer.video.VideoPlayerView
-import org.zotero.android.screens.retrievemetadata.RetrieveMetadataScreen
 import org.zotero.android.screens.webview.ZoteroWebViewScreen
 import java.io.File
 
@@ -195,17 +194,6 @@ fun NavGraphBuilder.collectionsScreen(
     }
 }
 
-fun NavGraphBuilder.retrieveMetadataScreen() {
-    dialogFixedMaxHeight(
-        route = "${CommonScreenDestinations.RETRIEVE_METADATA_SCREEN}/{$ARG_RETRIEVE_METADATA}",
-        arguments = listOf(
-            navArgument(ARG_RETRIEVE_METADATA) { type = NavType.StringType },
-        ),
-    ) {
-        RetrieveMetadataScreen()
-    }
-}
-
 object CommonScreenDestinations {
     const val LOADING = "loading"
     const val LIBRARIES_SCREEN = "librariesScreen"
@@ -217,7 +205,6 @@ object CommonScreenDestinations {
     const val IMAGE_VIEWER_SCREEN = "imageViewerScreen"
     const val COLLECTIONS_SCREEN = "collectionsScreen"
     const val ZOTERO_WEB_VIEW_SCREEN = "zoteroWebViewScreen"
-    const val RETRIEVE_METADATA_SCREEN = "retrieveMetadataScreen"
 }
 
 
@@ -242,7 +229,3 @@ fun ZoteroNavigation.toZoteroWebViewScreen(encodedUrl: String) {
         "${CommonScreenDestinations.ZOTERO_WEB_VIEW_SCREEN}/$encodedUrl"
     )
 }
-
-fun ZoteroNavigation.toRetrieveMetadata(args: String) {
-    navController.navigate("${CommonScreenDestinations.RETRIEVE_METADATA_SCREEN}/$args")
-}
diff --git a/...ain/java/org/zotero/android/architecture/navigation/phone/DashboardRootPhoneNavigation.kt b/...ain/java/org/zotero/android/architecture/navigation/phone/DashboardRootPhoneNavigation.kt
@@ -19,6 +19,7 @@ import androidx.navigation.compose.composable
 import androidx.navigation.compose.rememberNavController
 import androidx.navigation.navArgument
 import org.zotero.android.architecture.EventBusConstants
+import org.zotero.android.architecture.navigation.ARG_RETRIEVE_METADATA
 import org.zotero.android.architecture.navigation.CommonScreenDestinations
 import org.zotero.android.architecture.navigation.DashboardTopLevelDialogs
 import org.zotero.android.architecture.navigation.ZoteroNavigation
@@ -29,11 +30,9 @@ import org.zotero.android.architecture.navigation.imageViewerScreen
 import org.zotero.android.architecture.navigation.itemDetailsScreen
 import org.zotero.android.architecture.navigation.librariesScreen
 import org.zotero.android.architecture.navigation.loadingScreen
-import org.zotero.android.architecture.navigation.retrieveMetadataScreen
 import org.zotero.android.architecture.navigation.toAddOrEditNote
 import org.zotero.android.architecture.navigation.toImageViewerScreen
 import org.zotero.android.architecture.navigation.toItemDetails
-import org.zotero.android.architecture.navigation.toRetrieveMetadata
 import org.zotero.android.architecture.navigation.toVideoPlayerScreen
 import org.zotero.android.architecture.navigation.toZoteroWebViewScreen
 import org.zotero.android.architecture.navigation.toolbar.SyncToolbarScreen
@@ -52,6 +51,7 @@ import org.zotero.android.screens.dashboard.DashboardViewEffect
 import org.zotero.android.screens.dashboard.DashboardViewModel
 import org.zotero.android.screens.dashboard.DashboardViewState
 import org.zotero.android.screens.filter.FilterScreenPhone
+import org.zotero.android.screens.retrievemetadata.RetrieveMetadataScreen
 import org.zotero.android.screens.scanbarcode.ui.ScanBarcodeScreen
 import org.zotero.android.screens.settings.settingsNavScreens
 import org.zotero.android.screens.settings.toSettingsScreen
@@ -177,6 +177,15 @@ internal fun DashboardRootPhoneNavigation(
                     TagPickerScreen(onBack = navigation::onBack)
                 }
 
+                composable(
+                    route = "${DashboardRootPhoneDestinations.RETRIEVE_METADATA}/{$ARG_RETRIEVE_METADATA}",
+                    arguments = listOf(
+                        navArgument(ARG_RETRIEVE_METADATA) { type = NavType.StringType },
+                    ),
+                ) {
+                    RetrieveMetadataScreen(onBack = navigation::onBack)
+                }
+
                 composable(
                     route = DashboardRootPhoneDestinations.TAG_FILTER,
                     arguments = listOf(),
@@ -237,7 +246,6 @@ internal fun DashboardRootPhoneNavigation(
                     navigateToTagPicker = navigation::toTagPicker
                 )
                 zoterWebViewScreen(onClose = navigation::onBack)
-                retrieveMetadataScreen()
             }
         }
         DashboardTopLevelDialogs(viewState = viewState, viewModel = viewModel)
@@ -259,6 +267,7 @@ private object DashboardRootPhoneDestinations {
     const val TAG_FILTER = "tagFilter"
     const val COLLECTION_PICKER = "collectionPicker"
     const val SCAN_BARCODE = "scanBarcode"
+    const val RETRIEVE_METADATA = "retrieveMetadata"
 
 }
 
@@ -288,6 +297,10 @@ private fun ZoteroNavigation.toTagFilter() {
     navController.navigate(DashboardRootPhoneDestinations.TAG_FILTER)
 }
 
+private fun ZoteroNavigation.toRetrieveMetadata(args: String) {
+    navController.navigate("${DashboardRootPhoneDestinations.RETRIEVE_METADATA}/$args")
+}
+
 private fun toAllItems(
     navController: NavHostController,
 ) {

diff --git a/...rg/zotero/android/architecture/navigation/tablet/DashboardRootTopLevelTabletNavigation.kt b/...rg/zotero/android/architecture/navigation/tablet/DashboardRootTopLevelTabletNavigation.kt
@@ -9,20 +9,23 @@ import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
 import androidx.navigation.NavGraphBuilder
+import androidx.navigation.NavType
 import androidx.navigation.compose.composable
 import androidx.navigation.compose.rememberNavController
+import androidx.navigation.navArgument
 import org.zotero.android.architecture.EventBusConstants
+import org.zotero.android.architecture.navigation.ARG_RETRIEVE_METADATA
 import org.zotero.android.architecture.navigation.ZoteroNavigation
 import org.zotero.android.architecture.navigation.addNoteScreen
 import org.zotero.android.architecture.navigation.dialogDynamicHeight
-import org.zotero.android.architecture.navigation.retrieveMetadataScreen
+import org.zotero.android.architecture.navigation.dialogFixedMaxHeight
 import org.zotero.android.architecture.navigation.toAddOrEditNote
-import org.zotero.android.architecture.navigation.toRetrieveMetadata
 import org.zotero.android.architecture.navigation.toZoteroWebViewScreen
 import org.zotero.android.architecture.navigation.zoterWebViewScreen
 import org.zotero.android.pdf.pdfReaderScreenAndNavigationForTablet
 import org.zotero.android.pdf.toPdfScreen
 import org.zotero.android.screens.dashboard.DashboardViewModel
+import org.zotero.android.screens.retrievemetadata.RetrieveMetadataScreen
 import org.zotero.android.screens.tagpicker.TagPickerScreen
 import org.zotero.android.uicomponents.navigation.ZoteroNavHost
 import java.io.File
@@ -74,7 +77,9 @@ internal fun DashboardRootTopLevelTabletNavigation(
             navigateToTagPicker = navigation::toTagPickerScreen
         )
         zoterWebViewScreen(onClose = navigation::onBack)
-        retrieveMetadataScreen()
+        retrieveMetadataDialog(onBack = {
+            navController.popBackStack()
+        })
     }
 }
 
@@ -126,10 +131,23 @@ private fun NavGraphBuilder.tagPickerDialog(
     }
 }
 
+private fun NavGraphBuilder.retrieveMetadataDialog(onBack: () -> Unit) {
+    dialogFixedMaxHeight(
+        route = "${DashboardRootDestinations.RETRIEVE_METADATA_DIALOG}/{$ARG_RETRIEVE_METADATA}",
+        arguments = listOf(
+            navArgument(ARG_RETRIEVE_METADATA) { type = NavType.StringType },
+        ),
+    ) {
+        RetrieveMetadataScreen(onBack = onBack)
+    }
+}
+
+
 private object DashboardRootDestinations {
     const val DASHBOARD_SCREEN = "dashboardScreen"
     const val TAG_PICKER_SCREEN = "tagPickerScreen"
     const val TAG_PICKER_DIALOG = "tagPickerDialog"
+    const val RETRIEVE_METADATA_DIALOG = "retrieveMetadataDialog"
 }
 
 private fun ZoteroNavigation.toTagPickerScreen() {
@@ -138,4 +156,8 @@ private fun ZoteroNavigation.toTagPickerScreen() {
 
 private fun ZoteroNavigation.toTagPickerDialog() {
     navController.navigate(DashboardRootDestinations.TAG_PICKER_DIALOG)
+}
+
+private fun ZoteroNavigation.toRetrieveMetadata(args: String) {
+    navController.navigate("${DashboardRootDestinations.RETRIEVE_METADATA_DIALOG}/$args")
 }
diff --git a/app/src/main/java/org/zotero/android/pdfworker/PdfWorkerController.kt b/app/src/main/java/org/zotero/android/pdfworker/PdfWorkerController.kt
@@ -140,7 +140,7 @@ class PdfWorkerController @Inject constructor(
             )
         )
 
-        observable.emitAsync(Update.recognizedAndSaved)
+        observable.emitAsync(Update.recognizedAndSaved(createdItem.displayTitle))
     }
 
     private fun processPdfWorkerUpdate(result: Result<PdfWorkerRecognizedData>) {
@@ -268,7 +268,7 @@ class PdfWorkerController @Inject constructor(
             filename = filename,
         )
 
-        observable.emitAsync(Update.recognizeInit(fileName = filename))
+        observable.emitAsync(Update.recognizeInit(pdfFileName = filename))
 
         identifierLookupController.initialize(
             lookupMode = IdentifierLookupMode.identifyAndSaveParentItem,
@@ -344,10 +344,10 @@ class PdfWorkerController @Inject constructor(
     }
 
     sealed interface Update {
-        data class recognizeInit(val fileName: String) : Update
+        data class recognizeInit(val pdfFileName: String) : Update
         object recognizedDataIsEmpty: Update
         data class recognizeError(val errorMessage: String) : Update
-        object recognizedAndSaved : Update
+        data class recognizedAndSaved(val recognizedTitle: String) : Update
         object recognizedAndKeptInMemory : Update
     }
 }