github-starred/android
2
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2026-08-13 22:08:44 -05:00
Code Issues 2.4k Packages Projects Releases 129 Wiki Activity

[PR #6682] [MERGED] misc: Add support for icons in buttons via BitwardenButtonData #70736

New Issue
Closed
opened 2026-05-14 13:31:05 -05:00 by GiteaMirror · 0 comments
GiteaMirror commented 2026-05-14 13:31:05 -05:00
Owner
Copy Link
Copy Source

📋 Pull Request Information

Original PR: https://github.com/bitwarden/android/pull/6682
Author: @david-livefront
Created: 3/17/2026
Status: ✅ Merged
Merged: 3/17/2026
Merged by: @david-livefront

Base: main ← Head: button-icon-usage

📝 Commits (1)

  • d52ab68 Add support for icons in buttons via BitwardenButtonData

📊 Changes

9 files changed (+48 additions, -20 deletions)

View changed files

📝 app/src/main/kotlin/com/x8bit/bitwarden/ui/tools/feature/send/SendScreen.kt (+6 -1)
📝 app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemScreen.kt (+7 -1)
📝 app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingScreen.kt (+5 -1)
📝 app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/vault/VaultScreen.kt (+6 -1)
📝 app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/verificationcode/VerificationCodeScreen.kt (+6 -1)
📝 ui/src/main/kotlin/com/bitwarden/ui/platform/components/button/model/BitwardenButtonData.kt (+6 -3)
📝 ui/src/main/kotlin/com/bitwarden/ui/platform/components/card/BitwardenActionCard.kt (+1 -0)
📝 ui/src/main/kotlin/com/bitwarden/ui/platform/components/content/BitwardenEmptyContent.kt (+2 -0)
📝 ui/src/main/kotlin/com/bitwarden/ui/platform/components/content/BitwardenErrorContent.kt (+9 -12)

📄 Description

🎟️ Tracking

N/A

📔 Objective

This PR adds an icon to the BitwardenButtonData making it easier to apply icons to buttons inside content such as the BitwardenErrorContent.

Additionally, the BitwardenTextButton havs been updated to be a BitwardenFilledButton.

📸 Screenshots

Before After

🔄 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/6682 **Author:** [@david-livefront](https://github.com/david-livefront) **Created:** 3/17/2026 **Status:** ✅ Merged **Merged:** 3/17/2026 **Merged by:** [@david-livefront](https://github.com/david-livefront) **Base:** `main` ← **Head:** `button-icon-usage` --- ### 📝 Commits (1) - [`d52ab68`](https://github.com/bitwarden/android/commit/d52ab68124bb69a5fd1534b989789c7c9f6c4a79) Add support for icons in buttons via BitwardenButtonData ### 📊 Changes **9 files changed** (+48 additions, -20 deletions) <details> <summary>View changed files</summary> 📝 `app/src/main/kotlin/com/x8bit/bitwarden/ui/tools/feature/send/SendScreen.kt` (+6 -1) 📝 `app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemScreen.kt` (+7 -1) 📝 `app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingScreen.kt` (+5 -1) 📝 `app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/vault/VaultScreen.kt` (+6 -1) 📝 `app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/verificationcode/VerificationCodeScreen.kt` (+6 -1) 📝 `ui/src/main/kotlin/com/bitwarden/ui/platform/components/button/model/BitwardenButtonData.kt` (+6 -3) 📝 `ui/src/main/kotlin/com/bitwarden/ui/platform/components/card/BitwardenActionCard.kt` (+1 -0) 📝 `ui/src/main/kotlin/com/bitwarden/ui/platform/components/content/BitwardenEmptyContent.kt` (+2 -0) 📝 `ui/src/main/kotlin/com/bitwarden/ui/platform/components/content/BitwardenErrorContent.kt` (+9 -12) </details> ### 📄 Description ## 🎟️ Tracking N/A ## 📔 Objective This PR adds an icon to the `BitwardenButtonData` making it easier to apply icons to buttons inside content such as the `BitwardenErrorContent`. Additionally, the `BitwardenTextButton` havs been updated to be a `BitwardenFilledButton`. ## 📸 Screenshots | Before | After | | --- | --- | | <img width="350" src="https://github.com/user-attachments/assets/21fd4a8a-b764-4db5-ba89-b66054a5188b" /> | <img width="350" src="https://github.com/user-attachments/assets/c4f84c95-2147-43bc-9537-1b1a071d8d22" /> | --- <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-14 13:31:05 -05: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 labels pull-request
Milestone
No items
No Milestone
Projects
Clear projects
No projects
Assignees
Clear assignees
GiteaMirror ninjasurge (Kaehlen Rog)
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: github-starred/android#70736