[PR #6087] [MERGED] PM-27597: Update Yubikey illustration to match the rest of the app #54519

Closed
opened 2026-05-01 20:05:50 -05:00 by GiteaMirror · 0 comments
Owner

📋 Pull Request Information

Original PR: https://github.com/bitwarden/android/pull/6087
Author: @david-livefront
Created: 10/27/2025
Status: Merged
Merged: 11/4/2025
Merged by: @david-livefront

Base: mainHead: standardize-yubikey-illustration


📝 Commits (2)

  • 6be233f PM-27817: Consolidate totp parsing with TotpUriUtils
  • d9a1f8a PM-27597: Update Yubikey illustration and copy

📊 Changes

15 files changed (+205 additions, -407 deletions)

View changed files

📝 app/src/main/kotlin/com/x8bit/bitwarden/ui/auth/feature/twofactorlogin/TwoFactorLoginScreen.kt (+37 -54)
📝 app/src/main/kotlin/com/x8bit/bitwarden/ui/auth/feature/twofactorlogin/util/TwoFactorAuthMethodExtensions.kt (+8 -3)
📝 app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/qrcodescan/QrCodeScanViewModel.kt (+10 -83)
📝 app/src/test/kotlin/com/x8bit/bitwarden/ui/auth/feature/twofactorlogin/util/TwoFactorAuthMethodExtensionTest.kt (+4 -4)
📝 app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/qrcodescan/QrCodeScanViewModelTest.kt (+8 -165)
📝 authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/authenticator/feature/qrcodescan/QrCodeScanViewModel.kt (+33 -88)
📝 authenticator/src/test/kotlin/com/bitwarden/authenticator/ui/authenticator/feature/qrcodescan/QrCodeScanViewModelTest.kt (+11 -8)
📝 ui/src/main/kotlin/com/bitwarden/ui/platform/util/TotpUriUtils.kt (+7 -0)
ui/src/main/res/drawable-hdpi/img_yubi_key.png (+0 -0)
ui/src/main/res/drawable-mdpi/img_yubi_key.png (+0 -0)
ui/src/main/res/drawable-xhdpi/img_yubi_key.png (+0 -0)
ui/src/main/res/drawable-xxhdpi/img_yubi_key.png (+0 -0)
ui/src/main/res/drawable-xxxhdpi/img_yubi_key.png (+0 -0)
ui/src/main/res/drawable/ill_yubi_key.xml (+85 -0)
📝 ui/src/main/res/values/strings.xml (+2 -2)

📄 Description

🎟️ Tracking

PM-27597

📔 Objective

Update the TwoFactorLoginScreen to display a Yubi Key illustration instead of a raster image and standardize it with the rest of the 2-factor mechanisms.

Figme: https://www.figma.com/design/WjD06w9dFlA67Ba27d1OSu/Dev-Ready--Bitwarden-Android?node-id=40001448-10884&t=JYXtbE7zOvtmnzFh-4

📸 Screenshots

Before After

Reminders before review

  • Contributor guidelines followed
  • All formatters and local linters executed and passed
  • Written new unit and / or integration tests where applicable
  • Protected functional changes with optionality (feature flags)
  • Used internationalization (i18n) for all UI strings
  • CI builds passed
  • Communicated to DevOps any deployment requirements
  • Updated any necessary documentation (Confluence, contributing docs) or informed the documentation team

🦮 Reviewer guidelines

  • 👍 (:+1:) or similar for great changes
  • 📝 (:memo:) or ℹ️ (:information_source:) for notes or general info
  • (:question:) for questions
  • 🤔 (:thinking:) or 💭 (:thought_balloon:) for more open inquiry that's not quite a confirmed issue and could potentially benefit from discussion
  • 🎨 (:art:) for suggestions / improvements
  • (:x:) or ⚠️ (:warning:) for more significant problems or concerns needing attention
  • 🌱 (:seedling:) or ♻️ (:recycle:) for future improvements or indications of technical debt
  • ⛏ (:pick:) for minor or nitpick changes

🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.

## 📋 Pull Request Information **Original PR:** https://github.com/bitwarden/android/pull/6087 **Author:** [@david-livefront](https://github.com/david-livefront) **Created:** 10/27/2025 **Status:** ✅ Merged **Merged:** 11/4/2025 **Merged by:** [@david-livefront](https://github.com/david-livefront) **Base:** `main` ← **Head:** `standardize-yubikey-illustration` --- ### 📝 Commits (2) - [`6be233f`](https://github.com/bitwarden/android/commit/6be233f879c95fdb66f4890bc57aecca659e79f2) PM-27817: Consolidate totp parsing with TotpUriUtils - [`d9a1f8a`](https://github.com/bitwarden/android/commit/d9a1f8acaef6239887035c29174367ab52e5d1c7) PM-27597: Update Yubikey illustration and copy ### 📊 Changes **15 files changed** (+205 additions, -407 deletions) <details> <summary>View changed files</summary> 📝 `app/src/main/kotlin/com/x8bit/bitwarden/ui/auth/feature/twofactorlogin/TwoFactorLoginScreen.kt` (+37 -54) 📝 `app/src/main/kotlin/com/x8bit/bitwarden/ui/auth/feature/twofactorlogin/util/TwoFactorAuthMethodExtensions.kt` (+8 -3) 📝 `app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/qrcodescan/QrCodeScanViewModel.kt` (+10 -83) 📝 `app/src/test/kotlin/com/x8bit/bitwarden/ui/auth/feature/twofactorlogin/util/TwoFactorAuthMethodExtensionTest.kt` (+4 -4) 📝 `app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/qrcodescan/QrCodeScanViewModelTest.kt` (+8 -165) 📝 `authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/authenticator/feature/qrcodescan/QrCodeScanViewModel.kt` (+33 -88) 📝 `authenticator/src/test/kotlin/com/bitwarden/authenticator/ui/authenticator/feature/qrcodescan/QrCodeScanViewModelTest.kt` (+11 -8) 📝 `ui/src/main/kotlin/com/bitwarden/ui/platform/util/TotpUriUtils.kt` (+7 -0) ➖ `ui/src/main/res/drawable-hdpi/img_yubi_key.png` (+0 -0) ➖ `ui/src/main/res/drawable-mdpi/img_yubi_key.png` (+0 -0) ➖ `ui/src/main/res/drawable-xhdpi/img_yubi_key.png` (+0 -0) ➖ `ui/src/main/res/drawable-xxhdpi/img_yubi_key.png` (+0 -0) ➖ `ui/src/main/res/drawable-xxxhdpi/img_yubi_key.png` (+0 -0) ➕ `ui/src/main/res/drawable/ill_yubi_key.xml` (+85 -0) 📝 `ui/src/main/res/values/strings.xml` (+2 -2) </details> ### 📄 Description ## 🎟️ Tracking [PM-27597](https://bitwarden.atlassian.net/browse/PM-27597) ## 📔 Objective Update the `TwoFactorLoginScreen` to display a Yubi Key illustration instead of a raster image and standardize it with the rest of the 2-factor mechanisms. Figme: https://www.figma.com/design/WjD06w9dFlA67Ba27d1OSu/Dev-Ready--Bitwarden-Android?node-id=40001448-10884&t=JYXtbE7zOvtmnzFh-4 ## 📸 Screenshots | Before | After | | --- | --- | | <img width="300" src="https://github.com/user-attachments/assets/38afd527-e2b2-4227-9b25-35fde6c6fecc" /> | <img width="300" src="https://github.com/user-attachments/assets/5a6133e4-7f89-4b88-8ed7-677644911e41" /> | ## ⏰ Reminders before review - Contributor guidelines followed - All formatters and local linters executed and passed - Written new unit and / or integration tests where applicable - Protected functional changes with optionality (feature flags) - Used internationalization (i18n) for all UI strings - CI builds passed - Communicated to DevOps any deployment requirements - Updated any necessary documentation (Confluence, contributing docs) or informed the documentation team ## 🦮 Reviewer guidelines <!-- Suggested interactions but feel free to use (or not) as you desire! --> - 👍 (`:+1:`) or similar for great changes - 📝 (`:memo:`) or ℹ️ (`:information_source:`) for notes or general info - ❓ (`:question:`) for questions - 🤔 (`:thinking:`) or 💭 (`:thought_balloon:`) for more open inquiry that's not quite a confirmed issue and could potentially benefit from discussion - 🎨 (`:art:`) for suggestions / improvements - ❌ (`:x:`) or ⚠️ (`:warning:`) for more significant problems or concerns needing attention - 🌱 (`:seedling:`) or ♻️ (`:recycle:`) for future improvements or indications of technical debt - ⛏ (`:pick:`) for minor or nitpick changes [PM-27597]: https://bitwarden.atlassian.net/browse/PM-27597?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
GiteaMirror added the pull-request label 2026-05-01 20:05:50 -05:00
Sign in to join this conversation.
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: github-starred/android#54519