github-starred/android
2
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2026-03-12 05:04:17 -05:00
Code Issues 144 Packages Projects Releases 116 Wiki Activity

[PR #3711] [MERGED] PM-10620 prevent account lockout tips screen #4364

New Issue
Closed
opened 2025-11-26 23:43:29 -06:00 by GiteaMirror · 0 comments
GiteaMirror commented 2025-11-26 23:43:29 -06:00
Owner
Copy Link

📋 Pull Request Information

Original PR: https://github.com/bitwarden/android/pull/3711
Author: @dseverns-livefront
Created: 8/9/2024
Status: ✅ Merged
Merged: 8/12/2024
Merged by: @dseverns-livefront

Base: main ← Head: PM-10620/prevent-account-lock-warning

📝 Commits (6)

📊 Changes

8 files changed (+338 additions, -2 deletions)

View changed files

📝 app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/auth/AuthNavigation.kt (+4 -0)
📝 app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/masterpasswordguidance/MasterPasswordGuidanceScreen.kt (+1 -2)
➕ app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/preventaccountlockout/PreventAccountLockoutNavigation.kt (+30 -0)
➕ app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/preventaccountlockout/PreventAccountLockoutScreen.kt (+185 -0)
➕ app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/preventaccountlockout/PreventAccountLockoutViewModel.kt (+45 -0)
📝 app/src/main/res/values/strings.xml (+7 -0)
➕ app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/preventaccountlockout/PreventAccountLockoutScreenTest.kt (+46 -0)
➕ app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/preventaccountlockout/PreventAccountLockoutViewModelTest.kt (+20 -0)

📄 Description

🎟️ Tracking

https://bitwarden.atlassian.net/browse/PM-10620

📔 Objective

Draw screen for the preventing account logout tips.

📸 Screenshots

figma link

Compose Preview
image

⏰ 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/3711 **Author:** [@dseverns-livefront](https://github.com/dseverns-livefront) **Created:** 8/9/2024 **Status:** ✅ Merged **Merged:** 8/12/2024 **Merged by:** [@dseverns-livefront](https://github.com/dseverns-livefront) **Base:** `main` ← **Head:** `PM-10620/prevent-account-lock-warning` --- ### 📝 Commits (6) - [`4f773b7`](https://github.com/bitwarden/android/commit/4f773b710f2fb34c5d3be36e269bd5d7917705bf) PM-10620 prevent account lockout tips screen - [`9a17ccc`](https://github.com/bitwarden/android/commit/9a17ccc91549016ef97edbba21f30d13872a3a74) pr feedback - [`11e32d3`](https://github.com/bitwarden/android/commit/11e32d3b94b00777bee6525491481722cec47c65) y m i the way that i m - [`43cf1fe`](https://github.com/bitwarden/android/commit/43cf1fe0761e0897f2c61f92f9b4a4e116f0a3fa) I could go for some pad thai rn - [`f4b033a`](https://github.com/bitwarden/android/commit/f4b033ade17a905c7ddcf30f8472c37d52bc2840) maybe i got it this time - [`1d1ebe0`](https://github.com/bitwarden/android/commit/1d1ebe0ff6c132b108d4e6ce80adce1c97d2d38f) landscape padding ### 📊 Changes **8 files changed** (+338 additions, -2 deletions) <details> <summary>View changed files</summary> 📝 `app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/auth/AuthNavigation.kt` (+4 -0) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/masterpasswordguidance/MasterPasswordGuidanceScreen.kt` (+1 -2) ➕ `app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/preventaccountlockout/PreventAccountLockoutNavigation.kt` (+30 -0) ➕ `app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/preventaccountlockout/PreventAccountLockoutScreen.kt` (+185 -0) ➕ `app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/preventaccountlockout/PreventAccountLockoutViewModel.kt` (+45 -0) 📝 `app/src/main/res/values/strings.xml` (+7 -0) ➕ `app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/preventaccountlockout/PreventAccountLockoutScreenTest.kt` (+46 -0) ➕ `app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/preventaccountlockout/PreventAccountLockoutViewModelTest.kt` (+20 -0) </details> ### 📄 Description ## 🎟️ Tracking https://bitwarden.atlassian.net/browse/PM-10620 <!-- Paste the link to the Jira or GitHub issue or otherwise describe / point to where this change is coming from. --> ## 📔 Objective Draw screen for the preventing account logout tips. <!-- Describe what the purpose of this PR is, for example what bug you're fixing or new feature you're adding. --> ## 📸 Screenshots [figma link](https://www.figma.com/design/MSaj0DpjVEqCONBcV4WnKD/Bitwarden-Android-Mobile-App-Reskin---V2-(onboarding)?node-id=67412-73121&t=vfBs7OmnOjmoGGQg-4) | Compose Preview | |--------| | ![image](https://github.com/user-attachments/assets/c7ebeb25-bf0e-492f-b3ac-b184def17578) | <!-- 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 2025-11-26 23:43:29 -06:00
Sign in to join this conversation.
No Branch/Tag Specified
Branches Tags
Labels
Clear labels
app:authenticator
app:password-manager
bug
bug-passkey
customer-support
duplicate
enhancement
good first issue
help wanted
needs-reply
needs-response
pull-request
Mirrored from GitHub Pull Request
 question
No Label pull-request
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
GiteaMirror ninjasurge
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: github-starred/android#4364
Delete Branch "%!s()"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?