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 #5279] [MERGED] [PM-22169] Migrate app bar components to ui module #5635

New Issue
Closed
opened 2025-11-27 00:11:16 -06:00 by GiteaMirror · 0 comments
GiteaMirror commented 2025-11-27 00:11:16 -06:00
Owner
Copy Link

📋 Pull Request Information

Original PR: https://github.com/bitwarden/android/pull/5279
Author: @SaintPatrck
Created: 5/28/2025
Status: ✅ Merged
Merged: 5/29/2025
Merged by: @SaintPatrck

Base: main ← Head: ui-module/app-bars

📝 Commits (1)

  • 5f4a1b5 [PM-22169] Migrate app bar components to ui module

📊 Changes

100 files changed (+326 additions, -296 deletions)

View changed files

📝 app/src/main/kotlin/com/x8bit/bitwarden/ui/auth/feature/accountsetup/SetupAutofillScreen.kt (+4 -3)
📝 app/src/main/kotlin/com/x8bit/bitwarden/ui/auth/feature/accountsetup/SetupCompleteScreen.kt (+1 -1)
📝 app/src/main/kotlin/com/x8bit/bitwarden/ui/auth/feature/accountsetup/SetupUnlockScreen.kt (+4 -3)
📝 app/src/main/kotlin/com/x8bit/bitwarden/ui/auth/feature/checkemail/CheckEmailScreen.kt (+1 -1)
📝 app/src/main/kotlin/com/x8bit/bitwarden/ui/auth/feature/completeregistration/CompleteRegistrationScreen.kt (+1 -1)
📝 app/src/main/kotlin/com/x8bit/bitwarden/ui/auth/feature/createaccount/CreateAccountScreen.kt (+3 -2)
📝 app/src/main/kotlin/com/x8bit/bitwarden/ui/auth/feature/enterprisesignon/EnterpriseSignOnScreen.kt (+3 -2)
📝 app/src/main/kotlin/com/x8bit/bitwarden/ui/auth/feature/environment/EnvironmentScreen.kt (+3 -2)
📝 app/src/main/kotlin/com/x8bit/bitwarden/ui/auth/feature/expiredregistrationlink/ExpiredRegistrationLinkScreen.kt (+4 -3)
📝 app/src/main/kotlin/com/x8bit/bitwarden/ui/auth/feature/landing/LandingScreen.kt (+1 -1)
📝 app/src/main/kotlin/com/x8bit/bitwarden/ui/auth/feature/login/LoginScreen.kt (+6 -4)
📝 app/src/main/kotlin/com/x8bit/bitwarden/ui/auth/feature/loginwithdevice/LoginWithDeviceScreen.kt (+3 -2)
📝 app/src/main/kotlin/com/x8bit/bitwarden/ui/auth/feature/masterpasswordgenerator/MasterPasswordGeneratorScreen.kt (+1 -1)
📝 app/src/main/kotlin/com/x8bit/bitwarden/ui/auth/feature/masterpasswordguidance/MasterPasswordGuidanceScreen.kt (+3 -2)
📝 app/src/main/kotlin/com/x8bit/bitwarden/ui/auth/feature/masterpasswordhint/MasterPasswordHintScreen.kt (+3 -2)
📝 app/src/main/kotlin/com/x8bit/bitwarden/ui/auth/feature/preventaccountlockout/PreventAccountLockoutScreen.kt (+3 -2)
📝 app/src/main/kotlin/com/x8bit/bitwarden/ui/auth/feature/removepassword/RemovePasswordScreen.kt (+1 -1)
📝 app/src/main/kotlin/com/x8bit/bitwarden/ui/auth/feature/resetpassword/ResetPasswordScreen.kt (+4 -3)
📝 app/src/main/kotlin/com/x8bit/bitwarden/ui/auth/feature/setpassword/SetPasswordScreen.kt (+1 -1)
📝 app/src/main/kotlin/com/x8bit/bitwarden/ui/auth/feature/startregistration/StartRegistrationScreen.kt (+3 -2)

...and 80 more files

📄 Description

🎟️ Tracking

PM-22169

📔 Objective

This commit moves several app bar related components and resources from the app and authenticator modules to the ui module to improve code organization and reusability.

Specifically, the following changes were made:

  • Moved BitwardenTopAppBar, BitwardenMediumTopAppBar, BitwardenSearchTopAppBar, BitwardenOverflowActionItem, BitwardenSearchActionItem, TopAppBarDividerStyle, and related color files from app to ui.
  • Renamed BitwardenTopAppBar, BitwardenMediumTopAppBar, and BitwardenSearchTopAppBar in the authenticator module to AuthenticatorTopAppBar, AuthenticatorMediumTopAppBar, and AuthenticatorSearchTopAppBar respectively. This is done to distinguish the app bars used in Authenticator until the shared UI is implemented.
  • Moved drawable resources (ic_close.xml, ic_ellipsis_vertical.xml, ic_clear.xml) from app to ui.
  • Deleted ic_more.xml from authenticator as ic_ellipsis_vertical.xml from ui is now used.
  • Updated imports and resource references accordingly.
  • Removed hardcoded string resources for content descriptions in previews, replacing them with direct string literals.
  • Modified BitwardenOverflowActionItem to require contentDescription as a parameter.

⏰ 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/5279 **Author:** [@SaintPatrck](https://github.com/SaintPatrck) **Created:** 5/28/2025 **Status:** ✅ Merged **Merged:** 5/29/2025 **Merged by:** [@SaintPatrck](https://github.com/SaintPatrck) **Base:** `main` ← **Head:** `ui-module/app-bars` --- ### 📝 Commits (1) - [`5f4a1b5`](https://github.com/bitwarden/android/commit/5f4a1b589d30501748f7c8b3253bba87839b863c) [PM-22169] Migrate app bar components to ui module ### 📊 Changes **100 files changed** (+326 additions, -296 deletions) <details> <summary>View changed files</summary> 📝 `app/src/main/kotlin/com/x8bit/bitwarden/ui/auth/feature/accountsetup/SetupAutofillScreen.kt` (+4 -3) 📝 `app/src/main/kotlin/com/x8bit/bitwarden/ui/auth/feature/accountsetup/SetupCompleteScreen.kt` (+1 -1) 📝 `app/src/main/kotlin/com/x8bit/bitwarden/ui/auth/feature/accountsetup/SetupUnlockScreen.kt` (+4 -3) 📝 `app/src/main/kotlin/com/x8bit/bitwarden/ui/auth/feature/checkemail/CheckEmailScreen.kt` (+1 -1) 📝 `app/src/main/kotlin/com/x8bit/bitwarden/ui/auth/feature/completeregistration/CompleteRegistrationScreen.kt` (+1 -1) 📝 `app/src/main/kotlin/com/x8bit/bitwarden/ui/auth/feature/createaccount/CreateAccountScreen.kt` (+3 -2) 📝 `app/src/main/kotlin/com/x8bit/bitwarden/ui/auth/feature/enterprisesignon/EnterpriseSignOnScreen.kt` (+3 -2) 📝 `app/src/main/kotlin/com/x8bit/bitwarden/ui/auth/feature/environment/EnvironmentScreen.kt` (+3 -2) 📝 `app/src/main/kotlin/com/x8bit/bitwarden/ui/auth/feature/expiredregistrationlink/ExpiredRegistrationLinkScreen.kt` (+4 -3) 📝 `app/src/main/kotlin/com/x8bit/bitwarden/ui/auth/feature/landing/LandingScreen.kt` (+1 -1) 📝 `app/src/main/kotlin/com/x8bit/bitwarden/ui/auth/feature/login/LoginScreen.kt` (+6 -4) 📝 `app/src/main/kotlin/com/x8bit/bitwarden/ui/auth/feature/loginwithdevice/LoginWithDeviceScreen.kt` (+3 -2) 📝 `app/src/main/kotlin/com/x8bit/bitwarden/ui/auth/feature/masterpasswordgenerator/MasterPasswordGeneratorScreen.kt` (+1 -1) 📝 `app/src/main/kotlin/com/x8bit/bitwarden/ui/auth/feature/masterpasswordguidance/MasterPasswordGuidanceScreen.kt` (+3 -2) 📝 `app/src/main/kotlin/com/x8bit/bitwarden/ui/auth/feature/masterpasswordhint/MasterPasswordHintScreen.kt` (+3 -2) 📝 `app/src/main/kotlin/com/x8bit/bitwarden/ui/auth/feature/preventaccountlockout/PreventAccountLockoutScreen.kt` (+3 -2) 📝 `app/src/main/kotlin/com/x8bit/bitwarden/ui/auth/feature/removepassword/RemovePasswordScreen.kt` (+1 -1) 📝 `app/src/main/kotlin/com/x8bit/bitwarden/ui/auth/feature/resetpassword/ResetPasswordScreen.kt` (+4 -3) 📝 `app/src/main/kotlin/com/x8bit/bitwarden/ui/auth/feature/setpassword/SetPasswordScreen.kt` (+1 -1) 📝 `app/src/main/kotlin/com/x8bit/bitwarden/ui/auth/feature/startregistration/StartRegistrationScreen.kt` (+3 -2) _...and 80 more files_ </details> ### 📄 Description ## 🎟️ Tracking PM-22169 ## 📔 Objective This commit moves several app bar related components and resources from the `app` and `authenticator` modules to the `ui` module to improve code organization and reusability. Specifically, the following changes were made: - Moved `BitwardenTopAppBar`, `BitwardenMediumTopAppBar`, `BitwardenSearchTopAppBar`, `BitwardenOverflowActionItem`, `BitwardenSearchActionItem`, `TopAppBarDividerStyle`, and related color files from `app` to `ui`. - Renamed `BitwardenTopAppBar`, `BitwardenMediumTopAppBar`, and `BitwardenSearchTopAppBar` in the `authenticator` module to `AuthenticatorTopAppBar`, `AuthenticatorMediumTopAppBar`, and `AuthenticatorSearchTopAppBar` respectively. This is done to distinguish the app bars used in Authenticator until the shared UI is implemented. - Moved drawable resources (`ic_close.xml`, `ic_ellipsis_vertical.xml`, `ic_clear.xml`) from `app` to `ui`. - Deleted `ic_more.xml` from `authenticator` as `ic_ellipsis_vertical.xml` from `ui` is now used. - Updated imports and resource references accordingly. - Removed hardcoded string resources for content descriptions in previews, replacing them with direct string literals. - Modified `BitwardenOverflowActionItem` to require `contentDescription` as a parameter. ## ⏰ 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 --- <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-27 00:11:16 -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#5635
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?