[PR #4089] [MERGED] PM-11182 PM-11183 PM-11184 Add the instruction steps to logins import flow #79911

Closed
opened 2026-05-19 17:46:37 -05:00 by GiteaMirror · 0 comments
Owner

📋 Pull Request Information

Original PR: https://github.com/bitwarden/android/pull/4089
Author: @dseverns-livefront
Created: 10/14/2024
Status: Merged
Merged: 10/16/2024
Merged by: @dseverns-livefront

Base: mainHead: PM-11182-instructions


📝 Commits (8)

  • a07d4b8 PM-11182 PM-11183 PM-11184 PM-11185 Add steps 1 through 3 with instructions for the import logins flow and help web view.
  • ffcfc24 Make more generic card for content, addtional PR feedback
  • 5f71393 name
  • c52841e add generic content item
  • e947870 persistent list
  • c320fe9 missed a spot
  • 4e291c5 smh
  • 8aed1d7 8th times a charm

📊 Changes

16 files changed (+1183 additions, -41 deletions)

View changed files

📝 app/src/main/java/com/x8bit/bitwarden/ui/platform/base/util/Text.kt (+37 -25)
app/src/main/java/com/x8bit/bitwarden/ui/platform/components/card/BitwardenContentCard.kt (+57 -0)
app/src/main/java/com/x8bit/bitwarden/ui/platform/components/content/BitwardenContentBlock.kt (+110 -0)
📝 app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/importlogins/ImportLoginsScreen.kt (+251 -9)
📝 app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/importlogins/ImportLoginsViewModel.kt (+120 -1)
app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/importlogins/components/ImportLoginsInstructionStep.kt (+153 -0)
app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/importlogins/components/InstructionRowItem.kt (+92 -0)
📝 app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/importlogins/handlers/ImportLoginHandler.kt (+17 -1)
app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/importlogins/model/InstructionStep.kt (+14 -0)
app/src/main/res/drawable/ic_number1.xml (+13 -0)
app/src/main/res/drawable/ic_number2.xml (+17 -0)
app/src/main/res/drawable/ic_number3.xml (+17 -0)
app/src/main/res/drawable/ic_number4.xml (+17 -0)
📝 app/src/main/res/values/strings.xml (+28 -0)
📝 app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/importlogins/ImportLoginsScreenTest.kt (+158 -3)
📝 app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/importlogins/ImportLoginsViewModelTest.kt (+82 -2)

📄 Description

🎟️ Tracking

https://bitwarden.atlassian.net/browse/PM-11182
https://bitwarden.atlassian.net/browse/PM-11183
https://bitwarden.atlassian.net/browse/PM-11184

📔 Objective

  • Draw the UI for each step and use CrossFade animation to move between them when the view state changes
  • Show the help web page from any step.

📸 Screenshots

https://github.com/user-attachments/assets/7d2cf536-5af1-4911-a39e-8ba86b135346

Reminders before review

  • Contributor guidelines followed
  • All formatters and local linters executed and passed
  • Written new unit and / or integration tests where applicable
  • Used internationalization (i18n) for all UI strings
  • CI builds passed
  • Communicated to DevOps any deployment requirements
  • Updated any necessary documentation 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/4089 **Author:** [@dseverns-livefront](https://github.com/dseverns-livefront) **Created:** 10/14/2024 **Status:** ✅ Merged **Merged:** 10/16/2024 **Merged by:** [@dseverns-livefront](https://github.com/dseverns-livefront) **Base:** `main` ← **Head:** `PM-11182-instructions` --- ### 📝 Commits (8) - [`a07d4b8`](https://github.com/bitwarden/android/commit/a07d4b84d7316bcd7780467f3e9f4ae6cd0e50eb) PM-11182 PM-11183 PM-11184 PM-11185 Add steps 1 through 3 with instructions for the import logins flow and help web view. - [`ffcfc24`](https://github.com/bitwarden/android/commit/ffcfc245426974e0134910310cca7f2cdf87efa3) Make more generic card for content, addtional PR feedback - [`5f71393`](https://github.com/bitwarden/android/commit/5f71393d11dc407ac3b8b83bb095d2843b351590) name - [`c52841e`](https://github.com/bitwarden/android/commit/c52841e428e0d58369511da6200080c2205ca5ad) add generic content item - [`e947870`](https://github.com/bitwarden/android/commit/e947870ab9176a7e4447415412e581a212b61703) persistent list - [`c320fe9`](https://github.com/bitwarden/android/commit/c320fe9e04f27fc9952a24c69c94af9ac80a339b) missed a spot - [`4e291c5`](https://github.com/bitwarden/android/commit/4e291c5b8d6d0cdcfa2d95bbfd11eb515423fa0c) smh - [`8aed1d7`](https://github.com/bitwarden/android/commit/8aed1d797b0f2288c0d5a92406303dbb26abf77a) 8th times a charm ### 📊 Changes **16 files changed** (+1183 additions, -41 deletions) <details> <summary>View changed files</summary> 📝 `app/src/main/java/com/x8bit/bitwarden/ui/platform/base/util/Text.kt` (+37 -25) ➕ `app/src/main/java/com/x8bit/bitwarden/ui/platform/components/card/BitwardenContentCard.kt` (+57 -0) ➕ `app/src/main/java/com/x8bit/bitwarden/ui/platform/components/content/BitwardenContentBlock.kt` (+110 -0) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/importlogins/ImportLoginsScreen.kt` (+251 -9) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/importlogins/ImportLoginsViewModel.kt` (+120 -1) ➕ `app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/importlogins/components/ImportLoginsInstructionStep.kt` (+153 -0) ➕ `app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/importlogins/components/InstructionRowItem.kt` (+92 -0) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/importlogins/handlers/ImportLoginHandler.kt` (+17 -1) ➕ `app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/importlogins/model/InstructionStep.kt` (+14 -0) ➕ `app/src/main/res/drawable/ic_number1.xml` (+13 -0) ➕ `app/src/main/res/drawable/ic_number2.xml` (+17 -0) ➕ `app/src/main/res/drawable/ic_number3.xml` (+17 -0) ➕ `app/src/main/res/drawable/ic_number4.xml` (+17 -0) 📝 `app/src/main/res/values/strings.xml` (+28 -0) 📝 `app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/importlogins/ImportLoginsScreenTest.kt` (+158 -3) 📝 `app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/importlogins/ImportLoginsViewModelTest.kt` (+82 -2) </details> ### 📄 Description ## 🎟️ Tracking https://bitwarden.atlassian.net/browse/PM-11182 https://bitwarden.atlassian.net/browse/PM-11183 https://bitwarden.atlassian.net/browse/PM-11184 <!-- Paste the link to the Jira or GitHub issue or otherwise describe / point to where this change is coming from. --> ## 📔 Objective - Draw the UI for each step and use CrossFade animation to move between them when the view state changes - Show the help web page from any step. <!-- Describe what the purpose of this PR is, for example what bug you're fixing or new feature you're adding. --> ## 📸 Screenshots https://github.com/user-attachments/assets/7d2cf536-5af1-4911-a39e-8ba86b135346 <!-- Required for any UI changes; delete if not applicable. Use fixed width images for better display. --> ## ⏰ Reminders before review - Contributor guidelines followed - All formatters and local linters executed and passed - Written new unit and / or integration tests where applicable - Used internationalization (i18n) for all UI strings - CI builds passed - Communicated to DevOps any deployment requirements - Updated any necessary documentation 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 --- <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-19 17:46:37 -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#79911