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

Wire the card scanner into the card cipher add/edit flow:
- VaultAddEditViewModel: inject CardScanManager, handle scan results,
  populate card fields with brand-aware CVV validation
- VaultAddEditScreen: pass scanner enabled state and click handler
- VaultAddEditCardItems: conditionally render Scan Card button
- VaultUnlockedNavigation: register card scan route

Author: SaintPatrck

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

@@ -59,6 +59,8 @@ import com.x8bit.bitwarden.ui.vault.feature.importlogins.navigateToImportLoginsS
 import com.x8bit.bitwarden.ui.vault.feature.item.navigateToVaultItem
 import com.x8bit.bitwarden.ui.vault.feature.item.vaultItemDestination
 import com.x8bit.bitwarden.ui.vault.feature.itemlisting.vaultItemListingDestinationAsRoot
+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.manualcodeentry.navigateToManualCodeEntryScreen
 import com.x8bit.bitwarden.ui.vault.feature.manualcodeentry.vaultManualCodeEntryDestination
 import com.x8bit.bitwarden.ui.vault.feature.movetoorganization.navigateToVaultMoveToOrganization
@@ -169,6 +171,9 @@ fun NavGraphBuilder.vaultUnlockedGraph(
             onNavigateToQrCodeScanScreen = {
                 navController.navigateToQrCodeScanScreen()
             },
+            onNavigateToCardScanScreen = {
+                navController.navigateToCardScanScreen()
+            },
             onNavigateToManualCodeEntryScreen = {
                 navController.navigateToManualCodeEntryScreen()
             },
@@ -208,6 +213,9 @@ fun NavGraphBuilder.vaultUnlockedGraph(
                 )
             },
         )
+        cardScanDestination(
+            onNavigateBack = { navController.popBackStack() },
+        )
         vaultQrCodeScanDestination(
             onNavigateToManualCodeEntryScreen = {
                 navController.popBackStack()

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

@@ -17,6 +17,7 @@ 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.dropdown.BitwardenMultiSelectButton
+import com.bitwarden.ui.platform.components.button.BitwardenOutlinedButton
 import com.bitwarden.ui.platform.components.field.BitwardenPasswordField
 import com.bitwarden.ui.platform.components.field.BitwardenTextField
 import com.bitwarden.ui.platform.components.header.BitwardenListHeaderText
@@ -34,6 +35,8 @@ import kotlinx.collections.immutable.toImmutableList
 @Suppress("LongMethod")
 fun LazyListScope.vaultAddEditCardItems(
     cardState: VaultAddEditState.ViewState.Content.ItemType.Card,
+    isCardScannerEnabled: Boolean,
+    onScanCardClick: () -> Unit,
     cardHandlers: VaultAddEditCardTypeHandlers,
 ) {
     item {
@@ -47,6 +50,20 @@ fun LazyListScope.vaultAddEditCardItems(
         )
     }
 
+    if (isCardScannerEnabled) {
+        item {
+            Spacer(modifier = Modifier.height(8.dp))
+            BitwardenOutlinedButton(
+                label = stringResource(id = BitwardenString.scan_card),
+                onClick = onScanCardClick,
+                modifier = Modifier
+                    .testTag("ScanCardButton")
+                    .fillMaxWidth()
+                    .standardHorizontalMargin(),
+            )
+        }
+    }
+
     item {
         Spacer(modifier = Modifier.height(8.dp))
         BitwardenTextField(

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

@@ -51,6 +51,7 @@ fun CoachMarkScope<AddEditItemCoachMark>.VaultAddEditContent(
     identityItemTypeHandlers: VaultAddEditIdentityTypeHandlers,
     cardItemTypeHandlers: VaultAddEditCardTypeHandlers,
     sshKeyItemTypeHandlers: VaultAddEditSshKeyTypeHandlers,
+    isCardScannerEnabled: Boolean,
     modifier: Modifier = Modifier,
     lazyListState: LazyListState,
     permissionsManager: PermissionsManager,
@@ -64,7 +65,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 +240,14 @@ fun CoachMarkScope<AddEditItemCoachMark>.VaultAddEditContent(
             is VaultAddEditState.ViewState.Content.ItemType.Card -> {
                 vaultAddEditCardItems(
                     cardState = state.type,
+                    isCardScannerEnabled = isCardScannerEnabled,
+                    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

@@ -99,6 +99,7 @@ import kotlinx.coroutines.launch
 fun VaultAddEditScreen(
     onNavigateBack: () -> Unit,
     onNavigateToQrCodeScanScreen: () -> Unit,
+    onNavigateToCardScanScreen: () -> Unit,
     viewModel: VaultAddEditViewModel = hiltViewModel(),
     permissionsManager: PermissionsManager = LocalPermissionsManager.current,
     intentManager: IntentManager = LocalIntentManager.current,
@@ -129,6 +130,10 @@ fun VaultAddEditScreen(
                 onNavigateToQrCodeScanScreen()
             }
 
+            is VaultAddEditEvent.NavigateToCardScan -> {
+                onNavigateToCardScanScreen()
+            }
+
             is VaultAddEditEvent.NavigateToManualCodeEntry -> {
                 onNavigateToManualCodeEntryScreen()
             }
@@ -393,6 +398,7 @@ fun VaultAddEditScreen(
                         identityItemTypeHandlers = identityItemTypeHandlers,
                         cardItemTypeHandlers = cardItemTypeHandlers,
                         sshKeyItemTypeHandlers = sshKeyItemTypeHandlers,
+                        isCardScannerEnabled = state.isCardScannerEnabled,
                         lazyListState = lazyListState,
                         onPreviousCoachMark = {
                             coroutineScope.launch {

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

@@ -25,6 +25,7 @@ import com.bitwarden.vault.CipherView
 import com.bitwarden.vault.DecryptCipherListResult
 import com.bitwarden.vault.FolderView
 import com.x8bit.bitwarden.data.auth.repository.AuthRepository
+import com.bitwarden.ui.platform.feature.cardscanner.manager.CardScanManager
 import com.x8bit.bitwarden.data.auth.repository.model.BreachCountResult
 import com.x8bit.bitwarden.data.auth.repository.model.UserState
 import com.x8bit.bitwarden.data.auth.repository.model.ValidatePasswordResult
@@ -55,13 +56,15 @@ import com.x8bit.bitwarden.data.tools.generator.repository.model.GeneratorResult
 import com.x8bit.bitwarden.data.vault.manager.model.GetCipherResult
 import com.x8bit.bitwarden.data.vault.repository.VaultRepository
 import com.x8bit.bitwarden.data.vault.repository.model.ArchiveCipherResult
+import com.bitwarden.ui.platform.feature.cardscanner.util.CardScanResult
 import com.x8bit.bitwarden.data.vault.repository.model.CreateCipherResult
 import com.x8bit.bitwarden.data.vault.repository.model.CreateFolderResult
 import com.x8bit.bitwarden.data.vault.repository.model.DeleteCipherResult
 import com.x8bit.bitwarden.data.vault.repository.model.TotpCodeResult
 import com.x8bit.bitwarden.data.vault.repository.model.UnarchiveCipherResult
 import com.x8bit.bitwarden.data.vault.repository.model.UpdateCipherResult
 import com.x8bit.bitwarden.data.vault.repository.model.VaultData
+import com.x8bit.bitwarden.ui.vault.util.detectCardBrand
 import com.x8bit.bitwarden.ui.credentials.manager.model.CreateCredentialResult
 import com.x8bit.bitwarden.ui.platform.manager.resource.ResourceManager
 import com.x8bit.bitwarden.ui.platform.model.SnackbarRelay
@@ -125,6 +128,7 @@ class VaultAddEditViewModel @Inject constructor(
     private val toastManager: ToastManager,
     private val authRepository: AuthRepository,
     private val clipboardManager: BitwardenClipboardManager,
+    private val cardScanManager: CardScanManager,
     private val policyManager: PolicyManager,
     private val vaultRepository: VaultRepository,
     private val bitwardenCredentialManager: BitwardenCredentialManager,
@@ -178,6 +182,7 @@ class VaultAddEditViewModel @Inject constructor(
 
             VaultAddEditState(
                 isArchiveEnabled = featureFlagManager.getFeatureFlag(FlagKey.ArchiveItems),
+                isCardScannerEnabled = featureFlagManager.getFeatureFlag(FlagKey.CardScanner),
                 vaultAddEditType = vaultAddEditType,
                 cipherType = vaultCipherType,
                 viewState = when (vaultAddEditType) {
@@ -279,6 +284,18 @@ class VaultAddEditViewModel @Inject constructor(
             .onEach(::sendAction)
             .launchIn(viewModelScope)
 
+        featureFlagManager
+            .getFeatureFlagFlow(FlagKey.CardScanner)
+            .map { VaultAddEditAction.Internal.CardScannerFlagUpdateReceive(it) }
+            .onEach(::sendAction)
+            .launchIn(viewModelScope)
+
+        cardScanManager
+            .cardScanResultFlow
+            .map { VaultAddEditAction.Internal.CardScanResultReceive(it) }
+            .onEach(::sendAction)
+            .launchIn(viewModelScope)
+
         snackbarRelayManager
             .getSnackbarDataFlow(SnackbarRelay.CIPHER_MOVED_TO_ORGANIZATION)
             .map { VaultAddEditAction.Internal.SnackbarDataReceived(it) }
@@ -1542,6 +1559,24 @@ class VaultAddEditViewModel @Inject constructor(
             is VaultAddEditAction.ItemType.CardType.SecurityCodeVisibilityChange -> {
                 handleSecurityCodeVisibilityChange(action)
             }
+
+            is VaultAddEditAction.ItemType.CardType.ScanCardClick -> {
+                handleScanCardClick(action)
+            }
+        }
+    }
+
+    private fun handleScanCardClick(
+        action: VaultAddEditAction.ItemType.CardType.ScanCardClick,
+    ) {
+        if (!state.isCardScannerEnabled) return
+        if (action.isGranted) {
+            sendEvent(VaultAddEditEvent.NavigateToCardScan)
+        } else {
+            toastManager.show(
+                messageId = BitwardenString
+                    .enable_camera_permission_to_use_the_scanner,
+            )
         }
     }
 
@@ -1653,6 +1688,14 @@ class VaultAddEditViewModel @Inject constructor(
                 handleArchiveItemsFlagUpdateReceive(action)
             }
 
+            is VaultAddEditAction.Internal.CardScannerFlagUpdateReceive -> {
+                handleCardScannerFlagUpdateReceive(action)
+            }
+
+            is VaultAddEditAction.Internal.CardScanResultReceive -> {
+                handleCardScanResultReceive(action)
+            }
+
             is VaultAddEditAction.Internal.DeleteCipherReceive -> handleDeleteCipherReceive(action)
             is VaultAddEditAction.Internal.TotpCodeReceive -> handleVaultTotpCodeReceive(action)
             is VaultAddEditAction.Internal.VaultDataReceive -> handleVaultDataReceive(action)
@@ -1870,6 +1913,41 @@ class VaultAddEditViewModel @Inject constructor(
         mutableStateFlow.update { it.copy(isArchiveEnabled = action.isEnabled) }
     }
 
+    private fun handleCardScannerFlagUpdateReceive(
+        action: VaultAddEditAction.Internal.CardScannerFlagUpdateReceive,
+    ) {
+        mutableStateFlow.update { it.copy(isCardScannerEnabled = action.isEnabled) }
+    }
+
+    private fun handleCardScanResultReceive(
+        action: VaultAddEditAction.Internal.CardScanResultReceive,
+    ) {
+        when (val result = action.cardScanResult) {
+            is CardScanResult.Success -> {
+                val data = result.cardScanData
+                updateCardContent { cardType ->
+                    cardType.copy(
+                        number = data.number ?: cardType.number,
+                        cardHolderName = data.cardholderName
+                            ?: cardType.cardHolderName,
+                        expirationYear = data.expirationYear
+                            ?: cardType.expirationYear,
+                        expirationMonth = data.expirationMonth
+                            ?.toExpirationMonth()
+                            ?: cardType.expirationMonth,
+                        securityCode = data.securityCode
+                            ?: cardType.securityCode,
+                        brand = data.number
+                            ?.detectCardBrand()
+                            ?: cardType.brand,
+                    )
+                }
+            }
+
+            is CardScanResult.ScanError -> Unit
+        }
+    }
+
     private fun handleDeleteCipherReceive(action: VaultAddEditAction.Internal.DeleteCipherReceive) {
         when (val result = action.result) {
             is DeleteCipherResult.Error -> {
@@ -2404,6 +2482,24 @@ class VaultAddEditViewModel @Inject constructor(
     //endregion Utility Functions
 }
 
+@Suppress("MagicNumber")
+private fun String.toExpirationMonth(): VaultCardExpirationMonth =
+    when (this.toIntOrNull()) {
+        1 -> VaultCardExpirationMonth.JANUARY
+        2 -> VaultCardExpirationMonth.FEBRUARY
+        3 -> VaultCardExpirationMonth.MARCH
+        4 -> VaultCardExpirationMonth.APRIL
+        5 -> VaultCardExpirationMonth.MAY
+        6 -> VaultCardExpirationMonth.JUNE
+        7 -> VaultCardExpirationMonth.JULY
+        8 -> VaultCardExpirationMonth.AUGUST
+        9 -> VaultCardExpirationMonth.SEPTEMBER
+        10 -> VaultCardExpirationMonth.OCTOBER
+        11 -> VaultCardExpirationMonth.NOVEMBER
+        12 -> VaultCardExpirationMonth.DECEMBER
+        else -> VaultCardExpirationMonth.SELECT
+    }
+
 /**
  * Represents the state for adding an item to the vault.
  *
@@ -2428,6 +2524,7 @@ data class VaultAddEditState(
     val defaultUriMatchType: UriMatchType,
     private val shouldShowCoachMarkTour: Boolean,
     private val isArchiveEnabled: Boolean,
+    val isCardScannerEnabled: Boolean,
 ) : Parcelable {
 
     /**
@@ -3098,6 +3195,11 @@ sealed class VaultAddEditEvent {
      */
     data object NavigateToQrCodeScan : VaultAddEditEvent()
 
+    /**
+     * Navigate to the card scan screen.
+     */
+    data object NavigateToCardScan : VaultAddEditEvent()
+
     /**
      * Navigate to the manual code entry screen.
      */
@@ -3698,6 +3800,13 @@ sealed class VaultAddEditAction {
              * @property isVisible The new code visibility state.
              */
             data class SecurityCodeVisibilityChange(val isVisible: Boolean) : CardType()
+
+            /**
+             * Fired when the scan card button is clicked.
+             *
+             * @property isGranted Whether camera permission was granted.
+             */
+            data class ScanCardClick(val isGranted: Boolean) : CardType()
         }
 
         /**
@@ -3841,5 +3950,19 @@ sealed class VaultAddEditAction {
         data class ArchiveItemsFlagUpdateReceive(
             val isEnabled: Boolean,
         ) : Internal()
+
+        /**
+         * Indicates that the Card Scanner flag has been updated.
+         */
+        data class CardScannerFlagUpdateReceive(
+            val isEnabled: Boolean,
+        ) : Internal()
+
+        /**
+         * Indicates that a card scan result has been received.
+         */
+        data class CardScanResultReceive(
+            val cardScanResult: CardScanResult,
+        ) : Internal()
     }
 }