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

[PR #4941] [MERGED] PM-19723 Group "no folder" items when there is a collection present. #5334

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

📋 Pull Request Information

Original PR: https://github.com/bitwarden/android/pull/4941
Author: @dseverns-livefront
Created: 3/31/2025
Status: ✅ Merged
Merged: 3/31/2025
Merged by: @dseverns-livefront

Base: main ← Head: PM-19723-group-to-no-folder-when-collection-exists

📝 Commits (3)

  • 8496af0 PM-19723 place no folder items in No Folder folder when a collection view also exists.
  • 5cbec9d formatting
  • 797b31e Revert function visibility and fix test

📊 Changes

3 files changed (+101 additions, -4 deletions)

View changed files

📝 app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/util/VaultDataExtensions.kt (+4 -2)
📝 app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultViewModelTest.kt (+20 -0)
📝 app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/vault/util/VaultDataExtensionsTest.kt (+77 -2)

📄 Description

🎟️ Tracking

PM-19723

📔 Objective

  • Add a check to see if any collection view exists.
  • If a collection view exists or the vault items with no folder amount is greater than 100 then group all those items in a "No Folder" folder.

📸 Screenshots

BEFORE

https://github.com/user-attachments/assets/c2babfed-0414-468b-8767-467cf8727308

AFTER

https://github.com/user-attachments/assets/e7281ad6-36ff-44f5-98d5-a5e01231e325

⏰ 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/4941 **Author:** [@dseverns-livefront](https://github.com/dseverns-livefront) **Created:** 3/31/2025 **Status:** ✅ Merged **Merged:** 3/31/2025 **Merged by:** [@dseverns-livefront](https://github.com/dseverns-livefront) **Base:** `main` ← **Head:** `PM-19723-group-to-no-folder-when-collection-exists` --- ### 📝 Commits (3) - [`8496af0`](https://github.com/bitwarden/android/commit/8496af0efaccfe849da94cfb17217721c1b666e4) PM-19723 place no folder items in No Folder folder when a collection view also exists. - [`5cbec9d`](https://github.com/bitwarden/android/commit/5cbec9d7c399c10b2d9b89960eecc01564ed8cc7) formatting - [`797b31e`](https://github.com/bitwarden/android/commit/797b31eaf9b35fb82d57c80a3c76da6bd8349b9b) Revert function visibility and fix test ### 📊 Changes **3 files changed** (+101 additions, -4 deletions) <details> <summary>View changed files</summary> 📝 `app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/util/VaultDataExtensions.kt` (+4 -2) 📝 `app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultViewModelTest.kt` (+20 -0) 📝 `app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/vault/util/VaultDataExtensionsTest.kt` (+77 -2) </details> ### 📄 Description ## 🎟️ Tracking [PM-19723](https://bitwarden.atlassian.net/browse/PM-19723) <!-- Paste the link to the Jira or GitHub issue or otherwise describe / point to where this change is coming from. --> ## 📔 Objective - Add a check to see if any collection view exists. - If a collection view exists or the vault items with no folder amount is greater than 100 then group all those items in a "No Folder" folder. <!-- Describe what the purpose of this PR is, for example what bug you're fixing or new feature you're adding. --> ## 📸 Screenshots **BEFORE** https://github.com/user-attachments/assets/c2babfed-0414-468b-8767-467cf8727308 **AFTER** https://github.com/user-attachments/assets/e7281ad6-36ff-44f5-98d5-a5e01231e325 <!-- 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 - 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-19723]: https://bitwarden.atlassian.net/browse/PM-19723?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:10 -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#5334
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?