[PM-34126] feat: Add card scan screen#6721
Merged
SaintPatrck merged 8 commits intomainfrom Apr 7, 2026
Merged
Conversation
SaintPatrck
added
the
ai-review-vnext
github-actions
bot
added
app:password-manager
Contributor
Bitwarden Claude Code ReviewOverall Assessment: APPROVE This PR adds a new card scan screen with camera integration for credit card scanning, including a ViewModel with duplicate-scan guarding, a shared result channel (CardScanManager), navigation setup, and a feature flag gate. The implementation closely follows the established QrCodeScanScreen pattern with appropriate window-size-based layout switching. Tests cover ViewModel actions/events, manager emission, and screen rendering. Code Review DetailsNo actionable findings. The code follows established codebase patterns consistently, including:
|
Codecov Report❌ Patch coverage is Additional details and impacted files@@ Coverage Diff @@
## main #6721 +/- ##
==========================================
- Coverage 85.33% 84.97% -0.36%
==========================================
Files 957 841 -116
Lines 60714 58952 -1762
Branches 8634 8563 -71
==========================================
- Hits 51808 50097 -1711
+ Misses 5900 5873 -27
+ Partials 3006 2982 -24
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
Contributor
|
New Issues (128)Checkmarx found the following issues in this Pull Request
|
SaintPatrck
added
the
innovation
|
|
||
| // This screen should always look like it's in dark mode | ||
| CompositionLocalProvider( | ||
| LocalBitwardenColorScheme provides darkBitwardenColorScheme, |
| CompositionLocalProvider( | ||
| LocalBitwardenColorScheme provides darkBitwardenColorScheme, | ||
| ) { | ||
| StatusBarsAppearanceAffect() |
| } | ||
|
|
||
| private fun handleCameraErrorReceive() { | ||
| cardScanManager.emitCardScanResult(CardScanResult.ScanError()) |
Collaborator
There was a problem hiding this comment.
Do we need this too?
mutableStateFlow.update { it.copy(hasHandledScan = true) }
Contributor
Author
There was a problem hiding this comment.
No. This is only fired on camera setup failure, so it will only be called once, unlike handleCardScan. Although, hasHandledScan doesn't really need to be in the state. I can make it a member of the ViewModel itself.
app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/cardscanner/CardScanViewModelTest.kt
Outdated
Show resolved
Hide resolved
SaintPatrck
force-pushed
the
card-scanner/3-card-scan-screen
branch
from
be951b7 to
ff88fbb
Compare
![claude[bot]](https://avatars.githubusercontent.com/in/1236702?s=60&v=4){kind=small}
app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/cardscanner/CardScanViewModelTest.kt
Show resolved
Hide resolved
| ) : BaseViewModel<CardScanState, CardScanEvent, CardScanAction>( | ||
| initialState = CardScanState, | ||
| ) { | ||
| private var hasHandledScan = false |
Collaborator
There was a problem hiding this comment.
Can we move this into the state
SaintPatrck
force-pushed
the
card-scanner/2-text-analysis-pipeline
branch
from
35fa5f1 to
8299421
Compare
- Add Closeable to CardTextAnalyzerImpl to release ML Kit native resources - Override toString on CardScanData to mask sensitive fields - Add missing RuPay brand detection test coverage
LocalComposition doesn't provide a lifecycle hook for cleanup, so close() would never be invoked. Removes Closeable to stay consistent with QrCodeAnalyzerImpl.
Add the complete text analysis pipeline for credit card scanning: - CardNumberUtils: sanitize, Luhn validation, brand detection - CardDataParser: interface and implementation for OCR text parsing - CardTextAnalyzer: ML Kit-based camera frame analysis - CardScanOverlay: camera overlay composable - CardScanData: data class for parsed card fields - FakeCardTextAnalyzer: test fixture - LocalProviders: composition local for CardTextAnalyzer
Add the card scanner screen with camera integration: - CardScanManager: shared result channel between scanner and consumer - CardScanViewModel: state management for scan screen - CardScanScreen: composable with camera preview and overlay - CardScanNavigation: route and navigation helper - CardScanner feature flag gated behind card-scanner-mobile
Remove stale cardholderName parameter from test data, simplify ScanError verify to use direct value instead of match lambda, and fix import ordering.
Move hasHandledScan from Parcelable state to a private var since it is internal bookkeeping, not UI state. Update flag key name to pm-34171-card-scanner. Add OmitFromCoverage to navigation, fix minor formatting.
SaintPatrck
force-pushed
the
card-scanner/3-card-scan-screen
branch
from
eeede50 to
d076c37
Compare
app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/cardscanner/CardScanScreen.kt
Outdated
Show resolved
Hide resolved
david-livefront
approved these changes
Apr 7, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
🎟️ Tracking
https://bitwarden.atlassian.net/browse/PM-34126
📔 Objective
Add the card scan screen with camera integration for credit card scanning:
uimodule (cardscanner/manager/)CardScanDatafor success/error statesDeferredBackgroundEventcard-scanner-mobileFlagKeycardTextAnalyzerparameter tosetContentIncludes ViewModel, Screen, and Manager tests.
📸 Screenshots