github-starred/android
2
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2026-03-22 20:41:29 -05:00
Code Issues 144 Packages Projects Releases 118 Wiki Activity

[PR #4668] [MERGED] PM-17839 PM-17827 PM-17824 PM-17832 PM-17836 PM-17840: VaultAddEditScreen and VaultMoveToOrganizationScreen #5115

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

📋 Pull Request Information

Original PR: https://github.com/bitwarden/android/pull/4668
Author: @david-livefront
Created: 1/31/2025
Status: ✅ Merged
Merged: 2/3/2025
Merged by: @david-livefront

Base: main ← Head: PM-17839-PM-17827-PM-17824-PM-17832-PM-17836-PM-17840-update-vault-add-edit-screen-part-1

📝 Commits (1)

  • 11ca659 PM-17839 PM-17827 PM-17824 PM-17832 PM-17836 PM-17840: Update the VaultAddEditScreen and the VaultMoveToOrganizationScreen

📊 Changes

16 files changed (+335 additions, -678 deletions)

View changed files

📝 app/src/main/java/com/x8bit/bitwarden/ui/platform/components/text/BitwardenClickableText.kt (+32 -12)
📝 app/src/main/java/com/x8bit/bitwarden/ui/vault/components/CollectionItemSelector.kt (+12 -4)
📝 app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditCardItems.kt (+8 -119)
📝 app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditIdentityItems.kt (+8 -120)
📝 app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditItemContent.kt (+93 -19)
📝 app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditLoginItems.kt (+59 -148)
📝 app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditSecureNotesItems.kt (+8 -122)
📝 app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditSshKeyItems.kt (+8 -77)
📝 app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditUriItem.kt (+1 -1)
📝 app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/movetoorganization/VaultMoveToOrganizationContent.kt (+11 -21)
➕ app/src/main/res/drawable/ic_camera_small.xml (+14 -0)
➕ app/src/main/res/drawable/ic_favorite_empty.xml (+10 -0)
➕ app/src/main/res/drawable/ic_favorite_full.xml (+9 -0)
📝 app/src/main/res/values/strings.xml (+7 -1)
📝 app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditScreenTest.kt (+27 -28)
📝 app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/movetoorganization/VaultMoveToOrganizationScreenTest.kt (+28 -6)

📄 Description

🎟️ Tracking

PM-17839
PM-17827
PM-17824
PM-17832
PM-17836
PM-17840

📔 Objective

This PR makes changes to the VaultAddEditScreen and VaultMoveToOrganizationScreen to align them to the V3 designs.

Note that there are still more tickets for the VaultAddEditScreen coming. this is just the first round.

📸 Screenshots

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
  • 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/4668 **Author:** [@david-livefront](https://github.com/david-livefront) **Created:** 1/31/2025 **Status:** ✅ Merged **Merged:** 2/3/2025 **Merged by:** [@david-livefront](https://github.com/david-livefront) **Base:** `main` ← **Head:** `PM-17839-PM-17827-PM-17824-PM-17832-PM-17836-PM-17840-update-vault-add-edit-screen-part-1` --- ### 📝 Commits (1) - [`11ca659`](https://github.com/bitwarden/android/commit/11ca659caed34e25085e93e58ce22196cdb0a8a4) PM-17839 PM-17827 PM-17824 PM-17832 PM-17836 PM-17840: Update the VaultAddEditScreen and the VaultMoveToOrganizationScreen ### 📊 Changes **16 files changed** (+335 additions, -678 deletions) <details> <summary>View changed files</summary> 📝 `app/src/main/java/com/x8bit/bitwarden/ui/platform/components/text/BitwardenClickableText.kt` (+32 -12) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/vault/components/CollectionItemSelector.kt` (+12 -4) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditCardItems.kt` (+8 -119) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditIdentityItems.kt` (+8 -120) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditItemContent.kt` (+93 -19) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditLoginItems.kt` (+59 -148) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditSecureNotesItems.kt` (+8 -122) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditSshKeyItems.kt` (+8 -77) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditUriItem.kt` (+1 -1) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/movetoorganization/VaultMoveToOrganizationContent.kt` (+11 -21) ➕ `app/src/main/res/drawable/ic_camera_small.xml` (+14 -0) ➕ `app/src/main/res/drawable/ic_favorite_empty.xml` (+10 -0) ➕ `app/src/main/res/drawable/ic_favorite_full.xml` (+9 -0) 📝 `app/src/main/res/values/strings.xml` (+7 -1) 📝 `app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditScreenTest.kt` (+27 -28) 📝 `app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/movetoorganization/VaultMoveToOrganizationScreenTest.kt` (+28 -6) </details> ### 📄 Description ## 🎟️ Tracking [PM-17839](https://bitwarden.atlassian.net/browse/PM-17839) [PM-17827](https://bitwarden.atlassian.net/browse/PM-17827) [PM-17824](https://bitwarden.atlassian.net/browse/PM-17824) [PM-17832](https://bitwarden.atlassian.net/browse/PM-17832) [PM-17836](https://bitwarden.atlassian.net/browse/PM-17836) [PM-17840](https://bitwarden.atlassian.net/browse/PM-17840) ## 📔 Objective This PR makes changes to the `VaultAddEditScreen` and `VaultMoveToOrganizationScreen` to align them to the V3 designs. Note that there are still more tickets for the `VaultAddEditScreen` coming. this is just the first round. ## 📸 Screenshots | Before | After | | --- | --- | | <img src="https://github.com/user-attachments/assets/3f82dfa2-c171-4ccc-a66a-34988dfc3665" width="300" /> | <img src="https://github.com/user-attachments/assets/16795118-7f01-45e7-9ec9-490b59e3c0ad" width="300" /> | | <img src="https://github.com/user-attachments/assets/9e644314-4884-4fd2-83a2-ce87a1ba3cdf" width="300" /> | <img src="https://github.com/user-attachments/assets/fd275dd7-1bfc-4831-ac01-cb91d2b846cb" width="300" /> | | <img src="https://github.com/user-attachments/assets/24468cc5-96ef-4ab6-ba15-a74288859181" width="300" /> | <img src="https://github.com/user-attachments/assets/c70ad4f0-daad-415d-ac59-c3420748e6a3" width="300" /> | | <img src="https://github.com/user-attachments/assets/52d52e08-fe0f-4588-9388-45084d63c90f" width="300" /> | <img src="https://github.com/user-attachments/assets/a981ba9e-764e-401f-9caa-ff87faa6d505" width="300" /> | | <img src="https://github.com/user-attachments/assets/cd1e63c4-1272-4b5f-af9a-5e554796d0f3" width="300" /> | <img src="https://github.com/user-attachments/assets/1c266347-371d-46cf-90fb-045da181d121" 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 - 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-17839]: https://bitwarden.atlassian.net/browse/PM-17839?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ [PM-17827]: https://bitwarden.atlassian.net/browse/PM-17827?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ [PM-17824]: https://bitwarden.atlassian.net/browse/PM-17824?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ [PM-17832]: https://bitwarden.atlassian.net/browse/PM-17832?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ [PM-17836]: https://bitwarden.atlassian.net/browse/PM-17836?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ [PM-17840]: https://bitwarden.atlassian.net/browse/PM-17840?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:54:14 -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#5115
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?