mirrors/bitwarden-android
1
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2024-12-25 02:18:27 +03:00
Code Issues Projects Releases Packages Wiki Activity

feat: change to on and off (#2001)

Browse source
This commit is contained in:
Andreas Coroiu 2022-07-21 15:57:08 +02:00 committed by GitHub
parent 263aeef030
commit e2b6e99a0c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 3642 additions and 5645 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/App/Pages/Settings/SettingsPage/SettingsPageListItem.cs
View file

@ -15,7 +15,7 @@ namespace Bit.App.Pages
public bool UseFrame { get; set; } public bool UseFrame { get; set; }
public Func<Task> ExecuteAsync { get; set; } public Func<Task> ExecuteAsync { get; set; }
public bool SubLabelTextEnabled => SubLabel == AppResources.Enabled; public bool SubLabelTextEnabled => SubLabel == AppResources.On;
public string LineBreakMode => SubLabel == null ? "TailTruncation" : ""; public string LineBreakMode => SubLabel == null ? "TailTruncation" : "";
public bool ShowSubLabel => SubLabel.Length != 0; public bool ShowSubLabel => SubLabel.Length != 0;
public bool ShowTimeInput => Time != null; public bool ShowTimeInput => Time != null;

10
src/App/Pages/Settings/SettingsPage/SettingsPageViewModel.cs
View file

@ -450,7 +450,7 @@ namespace Bit.App.Pages
autofillItems.Add(new SettingsPageListItem autofillItems.Add(new SettingsPageListItem
{ {
Name = AppResources.AutofillServices, Name = AppResources.AutofillServices,
SubLabel = _deviceActionService.AutofillServicesEnabled() ? AppResources.Enabled : AppResources.Disabled, SubLabel = _deviceActionService.AutofillServicesEnabled() ? AppResources.On : AppResources.Off,
ExecuteAsync = () => Page.Navigation.PushModalAsync(new NavigationPage(new AutofillServicesPage(Page as SettingsPage))) ExecuteAsync = () => Page.Navigation.PushModalAsync(new NavigationPage(new AutofillServicesPage(Page as SettingsPage)))
}); });
} }
@ -500,7 +500,7 @@ namespace Bit.App.Pages
new SettingsPageListItem new SettingsPageListItem
{ {
Name = AppResources.UnlockWithPIN, Name = AppResources.UnlockWithPIN,
SubLabel = _pin ? AppResources.Enabled : AppResources.Disabled, SubLabel = _pin ? AppResources.On : AppResources.Off,
ExecuteAsync = () => UpdatePinAsync() ExecuteAsync = () => UpdatePinAsync()
}, },
new SettingsPageListItem new SettingsPageListItem
@ -525,7 +525,7 @@ namespace Bit.App.Pages
var item = new SettingsPageListItem var item = new SettingsPageListItem
{ {
Name = string.Format(AppResources.UnlockWith, biometricName), Name = string.Format(AppResources.UnlockWith, biometricName),
SubLabel = _biometric ? AppResources.Enabled : AppResources.Disabled, SubLabel = _biometric ? AppResources.On : AppResources.Off,
ExecuteAsync = () => UpdateBiometricAsync() ExecuteAsync = () => UpdateBiometricAsync()
}; };
securityItems.Insert(2, item); securityItems.Insert(2, item);
@ -554,7 +554,7 @@ namespace Bit.App.Pages
securityItems.Add(new SettingsPageListItem securityItems.Add(new SettingsPageListItem
{ {
Name = AppResources.AllowScreenCapture, Name = AppResources.AllowScreenCapture,
SubLabel = _screenCaptureAllowed ? AppResources.Enabled : AppResources.Disabled, SubLabel = _screenCaptureAllowed ? AppResources.On : AppResources.Off,
ExecuteAsync = () => SetScreenCaptureAllowedAsync() ExecuteAsync = () => SetScreenCaptureAllowedAsync()
}); });
} }
@ -627,7 +627,7 @@ namespace Bit.App.Pages
new SettingsPageListItem new SettingsPageListItem
{ {
Name = AppResources.SubmitCrashLogs, Name = AppResources.SubmitCrashLogs,
SubLabel = _reportLoggingEnabled ? AppResources.Enabled : AppResources.Disabled, SubLabel = _reportLoggingEnabled ? AppResources.On : AppResources.Off,
ExecuteAsync = () => LoggerReportingAsync() ExecuteAsync = () => LoggerReportingAsync()
}, },
#endif #endif

9267
src/App/Resources/AppResources.Designer.cs generated
View file

File diff suppressed because it is too large Load diff

8
src/App/Resources/AppResources.resx
View file

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<root> <root>
<!-- <!--
Microsoft ResX Schema Microsoft ResX Schema
@ -770,6 +770,12 @@
<data name="Enabled" xml:space="preserve"> <data name="Enabled" xml:space="preserve">
<value>Enabled</value> <value>Enabled</value>
</data> </data>
<data name="Off" xml:space="preserve">
<value>Off</value>
</data>
<data name="On" xml:space="preserve">
<value>On</value>
</data>
<data name="Status" xml:space="preserve"> <data name="Status" xml:space="preserve">
<value>Status</value> <value>Status</value>
</data> </data>