[PR #2818] [MERGED] [PM-3340] Update timeout action for users without master password. #110866

Closed
opened 2026-06-06 07:11:33 -05:00 by GiteaMirror · 0 comments
Owner

📋 Pull Request Information

Original PR: https://github.com/bitwarden/android/pull/2818
Author: @andrebispo5
Created: 10/11/2023
Status: Merged
Merged: 11/6/2023
Merged by: @andrebispo5

Base: masterHead: auth/pm-3340/timeout_update


📝 Commits (10+)

  • 3d4c987 [PM-3340] Update timeout action for users without master password.
  • 1cfb840 code format
  • a479c07 Merge branch 'master' into auth/pm-3340/timeout_update
  • 501dfee [PM-3340] PR fixes and refactor
  • 9a0719a code format
  • c333add Merge branch 'master' into auth/pm-3340/timeout_update
  • 464c6da Merge branch 'master' into auth/pm-3340/timeout_update
  • 015d7b8 Update src/App/Utilities/BoolToColorConverter.cs
  • c2d22e0 [PM-3340] Raise command can execute.
  • 77f867c [PM-3340] Fix converter name

📊 Changes

8 files changed (+77 additions, -10 deletions)

View changed files

📝 src/App/Controls/Settings/BaseSettingControlView.cs (+5 -3)
📝 src/App/Controls/Settings/SettingChooserItemView.xaml.cs (+1 -1)
📝 src/App/Pages/Settings/SecuritySettingsPage.xaml (+4 -1)
📝 src/App/Pages/Settings/SecuritySettingsPageViewModel.cs (+27 -5)
📝 src/App/Resources/AppResources.Designer.cs (+9 -0)
📝 src/App/Resources/AppResources.resx (+3 -0)
📝 src/App/Styles/ControlTemplates.xaml (+2 -0)
src/App/Utilities/BoolToColorConverter.cs (+26 -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 settings screen vault timeout action cell UI to match designs.

Code changes

Add disable and description properties to SettingsPageListItem.
Add new UI cell to data template.

Screenshots

https://github.com/bitwarden/mobile/assets/4648522/e98284c8-4b9d-426f-b81b-58b7a979af65

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/2818 **Author:** [@andrebispo5](https://github.com/andrebispo5) **Created:** 10/11/2023 **Status:** ✅ Merged **Merged:** 11/6/2023 **Merged by:** [@andrebispo5](https://github.com/andrebispo5) **Base:** `master` ← **Head:** `auth/pm-3340/timeout_update` --- ### 📝 Commits (10+) - [`3d4c987`](https://github.com/bitwarden/android/commit/3d4c9878fb0de858c0f606e8e128234e789e9d59) [PM-3340] Update timeout action for users without master password. - [`1cfb840`](https://github.com/bitwarden/android/commit/1cfb8405c4fde5e216001db38d43dd4ce09eab01) code format - [`a479c07`](https://github.com/bitwarden/android/commit/a479c07607623f50472e283e0b6b15287ed0837c) Merge branch 'master' into auth/pm-3340/timeout_update - [`501dfee`](https://github.com/bitwarden/android/commit/501dfee3845485687e111942e0e2469f3f0cbaff) [PM-3340] PR fixes and refactor - [`9a0719a`](https://github.com/bitwarden/android/commit/9a0719a5a33f7cfe827b49f95e63a5ca31d610be) code format - [`c333add`](https://github.com/bitwarden/android/commit/c333adda2770093f46f738b704852b2eda7b03b1) Merge branch 'master' into auth/pm-3340/timeout_update - [`464c6da`](https://github.com/bitwarden/android/commit/464c6da1143e865a790789159c95952080aa94ce) Merge branch 'master' into auth/pm-3340/timeout_update - [`015d7b8`](https://github.com/bitwarden/android/commit/015d7b8c3723d38f7a4dc324f8feccbdc9d2d30f) Update src/App/Utilities/BoolToColorConverter.cs - [`c2d22e0`](https://github.com/bitwarden/android/commit/c2d22e007daf24943fa7e1b90a939e0626432168) [PM-3340] Raise command can execute. - [`77f867c`](https://github.com/bitwarden/android/commit/77f867cb8bedae2babe38f478043de89ccd0cae4) [PM-3340] Fix converter name ### 📊 Changes **8 files changed** (+77 additions, -10 deletions) <details> <summary>View changed files</summary> 📝 `src/App/Controls/Settings/BaseSettingControlView.cs` (+5 -3) 📝 `src/App/Controls/Settings/SettingChooserItemView.xaml.cs` (+1 -1) 📝 `src/App/Pages/Settings/SecuritySettingsPage.xaml` (+4 -1) 📝 `src/App/Pages/Settings/SecuritySettingsPageViewModel.cs` (+27 -5) 📝 `src/App/Resources/AppResources.Designer.cs` (+9 -0) 📝 `src/App/Resources/AppResources.resx` (+3 -0) 📝 `src/App/Styles/ControlTemplates.xaml` (+2 -0) ➕ `src/App/Utilities/BoolToColorConverter.cs` (+26 -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 settings screen vault timeout action cell UI to match designs. ## 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--> Add disable and description properties to SettingsPageListItem. Add new UI cell to data template. ## Screenshots <!--Required for any UI changes. Delete if not applicable--> https://github.com/bitwarden/mobile/assets/4648522/e98284c8-4b9d-426f-b81b-58b7a979af65 ## 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 2026-06-06 07:11:33 -05:00
Sign in to join this conversation.
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: github-starred/android#110866