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 #4357] [MERGED] Refactor usage of the ContentCard to always use the ContentBlock component. #4889

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

📋 Pull Request Information

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

Base: main ← Head: content-block-refactor

📝 Commits (3)

  • ad82edc PM-15067 Refactor usage of the ContentCard to always use the ContentBlock component remove custom instruction row stuffs
  • 9aabae7 simplify
  • 19346b7 feedback

📊 Changes

6 files changed (+159 additions, -216 deletions)

View changed files

📝 app/src/main/java/com/x8bit/bitwarden/ui/platform/components/card/BitwardenContentCard.kt (+22 -29)
📝 app/src/main/java/com/x8bit/bitwarden/ui/platform/components/content/BitwardenContentBlock.kt (+76 -22)
📝 app/src/main/java/com/x8bit/bitwarden/ui/platform/components/model/ContentBlockData.kt (+4 -3)
📝 app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/importlogins/ImportLoginsScreen.kt (+40 -46)
📝 app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/importlogins/components/ImportLoginsInstructionStep.kt (+17 -20)
➖ app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/importlogins/components/InstructionRowItem.kt (+0 -96)

📄 Description

🎟️ Tracking

In support of the changes for https://bitwarden.atlassian.net/browse/PM-15067 and other design audits

📔 Objective

  • Normalize usage of the content block and card to be more consistent.

📸 Screenshots

  • no visual change just syntax

⏰ 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/4357 **Author:** [@dseverns-livefront](https://github.com/dseverns-livefront) **Created:** 11/21/2024 **Status:** ✅ Merged **Merged:** 11/21/2024 **Merged by:** [@dseverns-livefront](https://github.com/dseverns-livefront) **Base:** `main` ← **Head:** `content-block-refactor` --- ### 📝 Commits (3) - [`ad82edc`](https://github.com/bitwarden/android/commit/ad82edc5d3ce78068ce120870a6d593bfd9e9424) PM-15067 Refactor usage of the ContentCard to always use the ContentBlock component remove custom instruction row stuffs - [`9aabae7`](https://github.com/bitwarden/android/commit/9aabae789c386884fc0cb18976803b25e4a6a862) simplify - [`19346b7`](https://github.com/bitwarden/android/commit/19346b7fd9812aa93a2ecd418dd1e98f2cd34735) feedback ### 📊 Changes **6 files changed** (+159 additions, -216 deletions) <details> <summary>View changed files</summary> 📝 `app/src/main/java/com/x8bit/bitwarden/ui/platform/components/card/BitwardenContentCard.kt` (+22 -29) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/platform/components/content/BitwardenContentBlock.kt` (+76 -22) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/platform/components/model/ContentBlockData.kt` (+4 -3) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/importlogins/ImportLoginsScreen.kt` (+40 -46) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/importlogins/components/ImportLoginsInstructionStep.kt` (+17 -20) ➖ `app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/importlogins/components/InstructionRowItem.kt` (+0 -96) </details> ### 📄 Description ## 🎟️ Tracking In support of the changes for https://bitwarden.atlassian.net/browse/PM-15067 and other design audits <!-- Paste the link to the Jira or GitHub issue or otherwise describe / point to where this change is coming from. --> ## 📔 Objective - Normalize usage of the content block and card to be more consistent. <!-- Describe what the purpose of this PR is, for example what bug you're fixing or new feature you're adding. --> ## 📸 Screenshots - no visual change just syntax <!-- 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:51:08 -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#4889
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?