Small UI improvements for Scan Barcode Screen

Upping versionCode to 66
zotero · May 24, 2024 · 965ca48 · 965ca48
1 parent e0dc529
commit 965ca48
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 20 deletions.
diff --git a/app/src/main/java/org/zotero/android/screens/scanbarcode/ScanBarcodeViewModel.kt b/app/src/main/java/org/zotero/android/screens/scanbarcode/ScanBarcodeViewModel.kt
@@ -179,11 +179,6 @@ internal class ScanBarcodeViewModel @Inject constructor(
         }
     }
 
-    fun cancelAllLookups() {
-        identifierLookupController.cancelAllLookups()
-        updateLookupState(State.waitingInput)
-    }
-
     private fun setupAttachmentObserving() {
         attachmentDownloaderEventStream.flow()
             .onEach { update ->

diff --git a/...de/ui/ScanBarcodeCloseScanCancelTopBar.kt → ...e/ui/ScanBarcodeCloseScanAnotherTopBar.kt b/...de/ui/ScanBarcodeCloseScanCancelTopBar.kt → ...e/ui/ScanBarcodeCloseScanAnotherTopBar.kt
@@ -8,9 +8,8 @@ import org.zotero.android.uicomponents.topbar.NewCustomTopBar
 import org.zotero.android.uicomponents.topbar.NewHeadingTextButton
 
 @Composable
-internal fun ScanBarcodeCloseScanCancelTopBar(
+internal fun ScanBarcodeCloseScanAnotherTopBar(
     onClose: () -> Unit,
-    onCancelAll: () -> Unit,
     onScan: () -> Unit,
 ) {
     NewCustomTopBar(
@@ -19,15 +18,11 @@ internal fun ScanBarcodeCloseScanCancelTopBar(
                 text = stringResource(id = Strings.close),
                 onClick = onClose
             )
-            NewHeadingTextButton(
-                text = stringResource(id = Strings.cancel_all),
-                onClick = onCancelAll
-            )
         },
         rightContainerContent = listOf {
             NewHeadingTextButton(
                 style = CustomTheme.typography.defaultBold,
-                text = stringResource(id = Strings.scan),
+                text = stringResource(id = Strings.scan_another),
                 onClick = onScan
             )
         }

diff --git a/app/src/main/java/org/zotero/android/screens/scanbarcode/ui/ScanBarcodeScreen.kt b/app/src/main/java/org/zotero/android/screens/scanbarcode/ui/ScanBarcodeScreen.kt
@@ -57,13 +57,9 @@ internal fun ScanBarcodeScreen(
         }
         CustomScaffold(
             topBar = {
-                ScanBarcodeCloseScanCancelTopBar(
+                ScanBarcodeCloseScanAnotherTopBar(
                     onClose = onClose,
-                    onScan = viewModel::launchBarcodeScanner,
-                    onCancelAll = {
-                        viewModel.cancelAllLookups()
-                        onClose()
-                    }
+                    onScan = viewModel::launchBarcodeScanner
                 )
             },
         ) {

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -23,5 +23,5 @@
     <string name="errors_lookup_no_identifiers_with_lookup_data">Zotero could not find any new identifiers in your input, or they are already being added. Please verify your input and try again.</string>
     <string name="queued">Queued…</string>
     <string name="failed">Failed</string>
-    <string name="scan">Scan</string>
+    <string name="scan_another">Scan Another</string>
 </resources>
diff --git a/buildSrc/src/main/kotlin/BuildConfig.kt b/buildSrc/src/main/kotlin/BuildConfig.kt
@@ -4,7 +4,7 @@ object BuildConfig {
     const val compileSdkVersion = 34
     const val targetSdk = 33
 
-    val versionCode = 65 // Must be updated on every build
+    val versionCode = 66 // Must be updated on every build
     val version = Version(
         major = 1,
         minor = 0,