From 040dc72877003ac9335df1bd8788790b44d5f13c Mon Sep 17 00:00:00 2001 From: Alistair Francis Date: Wed, 6 Dec 2017 07:26:30 -0800 Subject: [PATCH] Login page fixes (#193) * App: LoginPage.cs: Correct the Windows device specifier The WinPhone device specifier doesn't correctly take effect, use the Windows decvice instead. Signed-off-by: Alistair Francis * App: LoginPage.cs: Fix the FormEntryCell imageSource The images don't appear (at least on UWP) without the file extension. Signed-off-by: Alistair Francis --- src/App/Pages/LoginPage.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/App/Pages/LoginPage.cs b/src/App/Pages/LoginPage.cs index ca0c9d4d5..c70b41a91 100644 --- a/src/App/Pages/LoginPage.cs +++ b/src/App/Pages/LoginPage.cs @@ -45,12 +45,12 @@ 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", containerPadding: padding); + useLabelAsPlaceholder: true, imageSource: "lock.png", containerPadding: padding); EmailCell = new FormEntryCell(AppResources.EmailAddress, nextElement: PasswordCell.Entry, - entryKeyboard: Keyboard.Email, useLabelAsPlaceholder: true, imageSource: "envelope", + entryKeyboard: Keyboard.Email, useLabelAsPlaceholder: true, imageSource: "envelope.png", containerPadding: padding); var lastLoginEmail = _settings.GetValueOrDefault(Constants.LastLoginEmail, string.Empty); @@ -97,7 +97,7 @@ namespace Bit.App.Pages var layout = new StackLayout { Children = { table, forgotPasswordButton }, - Spacing = Helpers.OnPlatform(iOS: 0, Android: 10, WinPhone: 0) + Spacing = Helpers.OnPlatform(iOS: 0, Android: 10, Windows: 0) }; var scrollView = new ScrollView { Content = layout };