mirrors/bitwarden-android
1
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2024-11-01 07:35:52 +03:00
Code Issues Projects Releases Packages Wiki Activity

monospace fonts for card code

Browse source
This commit is contained in:
Kyle Spearrin 2018-06-18 09:12:03 -04:00
parent 9523c7ab33
commit d359547dab
4 changed files with 41 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
src/Android/Resources/Resource.Designer.cs generated
View file

@ -6506,17 +6506,17 @@ namespace Bit.Android
// aapt resource value: 0x7f0a0051 // aapt resource value: 0x7f0a0051
public const int ApplicationName = 2131361873; public const int ApplicationName = 2131361873;
// aapt resource value: 0x7f0a00ab // aapt resource value: 0x7f0a00b2
public const int AutoFillServiceDescription = 2131361963; public const int AutoFillServiceDescription = 2131361970;
// aapt resource value: 0x7f0a00aa // aapt resource value: 0x7f0a00b1
public const int AutoFillServiceSummary = 2131361962; public const int AutoFillServiceSummary = 2131361969;
// aapt resource value: 0x7f0a0050 // aapt resource value: 0x7f0a0050
public const int Hello = 2131361872; public const int Hello = 2131361872;
// aapt resource value: 0x7f0a00ac // aapt resource value: 0x7f0a00b3
public const int MyVault = 2131361964; public const int MyVault = 2131361971;
// aapt resource value: 0x7f0a0027 // aapt resource value: 0x7f0a0027
public const int abc_action_bar_home_description = 2131361831; public const int abc_action_bar_home_description = 2131361831;
@ -6671,6 +6671,27 @@ namespace Bit.Android
// aapt resource value: 0x7f0a000f // aapt resource value: 0x7f0a000f
public const int common_signin_button_text_long = 2131361807; 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 // aapt resource value: 0x7f0a0052
public const int hockeyapp_crash_dialog_app_name_fallback = 2131361874; public const int hockeyapp_crash_dialog_app_name_fallback = 2131361874;

6
src/App/Pages/Vault/VaultAddCipherPage.cs
View file

@ -460,11 +460,15 @@ namespace Bit.App.Pages
} }
else if(_type == CipherType.Card) 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)) if(!string.IsNullOrWhiteSpace(_defaultCardCode))
{ {
CardCodeCell.Entry.Text = _defaultCardCode; CardCodeCell.Entry.Text = _defaultCardCode;
} }
CardCodeCell.Entry.FontFamily =
Helpers.OnPlatform(iOS: "Menlo-Regular", Android: "monospace", Windows: "Courier");
CardExpYearCell = new FormEntryCell(AppResources.ExpirationYear, Keyboard.Numeric, CardExpYearCell = new FormEntryCell(AppResources.ExpirationYear, Keyboard.Numeric,
nextElement: CardCodeCell.Entry); nextElement: CardCodeCell.Entry);
if(!string.IsNullOrWhiteSpace(_defaultCardExpYear)) if(!string.IsNullOrWhiteSpace(_defaultCardExpYear))

2
src/App/Pages/Vault/VaultEditCipherPage.cs
View file

@ -221,6 +221,8 @@ namespace Bit.App.Pages
CardCodeCell = new FormEntryCell(AppResources.SecurityCode, Keyboard.Numeric, CardCodeCell = new FormEntryCell(AppResources.SecurityCode, Keyboard.Numeric,
isPassword: true, nextElement: NotesCell.Editor, button1: "eye.png"); isPassword: true, nextElement: NotesCell.Editor, button1: "eye.png");
CardCodeCell.Entry.Text = Cipher.Card.Code?.Decrypt(Cipher.OrganizationId); 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, CardExpYearCell = new FormEntryCell(AppResources.ExpirationYear, Keyboard.Numeric,
nextElement: CardCodeCell.Entry); nextElement: CardCodeCell.Entry);

11
src/App/Pages/Vault/VaultViewCipherPage.cs
View file

@ -168,14 +168,15 @@ namespace Bit.App.Pages
CardExpCell = new LabeledValueCell(AppResources.Expiration); CardExpCell = new LabeledValueCell(AppResources.Expiration);
CardExpCell.Value.SetBinding(Label.TextProperty, nameof(VaultViewCipherPageModel.CardExp)); CardExpCell.Value.SetBinding(Label.TextProperty, nameof(VaultViewCipherPageModel.CardExp));
CardCodeCell = new LabeledValueCell(AppResources.SecurityCode, button1Image: string.Empty, button2Image: "clipboard.png"); CardCodeCell = new LabeledValueCell(AppResources.SecurityCode, button1Image: string.Empty,
CardCodeCell.Value.SetBinding(Label.TextProperty, button2Image: "clipboard.png");
nameof(VaultViewCipherPageModel.MaskedCardCode)); CardCodeCell.Value.SetBinding(Label.TextProperty, nameof(VaultViewCipherPageModel.MaskedCardCode));
CardCodeCell.Button1.SetBinding(Button.ImageProperty, CardCodeCell.Button1.SetBinding(Button.ImageProperty,
nameof(VaultViewCipherPageModel.CardCodeShowHideImage)); nameof(VaultViewCipherPageModel.CardCodeShowHideImage));
CardCodeCell.Button1.Command = CardCodeCell.Button1.Command = new Command(() => Model.RevealCardCode = !Model.RevealCardCode);
new Command(() => Model.RevealCardCode = !Model.RevealCardCode);
CardCodeCell.Button2.Command = new Command(() => Copy(Model.CardCode, AppResources.SecurityCode)); CardCodeCell.Button2.Command = new Command(() => Copy(Model.CardCode, AppResources.SecurityCode));
CardCodeCell.Value.FontFamily =
Helpers.OnPlatform(iOS: "Menlo-Regular", Android: "monospace", Windows: "Courier");
break; break;
case CipherType.Identity: case CipherType.Identity:
IdNameCell = new LabeledValueCell(AppResources.Name); IdNameCell = new LabeledValueCell(AppResources.Name);