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 #4361] [MERGED] PM-15067 - Design Audit - Prevent Account Lockout Screen #4893

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

📋 Pull Request Information

Original PR: https://github.com/bitwarden/android/pull/4361
Author: @phil-livefront
Created: 11/21/2024
Status: ✅ Merged
Merged: 11/22/2024
Merged by: @phil-livefront

Base: main ← Head: phil/PM-15067-design-audit-prevent-account-lockout-screen

📝 Commits (10+)

  • 46d66ff PM-15067 - Design Audit - Prevent Account Lock Screen
  • c804a51 cleanup of view layout logic
  • 4f6a88a Merge branch 'main' into phil/PM-15067-design-audit-prevent-account-lockout-screen
  • 125054d Merge branch 'main' into phil/PM-15067-design-audit-prevent-account-lockout-screen
  • 55db464 update with recent changes from main
  • a47944b update with recent changes from main and fix right padding on BitwardenContentBlock
  • 549c21a Merge branch 'phil/PM-15067-design-audit-prevent-account-lockout-screen' of https://github.com/bitwarden/android into phil/PM-15067-design-audit-prevent-account-lockout-screen
  • 4d85833 fixed missing trailing comma
  • d28d9ea fix padding for real this time
  • 8aebb4a fix trailing comma and max line lint errors

📊 Changes

2 files changed (+31 additions, -83 deletions)

View changed files

📝 app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/preventaccountlockout/PreventAccountLockoutScreen.kt (+29 -81)
📝 app/src/main/java/com/x8bit/bitwarden/ui/platform/components/content/BitwardenContentBlock.kt (+2 -2)

📄 Description

🎟️ Tracking

PM-15067

📔 Objective

  • Center align the title and subtitle text
  • Updated the PreventAccountLockoutScreen to use the BitwardenContentCard which matches the figma designs

📸 Screenshots

PreventAccountLockoutScreen

⏰ 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/4361 **Author:** [@phil-livefront](https://github.com/phil-livefront) **Created:** 11/21/2024 **Status:** ✅ Merged **Merged:** 11/22/2024 **Merged by:** [@phil-livefront](https://github.com/phil-livefront) **Base:** `main` ← **Head:** `phil/PM-15067-design-audit-prevent-account-lockout-screen` --- ### 📝 Commits (10+) - [`46d66ff`](https://github.com/bitwarden/android/commit/46d66ffa8ed7346599de87e5026fadeabadd3c41) PM-15067 - Design Audit - Prevent Account Lock Screen - [`c804a51`](https://github.com/bitwarden/android/commit/c804a51046041d8543c6cab8a73c2de67f0be841) cleanup of view layout logic - [`4f6a88a`](https://github.com/bitwarden/android/commit/4f6a88a76eb389c10165711186f0f8ed27495cb8) Merge branch 'main' into phil/PM-15067-design-audit-prevent-account-lockout-screen - [`125054d`](https://github.com/bitwarden/android/commit/125054d3dca2753e759d1b5088520e3d2c82efbc) Merge branch 'main' into phil/PM-15067-design-audit-prevent-account-lockout-screen - [`55db464`](https://github.com/bitwarden/android/commit/55db464479012b5181429054c1bf8a1205fe64a1) update with recent changes from main - [`a47944b`](https://github.com/bitwarden/android/commit/a47944b689b347c90bd47477b29241b73109d06b) update with recent changes from main and fix right padding on BitwardenContentBlock - [`549c21a`](https://github.com/bitwarden/android/commit/549c21a221c99a9f287223a1ba2ade4f19b85831) Merge branch 'phil/PM-15067-design-audit-prevent-account-lockout-screen' of https://github.com/bitwarden/android into phil/PM-15067-design-audit-prevent-account-lockout-screen - [`4d85833`](https://github.com/bitwarden/android/commit/4d85833c81a8785cf4282435c48472b48e117318) fixed missing trailing comma - [`d28d9ea`](https://github.com/bitwarden/android/commit/d28d9ea732778fd61c7d685170461f00db0d5141) fix padding for real this time - [`8aebb4a`](https://github.com/bitwarden/android/commit/8aebb4a251106c8b0257d07598e1a0c9a3402c00) fix trailing comma and max line lint errors ### 📊 Changes **2 files changed** (+31 additions, -83 deletions) <details> <summary>View changed files</summary> 📝 `app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/preventaccountlockout/PreventAccountLockoutScreen.kt` (+29 -81) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/platform/components/content/BitwardenContentBlock.kt` (+2 -2) </details> ### 📄 Description ## 🎟️ Tracking [PM-15067](https://bitwarden.atlassian.net/browse/PM-15067) ## 📔 Objective - Center align the title and subtitle text - Updated the `PreventAccountLockoutScreen` to use the `BitwardenContentCard` which matches the figma designs ## 📸 Screenshots ![PreventAccountLockoutScreen](https://github.com/user-attachments/assets/7c901433-d4ff-4e9a-9f5a-85e0921256b6) ## ⏰ 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 [PM-15067]: https://bitwarden.atlassian.net/browse/PM-15067?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 2025-11-26 23:51:11 -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#4893
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?