[PR #4963] [MERGED] PM-19807: Remove IconResource class #5353

Closed
opened 2025-11-26 23:58:34 -06:00 by GiteaMirror · 0 comments
Owner

📋 Pull Request Information

Original PR: https://github.com/bitwarden/android/pull/4963
Author: @david-livefront
Created: 4/2/2025
Status: Merged
Merged: 4/2/2025
Merged by: @david-livefront

Base: mainHead: PM-19807-remove-icon-resource


📝 Commits (1)

  • 9db1a6c PM-19807: Remove IconResource class

📊 Changes

28 files changed (+161 additions, -224 deletions)

View changed files

📝 app/src/main/java/com/x8bit/bitwarden/ui/platform/components/field/BitwardenTextField.kt (+11 -11)
📝 app/src/main/java/com/x8bit/bitwarden/ui/platform/components/icon/BitwardenIcon.kt (+5 -6)
📝 app/src/main/java/com/x8bit/bitwarden/ui/platform/components/listitem/BitwardenListItem.kt (+5 -11)
📝 app/src/main/java/com/x8bit/bitwarden/ui/platform/components/model/IconData.kt (+19 -2)
app/src/main/java/com/x8bit/bitwarden/ui/platform/components/model/IconResource.kt (+0 -54)
📝 app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/search/SearchContent.kt (+1 -5)
📝 app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/search/SearchViewModel.kt (+2 -2)
📝 app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/send/SendContent.kt (+1 -2)
📝 app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/send/SendListItem.kt (+2 -12)
📝 app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/send/SendViewModel.kt (+3 -2)
📝 app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/send/util/SendViewExtensions.kt (+6 -3)
📝 app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/item/component/ItemHeader.kt (+0 -1)
📝 app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/item/component/VaultItemCustomField.kt (+5 -5)
📝 app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingContent.kt (+1 -5)
📝 app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingViewModel.kt (+1 -2)
📝 app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/util/CipherViewExtensions.kt (+6 -3)
📝 app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultContent.kt (+2 -10)
📝 app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultEntryListItem.kt (+1 -2)
📝 app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultViewModel.kt (+8 -7)
📝 app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/verificationcode/VerificationCodeItem.kt (+0 -1)

...and 8 more files

📄 Description

🎟️ Tracking

PM-19807

📔 Objective

This PR removes the IconResource wrapper class and consolidates functionality around the IconData class which allows for more functionality.

📸 Screenshots

There should be no change here!

Before After

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/4963 **Author:** [@david-livefront](https://github.com/david-livefront) **Created:** 4/2/2025 **Status:** ✅ Merged **Merged:** 4/2/2025 **Merged by:** [@david-livefront](https://github.com/david-livefront) **Base:** `main` ← **Head:** `PM-19807-remove-icon-resource` --- ### 📝 Commits (1) - [`9db1a6c`](https://github.com/bitwarden/android/commit/9db1a6cfb4f389a7374caafe62e25c908d77c654) PM-19807: Remove IconResource class ### 📊 Changes **28 files changed** (+161 additions, -224 deletions) <details> <summary>View changed files</summary> 📝 `app/src/main/java/com/x8bit/bitwarden/ui/platform/components/field/BitwardenTextField.kt` (+11 -11) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/platform/components/icon/BitwardenIcon.kt` (+5 -6) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/platform/components/listitem/BitwardenListItem.kt` (+5 -11) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/platform/components/model/IconData.kt` (+19 -2) ➖ `app/src/main/java/com/x8bit/bitwarden/ui/platform/components/model/IconResource.kt` (+0 -54) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/search/SearchContent.kt` (+1 -5) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/search/SearchViewModel.kt` (+2 -2) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/send/SendContent.kt` (+1 -2) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/send/SendListItem.kt` (+2 -12) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/send/SendViewModel.kt` (+3 -2) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/send/util/SendViewExtensions.kt` (+6 -3) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/item/component/ItemHeader.kt` (+0 -1) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/item/component/VaultItemCustomField.kt` (+5 -5) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingContent.kt` (+1 -5) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingViewModel.kt` (+1 -2) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/util/CipherViewExtensions.kt` (+6 -3) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultContent.kt` (+2 -10) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultEntryListItem.kt` (+1 -2) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultViewModel.kt` (+8 -7) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/verificationcode/VerificationCodeItem.kt` (+0 -1) _...and 8 more files_ </details> ### 📄 Description ## 🎟️ Tracking [PM-19807](https://bitwarden.atlassian.net/browse/PM-19807) ## 📔 Objective This PR removes the `IconResource` wrapper class and consolidates functionality around the `IconData` class which allows for more functionality. ## 📸 Screenshots There should be no change here! | Before | After | | --- | --- | | <img src="https://github.com/user-attachments/assets/6c922f5c-33cf-45f2-be14-e07dd2de24d1" width="300" /> | <img src="https://github.com/user-attachments/assets/2d027f22-6d91-4c4e-a3cb-2596534e7fcf" width="300" /> | ## ⏰ 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 [PM-19807]: https://bitwarden.atlassian.net/browse/PM-19807?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:58:34 -06:00
Sign in to join this conversation.
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: github-starred/android#5353