From d359547dab8b445967b7975bbe5c6790ee0813b9 Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Mon, 18 Jun 2018 09:12:03 -0400 Subject: [PATCH] monospace fonts for card code --- src/Android/Resources/Resource.Designer.cs | 33 ++++++++++++++++++---- src/App/Pages/Vault/VaultAddCipherPage.cs | 6 +++- src/App/Pages/Vault/VaultEditCipherPage.cs | 2 ++ src/App/Pages/Vault/VaultViewCipherPage.cs | 13 +++++---- 4 files changed, 41 insertions(+), 13 deletions(-) diff --git a/src/Android/Resources/Resource.Designer.cs b/src/Android/Resources/Resource.Designer.cs index 0b96097c2..81cb43c92 100644 --- a/src/Android/Resources/Resource.Designer.cs +++ b/src/Android/Resources/Resource.Designer.cs @@ -6506,17 +6506,17 @@ namespace Bit.Android // aapt resource value: 0x7f0a0051 public const int ApplicationName = 2131361873; - // aapt resource value: 0x7f0a00ab - public const int AutoFillServiceDescription = 2131361963; + // aapt resource value: 0x7f0a00b2 + public const int AutoFillServiceDescription = 2131361970; - // aapt resource value: 0x7f0a00aa - public const int AutoFillServiceSummary = 2131361962; + // aapt resource value: 0x7f0a00b1 + public const int AutoFillServiceSummary = 2131361969; // aapt resource value: 0x7f0a0050 public const int Hello = 2131361872; - // aapt resource value: 0x7f0a00ac - public const int MyVault = 2131361964; + // aapt resource value: 0x7f0a00b3 + public const int MyVault = 2131361971; // aapt resource value: 0x7f0a0027 public const int abc_action_bar_home_description = 2131361831; @@ -6671,6 +6671,27 @@ namespace Bit.Android // aapt resource value: 0x7f0a000f public const int common_signin_button_text_long = 2131361807; + // aapt resource value: 0x7f0a00ac + public const int default_web_client_id = 2131361964; + + // aapt resource value: 0x7f0a00ad + public const int firebase_database_url = 2131361965; + + // aapt resource value: 0x7f0a00aa + public const int gcm_defaultSenderId = 2131361962; + + // aapt resource value: 0x7f0a00ae + public const int google_api_key = 2131361966; + + // aapt resource value: 0x7f0a00ab + public const int google_app_id = 2131361963; + + // aapt resource value: 0x7f0a00af + public const int google_crash_reporting_api_key = 2131361967; + + // aapt resource value: 0x7f0a00b0 + public const int google_storage_bucket = 2131361968; + // aapt resource value: 0x7f0a0052 public const int hockeyapp_crash_dialog_app_name_fallback = 2131361874; diff --git a/src/App/Pages/Vault/VaultAddCipherPage.cs b/src/App/Pages/Vault/VaultAddCipherPage.cs index 83a096f20..7f6ff9bd7 100644 --- a/src/App/Pages/Vault/VaultAddCipherPage.cs +++ b/src/App/Pages/Vault/VaultAddCipherPage.cs @@ -460,11 +460,15 @@ namespace Bit.App.Pages } else if(_type == CipherType.Card) { - CardCodeCell = new FormEntryCell(AppResources.SecurityCode, Keyboard.Numeric, isPassword: true, nextElement: NotesCell.Editor, button1: "eye.png"); + CardCodeCell = new FormEntryCell(AppResources.SecurityCode, Keyboard.Numeric, + isPassword: true, nextElement: NotesCell.Editor, button1: "eye.png"); if(!string.IsNullOrWhiteSpace(_defaultCardCode)) { CardCodeCell.Entry.Text = _defaultCardCode; } + CardCodeCell.Entry.FontFamily = + Helpers.OnPlatform(iOS: "Menlo-Regular", Android: "monospace", Windows: "Courier"); + CardExpYearCell = new FormEntryCell(AppResources.ExpirationYear, Keyboard.Numeric, nextElement: CardCodeCell.Entry); if(!string.IsNullOrWhiteSpace(_defaultCardExpYear)) diff --git a/src/App/Pages/Vault/VaultEditCipherPage.cs b/src/App/Pages/Vault/VaultEditCipherPage.cs index a138a9722..ec13432c3 100644 --- a/src/App/Pages/Vault/VaultEditCipherPage.cs +++ b/src/App/Pages/Vault/VaultEditCipherPage.cs @@ -221,6 +221,8 @@ namespace Bit.App.Pages CardCodeCell = new FormEntryCell(AppResources.SecurityCode, Keyboard.Numeric, isPassword: true, nextElement: NotesCell.Editor, button1: "eye.png"); CardCodeCell.Entry.Text = Cipher.Card.Code?.Decrypt(Cipher.OrganizationId); + CardCodeCell.Entry.FontFamily = + Helpers.OnPlatform(iOS: "Menlo-Regular", Android: "monospace", Windows: "Courier"); CardExpYearCell = new FormEntryCell(AppResources.ExpirationYear, Keyboard.Numeric, nextElement: CardCodeCell.Entry); diff --git a/src/App/Pages/Vault/VaultViewCipherPage.cs b/src/App/Pages/Vault/VaultViewCipherPage.cs index 05c00f109..ab9f0787f 100644 --- a/src/App/Pages/Vault/VaultViewCipherPage.cs +++ b/src/App/Pages/Vault/VaultViewCipherPage.cs @@ -168,14 +168,15 @@ namespace Bit.App.Pages CardExpCell = new LabeledValueCell(AppResources.Expiration); CardExpCell.Value.SetBinding(Label.TextProperty, nameof(VaultViewCipherPageModel.CardExp)); - CardCodeCell = new LabeledValueCell(AppResources.SecurityCode, button1Image: string.Empty, button2Image: "clipboard.png"); - CardCodeCell.Value.SetBinding(Label.TextProperty, - nameof(VaultViewCipherPageModel.MaskedCardCode)); + CardCodeCell = new LabeledValueCell(AppResources.SecurityCode, button1Image: string.Empty, + button2Image: "clipboard.png"); + CardCodeCell.Value.SetBinding(Label.TextProperty, nameof(VaultViewCipherPageModel.MaskedCardCode)); CardCodeCell.Button1.SetBinding(Button.ImageProperty, - nameof(VaultViewCipherPageModel.CardCodeShowHideImage)); - CardCodeCell.Button1.Command = - new Command(() => Model.RevealCardCode = !Model.RevealCardCode); + nameof(VaultViewCipherPageModel.CardCodeShowHideImage)); + CardCodeCell.Button1.Command = new Command(() => Model.RevealCardCode = !Model.RevealCardCode); CardCodeCell.Button2.Command = new Command(() => Copy(Model.CardCode, AppResources.SecurityCode)); + CardCodeCell.Value.FontFamily = + Helpers.OnPlatform(iOS: "Menlo-Regular", Android: "monospace", Windows: "Courier"); break; case CipherType.Identity: IdNameCell = new LabeledValueCell(AppResources.Name);