Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Updates images for the UWP login page #188

Closed
wants to merge 5 commits into from
Closed

Updates images for the UWP login page #188

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a32f95f
App: LoginPage.cs: Use a logo for the login button
alistair23 Nov 23, 2017
22f4985
App: LoginPage.cs: Use a ToolbarItem for cancel
alistair23 Nov 23, 2017
3477d0b
App: Use folder icon for save button
alistair23 Dec 1, 2017
5ae5b28
App: Use chevron for submit and select icons
alistair23 Dec 1, 2017
05d9fb2
App: LoginTwoFactorPage.cs: Use login icon for continue
alistair23 Dec 1, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/App/Pages/EnvironmentPage.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ private void Init()
Content = StackLayout
};

var toolbarItem = new ToolbarItem(AppResources.Save, null, async () => await SaveAsync(),
var toolbarItem = new ToolbarItem(AppResources.Save, "folder.png", async () => await SaveAsync(),
ToolbarItemOrder.Default, 0);

if(Device.RuntimePlatform == Device.iOS || Device.RuntimePlatform == Device.Windows)
Expand Down
2 changes: 1 addition & 1 deletion src/App/Pages/Lock/LockPasswordPage.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ public void Init()
table.EstimatedRowHeight = 70;
}

var loginToolbarItem = new ToolbarItem(AppResources.Submit, null, async () =>
var loginToolbarItem = new ToolbarItem(AppResources.Submit, "ion_chevron_right.png", async () =>
{
await CheckPasswordAsync();
}, ToolbarItemOrder.Default, 0);
Expand Down
11 changes: 6 additions & 5 deletions src/App/Pages/LoginPage.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,15 +104,16 @@ private void Init()

if(Device.RuntimePlatform == Device.iOS || Device.RuntimePlatform == Device.Windows)
{
var cancelToolbarItem = new ToolbarItem(AppResources.Cancel, "lock.png", async () =>
{
await this.Navigation.PopModalAsync();
}, ToolbarItemOrder.Default, 0);
table.RowHeight = -1;
table.EstimatedRowHeight = 70;
ToolbarItems.Add(new DismissModalToolBarItem(this, AppResources.Cancel, () =>
{
MessagingCenter.Send(Application.Current, "ShowStatusBar", false);
}));
ToolbarItems.Add(cancelToolbarItem);
}

var loginToolbarItem = new ToolbarItem(AppResources.LogIn, null, async () =>
var loginToolbarItem = new ToolbarItem(AppResources.LogIn, "login.png", async () =>
{
await LogIn();
}, ToolbarItemOrder.Default, 0);
Expand Down
2 changes: 1 addition & 1 deletion src/App/Pages/LoginTwoFactorPage.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ private void Init()
else if(_providerType.Value == TwoFactorProviderType.Authenticator ||
_providerType.Value == TwoFactorProviderType.Email)
{
var continueToolbarItem = new ToolbarItem(AppResources.Continue, null, async () =>
var continueToolbarItem = new ToolbarItem(AppResources.Continue, "login.png", async () =>
{
var token = TokenCell?.Entry.Text.Trim().Replace(" ", "");
await LogInAsync(token);
Expand Down
2 changes: 1 addition & 1 deletion src/App/Pages/PasswordHintPage.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ private void Init()
table.EstimatedRowHeight = 70;
}

var submitToolbarItem = new ToolbarItem(AppResources.Submit, null, async () =>
var submitToolbarItem = new ToolbarItem(AppResources.Submit, "ion_chevron_right.png", async () =>
{
await SubmitAsync();
}, ToolbarItemOrder.Default, 0);
Expand Down
2 changes: 1 addition & 1 deletion src/App/Pages/RegisterPage.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ private void Init()
Content = StackLayout
};

var loginToolbarItem = new ToolbarItem(AppResources.Submit, null, async () =>
var loginToolbarItem = new ToolbarItem(AppResources.Submit, "ion_chevron_right.png", async () =>
{
await Register();
}, ToolbarItemOrder.Default, 0);
Expand Down
2 changes: 1 addition & 1 deletion src/App/Pages/Settings/SettingsAddFolderPage.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ private void Init()
table.EstimatedRowHeight = 70;
}

var saveToolBarItem = new ToolbarItem(AppResources.Save, null, async () =>
var saveToolBarItem = new ToolbarItem(AppResources.Save, "folder.png", async () =>
{
if(_lastAction.LastActionWasRecent())
{
Expand Down
2 changes: 1 addition & 1 deletion src/App/Pages/Settings/SettingsEditFolderPage.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ private void Init()
mainTable.EstimatedRowHeight = 70;
}

var saveToolBarItem = new ToolbarItem(AppResources.Save, null, async () =>
var saveToolBarItem = new ToolbarItem(AppResources.Save, "folder.png", async () =>
{
if(_lastAction.LastActionWasRecent())
{
Expand Down
2 changes: 1 addition & 1 deletion src/App/Pages/Tools/ToolsPasswordGeneratorPage.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ public void Init()

if(_passwordValueAction != null)
{
var selectToolBarItem = new ToolbarItem(AppResources.Select, null, async () =>
var selectToolBarItem = new ToolbarItem(AppResources.Select, "ion_chevron_right.png", async () =>
{
if(_fromAutofill)
{
Expand Down
2 changes: 1 addition & 1 deletion src/App/Pages/Vault/VaultAddCipherPage.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -572,7 +572,7 @@ private void InitTable()

private void InitSave()
{
var saveToolBarItem = new ToolbarItem(AppResources.Save, null, async () =>
var saveToolBarItem = new ToolbarItem(AppResources.Save, "folder.png", async () =>
{
if(_lastAction.LastActionWasRecent())
{
Expand Down
2 changes: 1 addition & 1 deletion src/App/Pages/Vault/VaultAttachmentsPage.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ private void Init()
Margin = new Thickness(0, 40, 0, 0)
};

var saveToolBarItem = new ToolbarItem(AppResources.Save, null, async () =>
var saveToolBarItem = new ToolbarItem(AppResources.Save, "folder.png", async () =>
{
if(_lastAction.LastActionWasRecent() || _cipher == null)
{
Expand Down
2 changes: 1 addition & 1 deletion src/App/Pages/Vault/VaultCustomFieldsPage.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ private void Init()
Margin = new Thickness(10, 40, 10, 0)
};

SaveToolbarItem = new ToolbarItem(AppResources.Save, null, async () =>
SaveToolbarItem = new ToolbarItem(AppResources.Save, "folder.png", async () =>
{
if(_lastAction.LastActionWasRecent() || _cipher == null)
{
Expand Down
2 changes: 1 addition & 1 deletion src/App/Pages/Vault/VaultEditCipherPage.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -438,7 +438,7 @@ private void InitTable()

private void InitSave()
{
var saveToolBarItem = new ToolbarItem(AppResources.Save, null, async () =>
var saveToolBarItem = new ToolbarItem(AppResources.Save, "folder.png", async () =>
{
if(_lastAction.LastActionWasRecent())
{
Expand Down