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

[PR #4149] [MERGED] PM-13937: Consolidate button UI and logic #4725

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

📋 Pull Request Information

Original PR: https://github.com/bitwarden/android/pull/4149
Author: @david-livefront
Created: 10/24/2024
Status: ✅ Merged
Merged: 10/24/2024
Merged by: @david-livefront

Base: main ← Head: PM-13937-simplify-buttons

📝 Commits (1)

  • ddae7ee PM-13937: Consolidate button UI and logic

📊 Changes

16 files changed (+229 additions, -370 deletions)

View changed files

📝 app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/login/LoginScreen.kt (+3 -3)
📝 app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/masterpasswordgenerator/MasterPasswordGeneratorScreen.kt (+2 -2)
📝 app/src/main/java/com/x8bit/bitwarden/ui/platform/components/button/BitwardenFilledButton.kt (+47 -18)
➖ app/src/main/java/com/x8bit/bitwarden/ui/platform/components/button/BitwardenFilledButtonWithIcon.kt (+0 -72)
📝 app/src/main/java/com/x8bit/bitwarden/ui/platform/components/button/BitwardenFilledErrorButton.kt (+28 -27)
📝 app/src/main/java/com/x8bit/bitwarden/ui/platform/components/button/BitwardenFilledTonalButton.kt (+40 -5)
➖ app/src/main/java/com/x8bit/bitwarden/ui/platform/components/button/BitwardenFilledTonalButtonWithIcon.kt (+0 -70)
📝 app/src/main/java/com/x8bit/bitwarden/ui/platform/components/button/BitwardenOutlinedButton.kt (+44 -18)
➖ app/src/main/java/com/x8bit/bitwarden/ui/platform/components/button/BitwardenOutlinedButtonWithIcon.kt (+0 -91)
📝 app/src/main/java/com/x8bit/bitwarden/ui/platform/components/button/BitwardenOutlinedErrorButton.kt (+43 -40)
📝 app/src/main/java/com/x8bit/bitwarden/ui/platform/components/button/BitwardenTextButton.kt (+15 -5)
📝 app/src/main/java/com/x8bit/bitwarden/ui/platform/components/button/color/BitwardenButtonColors.kt (+0 -11)
📝 app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/accountsecurity/pendingrequests/PendingRequestsScreen.kt (+2 -2)
📝 app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/send/SendEmpty.kt (+2 -2)
📝 app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditLoginItems.kt (+1 -2)
📝 app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultNoItems.kt (+2 -2)

📄 Description

🎟️ Tracking

PM-13937

📔 Objective

This PR consolidates buttons to make them more flexible and have reduce code duplication.

⏰ 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/4149 **Author:** [@david-livefront](https://github.com/david-livefront) **Created:** 10/24/2024 **Status:** ✅ Merged **Merged:** 10/24/2024 **Merged by:** [@david-livefront](https://github.com/david-livefront) **Base:** `main` ← **Head:** `PM-13937-simplify-buttons` --- ### 📝 Commits (1) - [`ddae7ee`](https://github.com/bitwarden/android/commit/ddae7ee2ebc4b2802615aa4ae54713a1d86a7215) PM-13937: Consolidate button UI and logic ### 📊 Changes **16 files changed** (+229 additions, -370 deletions) <details> <summary>View changed files</summary> 📝 `app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/login/LoginScreen.kt` (+3 -3) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/masterpasswordgenerator/MasterPasswordGeneratorScreen.kt` (+2 -2) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/platform/components/button/BitwardenFilledButton.kt` (+47 -18) ➖ `app/src/main/java/com/x8bit/bitwarden/ui/platform/components/button/BitwardenFilledButtonWithIcon.kt` (+0 -72) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/platform/components/button/BitwardenFilledErrorButton.kt` (+28 -27) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/platform/components/button/BitwardenFilledTonalButton.kt` (+40 -5) ➖ `app/src/main/java/com/x8bit/bitwarden/ui/platform/components/button/BitwardenFilledTonalButtonWithIcon.kt` (+0 -70) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/platform/components/button/BitwardenOutlinedButton.kt` (+44 -18) ➖ `app/src/main/java/com/x8bit/bitwarden/ui/platform/components/button/BitwardenOutlinedButtonWithIcon.kt` (+0 -91) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/platform/components/button/BitwardenOutlinedErrorButton.kt` (+43 -40) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/platform/components/button/BitwardenTextButton.kt` (+15 -5) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/platform/components/button/color/BitwardenButtonColors.kt` (+0 -11) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/accountsecurity/pendingrequests/PendingRequestsScreen.kt` (+2 -2) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/send/SendEmpty.kt` (+2 -2) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditLoginItems.kt` (+1 -2) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultNoItems.kt` (+2 -2) </details> ### 📄 Description ## 🎟️ Tracking [PM-13937](https://bitwarden.atlassian.net/browse/PM-13937) ## 📔 Objective This PR consolidates buttons to make them more flexible and have reduce code duplication. ## ⏰ 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-13937]: https://bitwarden.atlassian.net/browse/PM-13937?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:48:54 -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#4725
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?