From de20bb22d90e0417d8debb3381e16abe0a29e9b6 Mon Sep 17 00:00:00 2001 From: Alistair Francis Date: Sun, 10 Dec 2017 20:26:58 -0800 Subject: [PATCH] App: Use Windows helper instead of WinPhone (#203) Signed-off-by: Alistair Francis --- src/App/Controls/ExtendedButton.cs | 2 +- src/App/Controls/PinControl.cs | 2 +- src/App/Controls/StepperCell.cs | 2 +- src/App/Pages/Lock/LockPasswordPage.cs | 2 +- src/App/Pages/LoginTwoFactorPage.cs | 2 +- src/App/Pages/PasswordHintPage.cs | 2 +- src/App/Pages/RegisterPage.cs | 2 +- src/App/Pages/Settings/SettingsCreditsPage.cs | 2 +- src/App/Pages/Settings/SettingsPage.cs | 2 +- src/App/Pages/Tools/ToolsPasswordGeneratorPage.cs | 4 ++-- src/App/Pages/Vault/VaultAddCipherPage.cs | 4 ++-- src/App/Pages/Vault/VaultCustomFieldsPage.cs | 2 +- src/App/Pages/Vault/VaultEditCipherPage.cs | 4 ++-- src/App/Pages/Vault/VaultViewCipherPage.cs | 6 +++--- 14 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/App/Controls/ExtendedButton.cs b/src/App/Controls/ExtendedButton.cs index 9ccc0bc59..b677374e3 100644 --- a/src/App/Controls/ExtendedButton.cs +++ b/src/App/Controls/ExtendedButton.cs @@ -11,7 +11,7 @@ namespace Bit.App.Controls BindableProperty.Create(nameof(Padding), typeof(Thickness), typeof(ExtendedButton), default(Thickness)); public static readonly BindableProperty UppercaseProperty = BindableProperty.Create(nameof(Uppercase), typeof(bool), typeof(ExtendedButton), - Helpers.OnPlatform(iOS: false, Android: true, WinPhone: false)); + Helpers.OnPlatform(iOS: false, Android: true, Windows: false)); public Thickness Padding { diff --git a/src/App/Controls/PinControl.cs b/src/App/Controls/PinControl.cs index fc44baf27..62f2989b6 100644 --- a/src/App/Controls/PinControl.cs +++ b/src/App/Controls/PinControl.cs @@ -14,7 +14,7 @@ namespace Bit.App.Controls { HorizontalTextAlignment = TextAlignment.Center, FontSize = 35, - FontFamily = Helpers.OnPlatform(iOS: "Menlo-Regular", Android: "monospace", WinPhone: "Courier") + FontFamily = Helpers.OnPlatform(iOS: "Menlo-Regular", Android: "monospace", Windows: "Courier") }; Entry = new ExtendedEntry diff --git a/src/App/Controls/StepperCell.cs b/src/App/Controls/StepperCell.cs index a0de6f3ac..d8e7182b3 100644 --- a/src/App/Controls/StepperCell.cs +++ b/src/App/Controls/StepperCell.cs @@ -43,7 +43,7 @@ namespace Bit.App.Controls Padding = Helpers.OnPlatform( iOS: new Thickness(15, 8), Android: new Thickness(15, 2), - WinPhone: new Thickness(15, 8)) + Windows: new Thickness(15, 8)) }; if(Device.RuntimePlatform == Device.Android) diff --git a/src/App/Pages/Lock/LockPasswordPage.cs b/src/App/Pages/Lock/LockPasswordPage.cs index 54b85c6db..26ac0db2a 100644 --- a/src/App/Pages/Lock/LockPasswordPage.cs +++ b/src/App/Pages/Lock/LockPasswordPage.cs @@ -33,7 +33,7 @@ namespace Bit.App.Pages var padding = Helpers.OnPlatform( iOS: new Thickness(15, 20), Android: new Thickness(15, 8), - WinPhone: new Thickness(15, 20)); + Windows: new Thickness(10, 8)); PasswordCell = new FormEntryCell(AppResources.MasterPassword, isPassword: true, useLabelAsPlaceholder: true, imageSource: "lock.png", containerPadding: padding); diff --git a/src/App/Pages/LoginTwoFactorPage.cs b/src/App/Pages/LoginTwoFactorPage.cs index 18bc7a66d..8a3d77d91 100644 --- a/src/App/Pages/LoginTwoFactorPage.cs +++ b/src/App/Pages/LoginTwoFactorPage.cs @@ -123,7 +123,7 @@ namespace Bit.App.Pages var padding = Helpers.OnPlatform( iOS: new Thickness(15, 20), Android: new Thickness(15, 8), - WinPhone: new Thickness(15, 20)); + Windows: new Thickness(10, 8)); TokenCell = new FormEntryCell(AppResources.VerificationCode, useLabelAsPlaceholder: true, imageSource: "lock", containerPadding: padding); diff --git a/src/App/Pages/PasswordHintPage.cs b/src/App/Pages/PasswordHintPage.cs index 8f6224b5f..3c61b7fd2 100644 --- a/src/App/Pages/PasswordHintPage.cs +++ b/src/App/Pages/PasswordHintPage.cs @@ -33,7 +33,7 @@ namespace Bit.App.Pages var padding = Helpers.OnPlatform( iOS: new Thickness(15, 20), Android: new Thickness(15, 8), - WinPhone: new Thickness(15, 20)); + Windows: new Thickness(10, 8)); EmailCell = new FormEntryCell(AppResources.EmailAddress, entryKeyboard: Keyboard.Email, useLabelAsPlaceholder: true, imageSource: "envelope.png", containerPadding: padding); diff --git a/src/App/Pages/RegisterPage.cs b/src/App/Pages/RegisterPage.cs index 1c008724d..30a16bfc1 100644 --- a/src/App/Pages/RegisterPage.cs +++ b/src/App/Pages/RegisterPage.cs @@ -47,7 +47,7 @@ namespace Bit.App.Pages var padding = Helpers.OnPlatform( iOS: new Thickness(15, 20), Android: new Thickness(15, 8), - WinPhone: new Thickness(15, 20)); + Windows: new Thickness(10, 8)); PasswordHintCell = new FormEntryCell(AppResources.MasterPasswordHint, useLabelAsPlaceholder: true, imageSource: "lightbulb.png", containerPadding: padding); diff --git a/src/App/Pages/Settings/SettingsCreditsPage.cs b/src/App/Pages/Settings/SettingsCreditsPage.cs index f274dc037..5fc2a6b01 100644 --- a/src/App/Pages/Settings/SettingsCreditsPage.cs +++ b/src/App/Pages/Settings/SettingsCreditsPage.cs @@ -69,7 +69,7 @@ Fingerprint by masterpage.com from the Noun Project") Padding = Helpers.OnPlatform( iOS: new Thickness(15, 20), Android: new Thickness(16, 20), - WinPhone: new Thickness(15, 20)), + Windows: new Thickness(10, 8)), BackgroundColor = Color.White }; diff --git a/src/App/Pages/Settings/SettingsPage.cs b/src/App/Pages/Settings/SettingsPage.cs index 2cf81aacf..81dc93983 100644 --- a/src/App/Pages/Settings/SettingsPage.cs +++ b/src/App/Pages/Settings/SettingsPage.cs @@ -95,7 +95,7 @@ namespace Bit.App.Pages { var fingerprintName = Helpers.OnPlatform( iOS: _deviceInfoService.HasFaceIdSupport ? AppResources.FaceID : AppResources.TouchID, - Android: AppResources.Fingerprint, Windows: AppResources.Fingerprint, WinPhone: AppResources.Fingerprint); + Android: AppResources.Fingerprint, Windows: AppResources.Fingerprint); FingerprintCell = new ExtendedSwitchCell { Text = string.Format(AppResources.UnlockWith, fingerprintName), diff --git a/src/App/Pages/Tools/ToolsPasswordGeneratorPage.cs b/src/App/Pages/Tools/ToolsPasswordGeneratorPage.cs index 1c7c34669..6ec9199e6 100644 --- a/src/App/Pages/Tools/ToolsPasswordGeneratorPage.cs +++ b/src/App/Pages/Tools/ToolsPasswordGeneratorPage.cs @@ -49,7 +49,7 @@ namespace Bit.App.Pages FontSize = Device.GetNamedSize(NamedSize.Large, typeof(Label)), Margin = new Thickness(15, 40, 15, 40), HorizontalTextAlignment = TextAlignment.Center, - FontFamily = Helpers.OnPlatform(iOS: "Menlo-Regular", Android: "monospace", WinPhone: "Courier"), + FontFamily = Helpers.OnPlatform(iOS: "Menlo-Regular", Android: "monospace", Windows: "Courier"), LineBreakMode = LineBreakMode.TailTruncation, VerticalOptions = LayoutOptions.Start }; @@ -259,7 +259,7 @@ namespace Bit.App.Pages Padding = Helpers.OnPlatform( iOS: new Thickness(15, 8), Android: new Thickness(16, 10), - WinPhone: new Thickness(15, 8)) + Windows: new Thickness(15, 8)) }; stackLayout.AdjustPaddingForDevice(); diff --git a/src/App/Pages/Vault/VaultAddCipherPage.cs b/src/App/Pages/Vault/VaultAddCipherPage.cs index 456675c74..65cc33762 100644 --- a/src/App/Pages/Vault/VaultAddCipherPage.cs +++ b/src/App/Pages/Vault/VaultAddCipherPage.cs @@ -388,7 +388,7 @@ namespace Bit.App.Pages LoginTotpCell.Entry.DisableAutocapitalize = true; LoginTotpCell.Entry.Autocorrect = false; LoginTotpCell.Entry.FontFamily = - Helpers.OnPlatform(iOS: "Menlo-Regular", Android: "monospace", WinPhone: "Courier"); + Helpers.OnPlatform(iOS: "Menlo-Regular", Android: "monospace", Windows: "Courier"); LoginPasswordCell = new FormEntryCell(AppResources.Password, isPassword: true, nextElement: LoginTotpCell.Entry, useButton: true); @@ -396,7 +396,7 @@ namespace Bit.App.Pages LoginPasswordCell.Entry.DisableAutocapitalize = true; LoginPasswordCell.Entry.Autocorrect = false; LoginPasswordCell.Entry.FontFamily = - Helpers.OnPlatform(iOS: "Menlo-Regular", Android: "monospace", WinPhone: "Courier"); + Helpers.OnPlatform(iOS: "Menlo-Regular", Android: "monospace", Windows: "Courier"); if(!string.IsNullOrWhiteSpace(_defaultPassword)) { LoginPasswordCell.Entry.Text = _defaultPassword; diff --git a/src/App/Pages/Vault/VaultCustomFieldsPage.cs b/src/App/Pages/Vault/VaultCustomFieldsPage.cs index cad36ee5b..d68fe76a3 100644 --- a/src/App/Pages/Vault/VaultCustomFieldsPage.cs +++ b/src/App/Pages/Vault/VaultCustomFieldsPage.cs @@ -182,7 +182,7 @@ namespace Bit.App.Pages if(hidden) { textFieldCell.Entry.FontFamily = Helpers.OnPlatform( - iOS: "Menlo-Regular", Android: "monospace", WinPhone: "Courier"); + iOS: "Menlo-Regular", Android: "monospace", Windows: "Courier"); textFieldCell.Button.Image = "eye.png"; textFieldCell.Button.Command = new Command(() => { diff --git a/src/App/Pages/Vault/VaultEditCipherPage.cs b/src/App/Pages/Vault/VaultEditCipherPage.cs index 36c782a51..a1ca91432 100644 --- a/src/App/Pages/Vault/VaultEditCipherPage.cs +++ b/src/App/Pages/Vault/VaultEditCipherPage.cs @@ -186,7 +186,7 @@ namespace Bit.App.Pages LoginTotpCell.Entry.DisableAutocapitalize = true; LoginTotpCell.Entry.Autocorrect = false; LoginTotpCell.Entry.FontFamily = - Helpers.OnPlatform(iOS: "Menlo-Regular", Android: "monospace", WinPhone: "Courier"); + Helpers.OnPlatform(iOS: "Menlo-Regular", Android: "monospace", Windows: "Courier"); LoginPasswordCell = new FormEntryCell(AppResources.Password, isPassword: true, nextElement: LoginTotpCell.Entry, useButton: true); @@ -195,7 +195,7 @@ namespace Bit.App.Pages LoginPasswordCell.Entry.DisableAutocapitalize = true; LoginPasswordCell.Entry.Autocorrect = false; LoginPasswordCell.Entry.FontFamily = - Helpers.OnPlatform(iOS: "Menlo-Regular", Android: "monospace", WinPhone: "Courier"); + Helpers.OnPlatform(iOS: "Menlo-Regular", Android: "monospace", Windows: "Courier"); LoginGenerateCell = new ExtendedTextCell { diff --git a/src/App/Pages/Vault/VaultViewCipherPage.cs b/src/App/Pages/Vault/VaultViewCipherPage.cs index 067ff8795..40cdc86b7 100644 --- a/src/App/Pages/Vault/VaultViewCipherPage.cs +++ b/src/App/Pages/Vault/VaultViewCipherPage.cs @@ -126,7 +126,7 @@ namespace Bit.App.Pages LoginPasswordCell.Button2.Command = new Command(() => Copy(Model.LoginPassword, AppResources.Password)); LoginPasswordCell.Value.FontFamily = - Helpers.OnPlatform(iOS: "Menlo-Regular", Android: "monospace", WinPhone: "Courier"); + Helpers.OnPlatform(iOS: "Menlo-Regular", Android: "monospace", Windows: "Courier"); LoginPasswordCell.Value.LineBreakMode = LineBreakMode.WordWrap; // URI @@ -159,7 +159,7 @@ namespace Bit.App.Pages LoginTotpCodeCell.Sub.SetBinding(Label.TextColorProperty, nameof(VaultViewCipherPageModel.LoginTotpColor)); LoginTotpCodeCell.Value.FontFamily = - Helpers.OnPlatform(iOS: "Menlo-Regular", Android: "monospace", WinPhone: "Courier"); + Helpers.OnPlatform(iOS: "Menlo-Regular", Android: "monospace", Windows: "Courier"); break; case CipherType.Card: CardNameCell = new LabeledValueCell(AppResources.CardholderName); @@ -558,7 +558,7 @@ namespace Bit.App.Pages : base(field.Name, field.MaskedValue, string.Empty, "clipboard.png") { Value.FontFamily = Helpers.OnPlatform(iOS: "Menlo-Regular", - Android: "monospace", WinPhone: "Courier"); + Android: "monospace", Windows: "Courier"); if(Device.RuntimePlatform == Device.iOS) { Button1.Margin = new Thickness(10, 0);