From b54371dacde8bdf1c55b998cbbadbea375b1ddaf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andre=CC=81=20Bispo?= Date: Tue, 14 Jun 2022 10:50:57 +0100 Subject: [PATCH] [PS-675] Changed resource label for accessibility text, also moved the helper text to the main text. --- .../Accounts/BaseChangePasswordViewModel.cs | 3 +- src/App/Pages/Accounts/LockPage.xaml | 5 +- src/App/Pages/Accounts/LockPageViewModel.cs | 3 +- src/App/Pages/Accounts/LoginPage.xaml | 3 +- src/App/Pages/Accounts/LoginPageViewModel.cs | 3 +- src/App/Pages/Accounts/RegisterPage.xaml | 6 +- .../Pages/Accounts/RegisterPageViewModel.cs | 3 +- src/App/Pages/Accounts/SetPasswordPage.xaml | 6 +- .../Accounts/SetPasswordPageViewModel.cs | 3 +- .../Accounts/UpdateTempPasswordPage.xaml | 6 +- src/App/Pages/Send/SendAddEditPage.xaml | 3 +- .../Pages/Send/SendAddEditPageViewModel.cs | 3 +- src/App/Pages/Settings/ExportVaultPage.xaml | 3 +- .../Settings/ExportVaultPageViewModel.cs | 3 +- src/App/Pages/Vault/AddEditPage.xaml | 3 +- src/App/Pages/Vault/AddEditPageViewModel.cs | 3 +- src/App/Pages/Vault/ViewPage.xaml | 3 +- src/App/Pages/Vault/ViewPageViewModel.cs | 3 +- src/App/Resources/AppResources.Designer.cs | 9135 +++++++---------- src/App/Resources/AppResources.resx | 8 +- 20 files changed, 3604 insertions(+), 5604 deletions(-) diff --git a/src/App/Pages/Accounts/BaseChangePasswordViewModel.cs b/src/App/Pages/Accounts/BaseChangePasswordViewModel.cs index 81d16568e..97ff445e7 100644 --- a/src/App/Pages/Accounts/BaseChangePasswordViewModel.cs +++ b/src/App/Pages/Accounts/BaseChangePasswordViewModel.cs @@ -72,7 +72,8 @@ namespace Bit.App.Pages } public string ShowPasswordIcon => ShowPassword ? "" : ""; - public string PasswordVisibilityAccessibilityText => ShowPassword ? AppResources.PasswordIsVisibleTapToHide : AppResources.PasswordIsNotVisibleTapToShow; + public string PasswordVisibilityAccessibilityText => ShowPassword ? AppResources.VisibilityTogglePasswordIsVisibleActivateToHide : + AppResources.VisibilityTogglePasswordIsNotVisibleActivateToHide; public string MasterPassword { get; set; } public string ConfirmMasterPassword { get; set; } public string Hint { get; set; } diff --git a/src/App/Pages/Accounts/LockPage.xaml b/src/App/Pages/Accounts/LockPage.xaml index 5c269ea1e..45b34a6e2 100644 --- a/src/App/Pages/Accounts/LockPage.xaml +++ b/src/App/Pages/Accounts/LockPage.xaml @@ -80,8 +80,7 @@ Grid.Column="1" Grid.RowSpan="2" AutomationProperties.IsInAccessibleTree="True" - AutomationProperties.Name="{u:I18n ToggleVisibility}" - AutomationProperties.HelpText="{Binding PasswordVisibilityAccessibilityText}"/> + AutomationProperties.Name="{Binding PasswordVisibilityAccessibilityText}" /> ShowPassword ? BitwardenIcons.EyeSlash : BitwardenIcons.Eye; - public string PasswordVisibilityAccessibilityText => ShowPassword ? AppResources.PasswordIsVisibleTapToHide : AppResources.PasswordIsNotVisibleTapToShow; + public string PasswordVisibilityAccessibilityText => ShowPassword ? AppResources.VisibilityTogglePasswordIsVisibleActivateToHide : + AppResources.VisibilityTogglePasswordIsNotVisibleActivateToHide; public string MasterPassword { get; set; } public string Pin { get; set; } public Action UnlockedAction { get; set; } diff --git a/src/App/Pages/Accounts/LoginPage.xaml b/src/App/Pages/Accounts/LoginPage.xaml index 3975a0ccb..8eb733b07 100644 --- a/src/App/Pages/Accounts/LoginPage.xaml +++ b/src/App/Pages/Accounts/LoginPage.xaml @@ -101,8 +101,7 @@ Grid.Column="1" Grid.RowSpan="2" AutomationProperties.IsInAccessibleTree="True" - AutomationProperties.Name="{u:I18n ToggleVisibility}" - AutomationProperties.HelpText="{Binding PasswordVisibilityAccessibilityText}"/> + AutomationProperties.Name="{Binding PasswordVisibilityAccessibilityText}"/> diff --git a/src/App/Pages/Accounts/LoginPageViewModel.cs b/src/App/Pages/Accounts/LoginPageViewModel.cs index 60cc5a247..e644f6b13 100644 --- a/src/App/Pages/Accounts/LoginPageViewModel.cs +++ b/src/App/Pages/Accounts/LoginPageViewModel.cs @@ -86,7 +86,8 @@ namespace Bit.App.Pages public Command LogInCommand { get; } public Command TogglePasswordCommand { get; } public string ShowPasswordIcon => ShowPassword ? BitwardenIcons.EyeSlash : BitwardenIcons.Eye; - public string PasswordVisibilityAccessibilityText => ShowPassword ? AppResources.PasswordIsVisibleTapToHide : AppResources.PasswordIsNotVisibleTapToShow; + public string PasswordVisibilityAccessibilityText => ShowPassword ? AppResources.VisibilityTogglePasswordIsVisibleActivateToHide : + AppResources.VisibilityTogglePasswordIsNotVisibleActivateToHide; public Action StartTwoFactorAction { get; set; } public Action LogInSuccessAction { get; set; } public Action UpdateTempPasswordAction { get; set; } diff --git a/src/App/Pages/Accounts/RegisterPage.xaml b/src/App/Pages/Accounts/RegisterPage.xaml index 1fa519145..ae0d3e7c1 100644 --- a/src/App/Pages/Accounts/RegisterPage.xaml +++ b/src/App/Pages/Accounts/RegisterPage.xaml @@ -68,8 +68,7 @@ Grid.Column="1" Grid.RowSpan="2" AutomationProperties.IsInAccessibleTree="True" - AutomationProperties.Name="{u:I18n ToggleVisibility}" - AutomationProperties.HelpText="{Binding PasswordVisibilityAccessibilityText}"/> + AutomationProperties.Name="{Binding PasswordVisibilityAccessibilityText}" />