[PM-34127] feat: Integrate card scanner with VaultAddEdit

app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/feature/vaultunlocked/VaultUnlockedNavigation.kt

@@ -56,6 +56,8 @@ import com.x8bit.bitwarden.ui.vault.feature.attachments.attachmentDestination
 import com.x8bit.bitwarden.ui.vault.feature.attachments.navigateToAttachment
 import com.x8bit.bitwarden.ui.vault.feature.attachments.preview.navigateToPreviewAttachment
 import com.x8bit.bitwarden.ui.vault.feature.attachments.preview.previewAttachmentDestination
+import com.x8bit.bitwarden.ui.vault.feature.cardscanner.cardScanDestination
+import com.x8bit.bitwarden.ui.vault.feature.cardscanner.navigateToCardScanScreen
 import com.x8bit.bitwarden.ui.vault.feature.importlogins.importLoginsScreenDestination
 import com.x8bit.bitwarden.ui.vault.feature.importlogins.navigateToImportLoginsScreen
 import com.x8bit.bitwarden.ui.vault.feature.item.navigateToVaultItem
@@ -172,6 +174,9 @@ fun NavGraphBuilder.vaultUnlockedGraph(
             onNavigateToQrCodeScanScreen = {
                 navController.navigateToQrCodeScanScreen()
             },
+            onNavigateToCardScanScreen = {
+                navController.navigateToCardScanScreen()
+            },
             onNavigateToManualCodeEntryScreen = {
                 navController.navigateToManualCodeEntryScreen()
             },
@@ -205,6 +210,9 @@ fun NavGraphBuilder.vaultUnlockedGraph(
             },
             onNavigateToPreviewAttachment = { navController.navigateToPreviewAttachment(it) },
         )
+        cardScanDestination(
+            onNavigateBack = { navController.popBackStack() },
+        )
         vaultQrCodeScanDestination(
             onNavigateToManualCodeEntryScreen = {
                 navController.popBackStack()

app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditCardItems.kt

@@ -10,17 +10,22 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.focus.FocusRequester
+import androidx.compose.ui.focus.focusRequester
 import androidx.compose.ui.platform.LocalResources
 import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.unit.dp
 import com.bitwarden.ui.platform.base.util.standardHorizontalMargin
+import com.bitwarden.ui.platform.components.button.BitwardenOutlinedButton
 import com.bitwarden.ui.platform.components.dropdown.BitwardenMultiSelectButton
 import com.bitwarden.ui.platform.components.field.BitwardenPasswordField
 import com.bitwarden.ui.platform.components.field.BitwardenTextField
 import com.bitwarden.ui.platform.components.header.BitwardenListHeaderText
 import com.bitwarden.ui.platform.components.model.CardStyle
+import com.bitwarden.ui.platform.components.util.rememberVectorPainter
+import com.bitwarden.ui.platform.resource.BitwardenDrawable
 import com.bitwarden.ui.platform.resource.BitwardenString
 import com.x8bit.bitwarden.ui.vault.feature.addedit.handlers.VaultAddEditCardTypeHandlers
 import com.x8bit.bitwarden.ui.vault.model.VaultCardBrand
@@ -34,6 +39,9 @@ import kotlinx.collections.immutable.toImmutableList
 @Suppress("LongMethod")
 fun LazyListScope.vaultAddEditCardItems(
     cardState: VaultAddEditState.ViewState.Content.ItemType.Card,
+    isCardScannerEnabled: Boolean,
+    cardHolderNameFocusRequester: FocusRequester,
+    onScanCardClick: () -> Unit,
     cardHandlers: VaultAddEditCardTypeHandlers,
 ) {
     item {
@@ -47,6 +55,21 @@ fun LazyListScope.vaultAddEditCardItems(
         )
     }
 
+    if (isCardScannerEnabled) {
+        item {
+            Spacer(modifier = Modifier.height(8.dp))
+            BitwardenOutlinedButton(
+                label = stringResource(id = BitwardenString.scan_card),
+                onClick = onScanCardClick,
+                icon = rememberVectorPainter(id = BitwardenDrawable.ic_camera_small),
+                modifier = Modifier
+                    .testTag("ScanCardButton")
+                    .fillMaxWidth()
+                    .standardHorizontalMargin(),
+            )
+        }
+    }
+
     item {
         Spacer(modifier = Modifier.height(8.dp))
         BitwardenTextField(
@@ -57,7 +80,8 @@ fun LazyListScope.vaultAddEditCardItems(
             cardStyle = CardStyle.Top(),
             modifier = Modifier
                 .fillMaxWidth()
-                .standardHorizontalMargin(),
+                .standardHorizontalMargin()
+                .focusRequester(cardHolderNameFocusRequester),
         )
     }
     item {

app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditItemContent.kt

@@ -13,6 +13,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.focus.FocusRequester
 import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
@@ -51,6 +52,8 @@ fun CoachMarkScope<AddEditItemCoachMark>.VaultAddEditContent(
     identityItemTypeHandlers: VaultAddEditIdentityTypeHandlers,
     cardItemTypeHandlers: VaultAddEditCardTypeHandlers,
     sshKeyItemTypeHandlers: VaultAddEditSshKeyTypeHandlers,
+    isCardScannerEnabled: Boolean,
+    cardHolderNameFocusRequester: FocusRequester,
     modifier: Modifier = Modifier,
     lazyListState: LazyListState,
     permissionsManager: PermissionsManager,
@@ -64,7 +67,10 @@ fun CoachMarkScope<AddEditItemCoachMark>.VaultAddEditContent(
         onResult = { isGranted ->
             when (state.type) {
                 is VaultAddEditState.ViewState.Content.ItemType.SecureNotes -> Unit
-                is VaultAddEditState.ViewState.Content.ItemType.Card -> Unit
+                is VaultAddEditState.ViewState.Content.ItemType.Card -> {
+                    cardItemTypeHandlers.onScanCardClick(isGranted)
+                }
+
                 is VaultAddEditState.ViewState.Content.ItemType.Identity -> Unit
                 is VaultAddEditState.ViewState.Content.ItemType.SshKey -> Unit
                 is VaultAddEditState.ViewState.Content.ItemType.Login -> {
@@ -236,6 +242,15 @@ fun CoachMarkScope<AddEditItemCoachMark>.VaultAddEditContent(
             is VaultAddEditState.ViewState.Content.ItemType.Card -> {
                 vaultAddEditCardItems(
                     cardState = state.type,
+                    isCardScannerEnabled = isCardScannerEnabled,
+                    cardHolderNameFocusRequester = cardHolderNameFocusRequester,
+                    onScanCardClick = {
+                        if (permissionsManager.checkPermission(Manifest.permission.CAMERA)) {
+                            cardItemTypeHandlers.onScanCardClick(true)
+                        } else {
+                            launcher.launch(Manifest.permission.CAMERA)
+                        }
+                    },
                     cardHandlers = cardItemTypeHandlers,
                 )
             }

app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditNavigation.kt

@@ -73,6 +73,7 @@ fun NavGraphBuilder.vaultAddEditDestination(
     onNavigateBack: () -> Unit,
     onNavigateToManualCodeEntryScreen: () -> Unit,
     onNavigateToQrCodeScanScreen: () -> Unit,
+    onNavigateToCardScanScreen: () -> Unit,
     onNavigateToGeneratorModal: (GeneratorMode.Modal) -> Unit,
     onNavigateToAttachments: (cipherId: String) -> Unit,
     onNavigateToMoveToOrganization: (cipherId: String, showOnlyCollections: Boolean) -> Unit,
@@ -82,6 +83,7 @@ fun NavGraphBuilder.vaultAddEditDestination(
             onNavigateBack = onNavigateBack,
             onNavigateToManualCodeEntryScreen = onNavigateToManualCodeEntryScreen,
             onNavigateToQrCodeScanScreen = onNavigateToQrCodeScanScreen,
+            onNavigateToCardScanScreen = onNavigateToCardScanScreen,
             onNavigateToGeneratorModal = onNavigateToGeneratorModal,
             onNavigateToAttachments = onNavigateToAttachments,
             onNavigateToMoveToOrganization = onNavigateToMoveToOrganization,

app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditScreen.kt

@@ -27,6 +27,7 @@ import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.focus.FocusRequester
 import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.res.painterResource
@@ -65,6 +66,7 @@ import com.bitwarden.ui.platform.composition.LocalExitManager
 import com.bitwarden.ui.platform.composition.LocalIntentManager
 import com.bitwarden.ui.platform.manager.IntentManager
 import com.bitwarden.ui.platform.manager.exit.ExitManager
+import com.bitwarden.ui.platform.manager.util.startAppSettingsActivity
 import com.bitwarden.ui.platform.resource.BitwardenDrawable
 import com.bitwarden.ui.platform.resource.BitwardenString
 import com.bitwarden.ui.platform.theme.BitwardenTheme
@@ -99,6 +101,7 @@ import kotlinx.coroutines.launch
 fun VaultAddEditScreen(
     onNavigateBack: () -> Unit,
     onNavigateToQrCodeScanScreen: () -> Unit,
+    onNavigateToCardScanScreen: () -> Unit,
     viewModel: VaultAddEditViewModel = hiltViewModel(),
     permissionsManager: PermissionsManager = LocalPermissionsManager.current,
     intentManager: IntentManager = LocalIntentManager.current,
@@ -121,6 +124,7 @@ fun VaultAddEditScreen(
         lazyListState = lazyListState,
         orderedList = AddEditItemCoachMark.entries,
     )
+    val cardHolderNameFocusRequester = remember { FocusRequester() }
     val scope = rememberCoroutineScope()
     val snackbarHostState = rememberBitwardenSnackbarHostState()
     EventsEffect(viewModel = viewModel) { event ->
@@ -129,6 +133,10 @@ fun VaultAddEditScreen(
                 onNavigateToQrCodeScanScreen()
             }
 
+            is VaultAddEditEvent.NavigateToCardScan -> {
+                onNavigateToCardScanScreen()
+            }
+
             is VaultAddEditEvent.NavigateToManualCodeEntry -> {
                 onNavigateToManualCodeEntryScreen()
             }
@@ -194,6 +202,14 @@ fun VaultAddEditScreen(
             is VaultAddEditEvent.NavigateToPremium -> {
                 intentManager.launchUri(uri = event.uri.toUri())
             }
+
+            VaultAddEditEvent.FocusCardHolderName -> {
+                cardHolderNameFocusRequester.requestFocus()
+            }
+
+            VaultAddEditEvent.NavigateToAppSettings -> {
+                intentManager.startAppSettingsActivity()
+            }
         }
     }
 
@@ -267,6 +283,11 @@ fun VaultAddEditScreen(
         onUpgradeToPremiumClick = {
             viewModel.trySendAction(VaultAddEditAction.Common.UpgradeToPremiumClick)
         },
+        onCameraPermissionSettingsClick = {
+            viewModel.trySendAction(
+                VaultAddEditAction.Common.CameraPermissionSettingsClick,
+            )
+        },
     )
 
     if (pendingDeleteCipher) {
@@ -393,6 +414,8 @@ fun VaultAddEditScreen(
                         identityItemTypeHandlers = identityItemTypeHandlers,
                         cardItemTypeHandlers = cardItemTypeHandlers,
                         sshKeyItemTypeHandlers = sshKeyItemTypeHandlers,
+                        isCardScannerEnabled = state.isCardScannerEnabled,
+                        cardHolderNameFocusRequester = cardHolderNameFocusRequester,
                         lazyListState = lazyListState,
                         onPreviousCoachMark = {
                             coroutineScope.launch {
@@ -453,6 +476,7 @@ private fun VaultAddEditItemDialogs(
     onRetryPinSetUpFido2Verification: () -> Unit,
     onDismissFido2Verification: () -> Unit,
     onUpgradeToPremiumClick: () -> Unit,
+    onCameraPermissionSettingsClick: () -> Unit,
 ) {
     when (dialogState) {
         is VaultAddEditState.DialogState.ArchiveRequiresPremium -> {
@@ -558,6 +582,20 @@ private fun VaultAddEditItemDialogs(
             )
         }
 
+        is VaultAddEditState.DialogState.CameraPermissionDenied -> {
+            BitwardenTwoButtonDialog(
+                title = stringResource(BitwardenString.allow_camera_access),
+                message = stringResource(
+                    id = BitwardenString.to_scan_your_card_we_need_access_to_your_camera,
+                ),
+                confirmButtonText = stringResource(id = BitwardenString.go_to_settings),
+                dismissButtonText = stringResource(id = BitwardenString.not_now),
+                onConfirmClick = onCameraPermissionSettingsClick,
+                onDismissClick = onDismissRequest,
+                onDismissRequest = onDismissRequest,
+            )
+        }
+
         null -> Unit
     }
 }