[PM-32808] feat: Add Add/Edit support for Driver's License item type#6908
Conversation
🤖 Bitwarden Claude Code ReviewOverall Assessment: REQUEST CHANGES Reviewed the Add/Edit form for the Driver's License cipher type: new Code Review Details
|
Codecov Report❌ Patch coverage is Additional details and impacted files@@ Coverage Diff @@
## new-item-types/PM-32808_drivers-license #6908 +/- ##
===========================================================================
- Coverage 85.63% 85.50% -0.13%
===========================================================================
Files 855 857 +2
Lines 61270 61421 +151
Branches 8926 8937 +11
===========================================================================
+ Hits 52466 52516 +50
- Misses 5744 5843 +99
- Partials 3060 3062 +2
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:
|
be32994 to
7e3c779
Compare
82a1975 to
1eeba27
Compare
| <<<<<<< HEAD | ||
| <string name="license_details">License details</string> | ||
| ======= | ||
| <string name="drivers_license_details">License details</string> | ||
| >>>>>>> 82a197596 ([PM-32808] feat: Add Add/Edit support for Driver's License item type) |
There was a problem hiding this comment.
❌ CRITICAL: Unresolved Git merge conflict markers committed in strings.xml.
Details and fix
Lines 1360–1364 contain literal <<<<<<< HEAD, =======, and >>>>>>> 82a197596 ... conflict markers. These are not valid XML, so aapt2 will fail to compile the resources and the Android build will not succeed.
The base branch (new-item-types/PM-32808_drivers-license) already defines license_details, and both VaultItemDriversLicenseContent.kt and the new VaultAddEditDriversLicenseItems.kt reference BitwardenString.license_details. The "HEAD" side of the conflict is the correct resolution; the drivers_license_details duplicate from the incoming side should be discarded.
Suggested resolution:
| <<<<<<< HEAD | |
| <string name="license_details">License details</string> | |
| ======= | |
| <string name="drivers_license_details">License details</string> | |
| >>>>>>> 82a197596 ([PM-32808] feat: Add Add/Edit support for Driver's License item type) | |
| <string name="license_details">License details</string> | |
| </resources> |
After applying, run a quick local build (./gradlew app:assembleStandardDebug or equivalent) to confirm resources compile.
7e3c779 to
1bc6a61
Compare
1eeba27 to
d4c07be
Compare
🎟️ Tracking
📔 Objective
Adds the Add/Edit form for the Driver's License cipher type so users can create new licenses and edit existing ones. Renders editable fields for first / middle / last name, license number (sensitive with show/hide), issuing country, issuing state / province, issuing authority, and license class. Date fields (date of birth, issue date, expiration date) appear as read-only chevron rows pending the native Material date-picker integration, which is tracked separately.
📸 Screenshots