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

[PR #4703] [MERGED] PM-18058 and PM-18059 Choose which type of vault item to add from Vault screen and inside a Folder. #5142

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

📋 Pull Request Information

Original PR: https://github.com/bitwarden/android/pull/4703
Author: @dseverns-livefront
Created: 2/7/2025
Status: ✅ Merged
Merged: 2/12/2025
Merged by: @dseverns-livefront

Base: main ← Head: PM-18058-PM-18059-add-cipher-items-dialog

📝 Commits (9)

  • 3e83623 PM-18058 and PM-18059 choose which type of vault item to add from main vault screen and from withing a folder.
  • f2dbdef remove unused string
  • 4b30e5b update nav arg list in builder
  • 8ec2de9 remove uncessary let
  • 4f9f103 pr feedback keep VaultItems safe
  • 05baaeb add test
  • 1accea7 remove option
  • 0373665 whoops
  • 91067ef Update dialog

📊 Changes

29 files changed (+728 additions, -87 deletions)

View changed files

📝 app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/folders/addedit/FolderAddEditNavigation.kt (+16 -3)
📝 app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/folders/addedit/FolderAddEditViewModel.kt (+12 -4)
📝 app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/vaultunlocked/VaultUnlockedNavigation.kt (+12 -0)
📝 app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/vaultunlockednavbar/VaultUnlockedNavBarNavigation.kt (+2 -0)
📝 app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/vaultunlockednavbar/VaultUnlockedNavBarScreen.kt (+4 -0)
➕ app/src/main/java/com/x8bit/bitwarden/ui/vault/components/VaultItemSelectionDialog.kt (+47 -0)
➕ app/src/main/java/com/x8bit/bitwarden/ui/vault/components/model/CreateVaultItemType.kt (+41 -0)
➕ app/src/main/java/com/x8bit/bitwarden/ui/vault/components/util/CreateVaultItemTypeExtensions.kt (+17 -0)
📝 app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingNavigation.kt (+8 -0)
📝 app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingScreen.kt (+24 -0)
📝 app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingViewModel.kt (+79 -12)
📝 app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/util/VaultItemListingDataExtensions.kt (+9 -6)
📝 app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/util/FolderViewExtensions.kt (+1 -15)
📝 app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultGraphNavigation.kt (+4 -1)
📝 app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultNavigation.kt (+4 -1)
📝 app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultScreen.kt (+25 -4)
📝 app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultViewModel.kt (+60 -7)
📝 app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/handlers/VaultHandlers.kt (+7 -2)
📝 app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/settings/folders/addedit/FolderAddEditScreenTest.kt (+2 -0)
📝 app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/settings/folders/addedit/FolderAddEditViewModelTest.kt (+90 -0)

...and 9 more files

📄 Description

🎟️ Tracking

PM-18058
PM-18059

also addresses a kick back on PM-17766

📔 Objective

  • From the Vault screen clicking the FAB should bring up a dialog to select the type of vault item to add. Included items: Login, Card, Identity, Secure Note, and Folder.
  • From inside a folder should be able to add the same types of vault items, should also get the dialog if the folder is empty and user selects the "+ New item" button.
  • Allow for creations of sub-folders within the Add folder screen.

📸 Screenshots

https://github.com/user-attachments/assets/c139b93d-dd15-4185-a4aa-97d78dbced05

⏰ 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/4703 **Author:** [@dseverns-livefront](https://github.com/dseverns-livefront) **Created:** 2/7/2025 **Status:** ✅ Merged **Merged:** 2/12/2025 **Merged by:** [@dseverns-livefront](https://github.com/dseverns-livefront) **Base:** `main` ← **Head:** `PM-18058-PM-18059-add-cipher-items-dialog` --- ### 📝 Commits (9) - [`3e83623`](https://github.com/bitwarden/android/commit/3e83623a6792c842b02a0848955bdd18cabbcc0d) PM-18058 and PM-18059 choose which type of vault item to add from main vault screen and from withing a folder. - [`f2dbdef`](https://github.com/bitwarden/android/commit/f2dbdef4da0c1592e393be6287a8bad95d65c999) remove unused string - [`4b30e5b`](https://github.com/bitwarden/android/commit/4b30e5b1d637dd3f79e09abe3d6d5650056d4453) update nav arg list in builder - [`8ec2de9`](https://github.com/bitwarden/android/commit/8ec2de94dc4e46aaa53e75326fba005e6106103d) remove uncessary let - [`4f9f103`](https://github.com/bitwarden/android/commit/4f9f10329502ea5c776671ebf279039858b9b99d) pr feedback keep VaultItems safe - [`05baaeb`](https://github.com/bitwarden/android/commit/05baaeb81b57ffa308627f3ebbd1893d7573e142) add test - [`1accea7`](https://github.com/bitwarden/android/commit/1accea79966bf514f5849f59e88c5a1761918711) remove option - [`0373665`](https://github.com/bitwarden/android/commit/0373665eb0dec6c23e44ee9cf34ee2b2f4438cd9) whoops - [`91067ef`](https://github.com/bitwarden/android/commit/91067efd0d74b049f44f9274be9244f37338e89e) Update dialog ### 📊 Changes **29 files changed** (+728 additions, -87 deletions) <details> <summary>View changed files</summary> 📝 `app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/folders/addedit/FolderAddEditNavigation.kt` (+16 -3) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/folders/addedit/FolderAddEditViewModel.kt` (+12 -4) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/vaultunlocked/VaultUnlockedNavigation.kt` (+12 -0) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/vaultunlockednavbar/VaultUnlockedNavBarNavigation.kt` (+2 -0) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/vaultunlockednavbar/VaultUnlockedNavBarScreen.kt` (+4 -0) ➕ `app/src/main/java/com/x8bit/bitwarden/ui/vault/components/VaultItemSelectionDialog.kt` (+47 -0) ➕ `app/src/main/java/com/x8bit/bitwarden/ui/vault/components/model/CreateVaultItemType.kt` (+41 -0) ➕ `app/src/main/java/com/x8bit/bitwarden/ui/vault/components/util/CreateVaultItemTypeExtensions.kt` (+17 -0) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingNavigation.kt` (+8 -0) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingScreen.kt` (+24 -0) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingViewModel.kt` (+79 -12) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/util/VaultItemListingDataExtensions.kt` (+9 -6) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/util/FolderViewExtensions.kt` (+1 -15) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultGraphNavigation.kt` (+4 -1) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultNavigation.kt` (+4 -1) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultScreen.kt` (+25 -4) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultViewModel.kt` (+60 -7) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/handlers/VaultHandlers.kt` (+7 -2) 📝 `app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/settings/folders/addedit/FolderAddEditScreenTest.kt` (+2 -0) 📝 `app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/settings/folders/addedit/FolderAddEditViewModelTest.kt` (+90 -0) _...and 9 more files_ </details> ### 📄 Description ## 🎟️ Tracking [PM-18058](https://bitwarden.atlassian.net/browse/PM-18058) [PM-18059](https://bitwarden.atlassian.net/browse/PM-18059) also addresses a kick back on PM-17766 <!-- Paste the link to the Jira or GitHub issue or otherwise describe / point to where this change is coming from. --> ## 📔 Objective - From the Vault screen clicking the FAB should bring up a dialog to select the type of vault item to add. Included items: Login, Card, Identity, Secure Note, and Folder. - From inside a folder should be able to add the same types of vault items, should also get the dialog if the folder is empty and user selects the "+ New item" button. - Allow for creations of sub-folders within the Add folder screen. <!-- Describe what the purpose of this PR is, for example what bug you're fixing or new feature you're adding. --> ## 📸 Screenshots https://github.com/user-attachments/assets/c139b93d-dd15-4185-a4aa-97d78dbced05 <!-- 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 [PM-18058]: https://bitwarden.atlassian.net/browse/PM-18058?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ [PM-18059]: https://bitwarden.atlassian.net/browse/PM-18059?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:36 -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#5142
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?