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

[PR #2408] [MERGED] [PM-1133] OTP Handling - Update empty states #3548

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

📋 Pull Request Information

Original PR: https://github.com/bitwarden/android/pull/2408
Author: @fedemkr
Created: 3/8/2023
Status: ✅ Merged
Merged: 3/8/2023
Merged by: @fedemkr

Base: feature/EC-979-iOS-third-party-2fa ← Head: feature/ios-third-party-2fa/PM-1133-update-empty-states

📝 Commits (2)

  • 6d2ed25 PM-1133 Updated empty states for search and cipher selection on otp flow
  • e3c41cf Merge branch 'feature/EC-979-iOS-third-party-2fa' into feature/ios-third-party-2fa/PM-1133-update-empty-states

📊 Changes

13 files changed (+479 additions, -301 deletions)

View changed files

📝 src/App/Pages/Vault/CipherSelectionPage.xaml (+2 -0)
📝 src/App/Pages/Vault/CipherSelectionPageViewModel.cs (+1 -1)
📝 src/App/Pages/Vault/CiphersPage.xaml (+16 -6)
📝 src/App/Pages/Vault/CiphersPageViewModel.cs (+14 -1)
📝 src/App/Pages/Vault/OTPCipherSelectionPageViewModel.cs (+4 -2)
📝 src/App/Resources/AppResources.Designer.cs (+27 -0)
📝 src/App/Resources/AppResources.resx (+9 -0)
➕ src/iOS/Resources/Assets.xcassets/Contents.json (+6 -0)
➕ src/iOS/Resources/Assets.xcassets/empty_items_state.imageset/Contents.json (+25 -0)
➕ src/iOS/Resources/Assets.xcassets/empty_items_state.imageset/Empty-items-state-dark.pdf (+0 -0)
➕ src/iOS/Resources/Assets.xcassets/empty_items_state.imageset/Empty-items-state.pdf (+0 -0)
📝 src/iOS/Resources/Assets.xcassets/ic_warning.imageset/Contents.json (+371 -291)
📝 src/iOS/iOS.csproj (+4 -0)

📄 Description

Type of change

  • Bug fix
  • New feature development
  • Tech debt (refactoring, code cleanup, dependency upgrades, etc)
  • Build/deploy pipeline (DevOps)
  • Other

Objective

Update empty states when selecting a cipher on the OTP handling flow and on the search.

Code changes

  • CipherSelectionPage.xaml: Added empty image
  • CiphersPage.xaml: Updated empty state layout and added image to it
  • CiphersPageViewModel: Added ability to add a cipher from the button showed on empty state and also added ShowAddCipher to check when to display the add button
  • OTPCipherSelectionViewModel: Updated the text displayed when there are no items

Screenshots

Cipher selection OTP Flow empty

Cipher selection OTP Flow empty

Cipher selection OTP Flow empty dark

Cipher selection OTP Flow empty dark

Seach empty

Note: I put the whole layout more to the top instead of fully centered because I wanted all the info to be seen with the keyboard opened.

Seach empty

Search empty dark

Search empty dark

Before you submit

  • Please check for formatting errors (dotnet format --verify-no-changes) (required)
  • Please add unit tests where it makes sense to do so (encouraged but not required)
  • If this change requires a documentation update - notify the documentation team
  • If this change has particular deployment requirements - notify the DevOps team

🔄 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/2408 **Author:** [@fedemkr](https://github.com/fedemkr) **Created:** 3/8/2023 **Status:** ✅ Merged **Merged:** 3/8/2023 **Merged by:** [@fedemkr](https://github.com/fedemkr) **Base:** `feature/EC-979-iOS-third-party-2fa` ← **Head:** `feature/ios-third-party-2fa/PM-1133-update-empty-states` --- ### 📝 Commits (2) - [`6d2ed25`](https://github.com/bitwarden/android/commit/6d2ed2531ce39392d2dd87931cbb84a2536f1a1e) PM-1133 Updated empty states for search and cipher selection on otp flow - [`e3c41cf`](https://github.com/bitwarden/android/commit/e3c41cf07efa27101c2c860ed6cf4b86df78fcd1) Merge branch 'feature/EC-979-iOS-third-party-2fa' into feature/ios-third-party-2fa/PM-1133-update-empty-states ### 📊 Changes **13 files changed** (+479 additions, -301 deletions) <details> <summary>View changed files</summary> 📝 `src/App/Pages/Vault/CipherSelectionPage.xaml` (+2 -0) 📝 `src/App/Pages/Vault/CipherSelectionPageViewModel.cs` (+1 -1) 📝 `src/App/Pages/Vault/CiphersPage.xaml` (+16 -6) 📝 `src/App/Pages/Vault/CiphersPageViewModel.cs` (+14 -1) 📝 `src/App/Pages/Vault/OTPCipherSelectionPageViewModel.cs` (+4 -2) 📝 `src/App/Resources/AppResources.Designer.cs` (+27 -0) 📝 `src/App/Resources/AppResources.resx` (+9 -0) ➕ `src/iOS/Resources/Assets.xcassets/Contents.json` (+6 -0) ➕ `src/iOS/Resources/Assets.xcassets/empty_items_state.imageset/Contents.json` (+25 -0) ➕ `src/iOS/Resources/Assets.xcassets/empty_items_state.imageset/Empty-items-state-dark.pdf` (+0 -0) ➕ `src/iOS/Resources/Assets.xcassets/empty_items_state.imageset/Empty-items-state.pdf` (+0 -0) 📝 `src/iOS/Resources/Assets.xcassets/ic_warning.imageset/Contents.json` (+371 -291) 📝 `src/iOS/iOS.csproj` (+4 -0) </details> ### 📄 Description ## Type of change - [ ] Bug fix - [X] New feature development - [ ] Tech debt (refactoring, code cleanup, dependency upgrades, etc) - [ ] Build/deploy pipeline (DevOps) - [ ] Other ## Objective <!--Describe what the purpose of this PR is. For example: what bug you're fixing or what new feature you're adding--> Update empty states when selecting a cipher on the OTP handling flow and on the search. ## Code changes <!--Explain the changes you've made to each file or major component. This should help the reviewer understand your changes--> <!--Also refer to any related changes or PRs in other repositories--> * **CipherSelectionPage.xaml:** Added empty image * **CiphersPage.xaml:** Updated empty state layout and added image to it * **CiphersPageViewModel:** Added ability to add a cipher from the button showed on empty state and also added `ShowAddCipher` to check when to display the add button * **OTPCipherSelectionViewModel:** Updated the text displayed when there are no items ## Screenshots <!--Required for any UI changes. Delete if not applicable--> ### Cipher selection OTP Flow empty <img width="314" alt="Cipher selection OTP Flow empty" src="https://user-images.githubusercontent.com/15682323/223821052-25ca2a31-768e-4d54-90d8-8aab8dc60e96.PNG"> ### Cipher selection OTP Flow empty dark <img width="314" alt="Cipher selection OTP Flow empty dark" src="https://user-images.githubusercontent.com/15682323/223820859-74c1f5dd-b8e9-4e37-a8dc-e8b9a8c53a2f.PNG"> ### Seach empty _Note: I put the whole layout more to the top instead of fully centered because I wanted all the info to be seen with the keyboard opened._ <img width="314" alt="Seach empty" src="https://user-images.githubusercontent.com/15682323/223821100-3a8c67f5-fee9-449c-a8b0-509ed8c96150.PNG"> ### Search empty dark <img width="314" alt="Search empty dark" src="https://user-images.githubusercontent.com/15682323/223821073-76516dd9-196f-449c-975f-acf25259b1c7.PNG"> ## Before you submit - Please check for formatting errors (`dotnet format --verify-no-changes`) (required) - Please add **unit tests** where it makes sense to do so (encouraged but not required) - If this change requires a **documentation update** - notify the documentation team - If this change has particular **deployment requirements** - notify the DevOps team --- <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:34:15 -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#3548
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?