mirrors/bitwarden-android
1
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2024-12-24 18:08:26 +03:00
Code Issues Projects Releases Packages Wiki Activity

App: LoginPage.cs: Use a logo for the login button (#200)

Browse source 
* App: LoginPage.cs: Use a logo for the login button

This adds a helper function which we can use to set logos for Windows
platforms to ensure the user can see the UWP toolbar actions. This won't
have an effect on non-Windows platforms.

Signed-off-by: Alistair Francis <alistair@alistair23.me>

* App: Pages: Set an icon for the save button on Windows

Signed-off-by: Alistair Francis <alistair@alistair23.me>

* App: Pages: Set an icon for submit, save and continue

Set an icon for the submit, save and continue buttons when running on
Windows platforms.

Signed-off-by: Alistair Francis <alistair@alistair23.me>

* App: Pages: Valut: Set an icon for the edit button

Set the cog icon for the edit button when running on Windows platforms.

Signed-off-by: Alistair Francis <alistair@alistair23.me>
This commit is contained in:
Alistair Francis 2017-12-11 12:51:16 -08:00 committed by Kyle Spearrin
parent 25b75fd6e4
commit baf785d9f1
15 changed files with 26 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/App/Pages/EnvironmentPage.cs
View file

@ -2,6 +2,7 @@
using Bit.App.Abstractions;
using Bit.App.Controls;
using Bit.App.Resources;
using Bit.App.Utilities;
using Xamarin.Forms;
using XLabs.Ioc;
using Acr.UserDialogs;
@ -111,7 +112,7 @@ namespace Bit.App.Pages
Content = StackLayout
};
var toolbarItem = new ToolbarItem(AppResources.Save, null, async () => await SaveAsync(),
var toolbarItem = new ToolbarItem(AppResources.Save, Helpers.ToolbarImage("envelope.png"), async () => await SaveAsync(),
ToolbarItemOrder.Default, 0);
if(Device.RuntimePlatform == Device.iOS || Device.RuntimePlatform == Device.Windows)

2
src/App/Pages/Lock/LockPasswordPage.cs
View file

@ -81,7 +81,7 @@ namespace Bit.App.Pages
table.EstimatedRowHeight = 70;
}
var loginToolbarItem = new ToolbarItem(AppResources.Submit, null, async () =>
var loginToolbarItem = new ToolbarItem(AppResources.Submit, Helpers.ToolbarImage("login.png"), async () =>
{
await CheckPasswordAsync();
}, ToolbarItemOrder.Default, 0);

2
src/App/Pages/LoginPage.cs
View file

@ -112,7 +112,7 @@ namespace Bit.App.Pages
}));
}
var loginToolbarItem = new ToolbarItem(AppResources.LogIn, null, async () =>
var loginToolbarItem = new ToolbarItem(AppResources.LogIn, Helpers.ToolbarImage("login.png"), async () =>
{
await LogIn();
}, ToolbarItemOrder.Default, 0);

2
src/App/Pages/LoginTwoFactorPage.cs
View file

@ -114,7 +114,7 @@ namespace Bit.App.Pages
else if(_providerType.Value == TwoFactorProviderType.Authenticator ||
_providerType.Value == TwoFactorProviderType.Email)
{
var continueToolbarItem = new ToolbarItem(AppResources.Continue, null, async () =>
var continueToolbarItem = new ToolbarItem(AppResources.Continue, Helpers.ToolbarImage("login.png"), async () =>
{
var token = TokenCell?.Entry.Text.Trim().Replace(" ", "");
await LogInAsync(token);

2
src/App/Pages/PasswordHintPage.cs
View file

@ -80,7 +80,7 @@ namespace Bit.App.Pages
table.EstimatedRowHeight = 70;
}
var submitToolbarItem = new ToolbarItem(AppResources.Submit, null, async () =>
var submitToolbarItem = new ToolbarItem(AppResources.Submit, Helpers.ToolbarImage("ion_chevron_right.png"), async () =>
{
await SubmitAsync();
}, ToolbarItemOrder.Default, 0);

2
src/App/Pages/RegisterPage.cs
View file

@ -117,7 +117,7 @@ namespace Bit.App.Pages
Content = StackLayout
};
var loginToolbarItem = new ToolbarItem(AppResources.Submit, null, async () =>
var loginToolbarItem = new ToolbarItem(AppResources.Submit, Helpers.ToolbarImage("ion_chevron_right.png"), async () =>
{
await Register();
}, ToolbarItemOrder.Default, 0);

2
src/App/Pages/Settings/SettingsAddFolderPage.cs
View file

@ -56,7 +56,7 @@ namespace Bit.App.Pages
table.EstimatedRowHeight = 70;
}
var saveToolBarItem = new ToolbarItem(AppResources.Save, null, async () =>
var saveToolBarItem = new ToolbarItem(AppResources.Save, Helpers.ToolbarImage("envelope.png"), async () =>
{
if(_lastAction.LastActionWasRecent())
{

2
src/App/Pages/Settings/SettingsEditFolderPage.cs
View file

@ -73,7 +73,7 @@ namespace Bit.App.Pages
mainTable.EstimatedRowHeight = 70;
}
var saveToolBarItem = new ToolbarItem(AppResources.Save, null, async () =>
var saveToolBarItem = new ToolbarItem(AppResources.Save, Helpers.ToolbarImage("envelope.png"), async () =>
{
if(_lastAction.LastActionWasRecent())
{

2
src/App/Pages/Tools/ToolsPasswordGeneratorPage.cs
View file

@ -112,7 +112,7 @@ namespace Bit.App.Pages
if(_passwordValueAction != null)
{
var selectToolBarItem = new ToolbarItem(AppResources.Select, null, async () =>
var selectToolBarItem = new ToolbarItem(AppResources.Select, Helpers.ToolbarImage("ion_chevron_right.png"), async () =>
{
if(_fromAutofill)
{

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

@ -572,7 +572,7 @@ namespace Bit.App.Pages
private void InitSave()
{
var saveToolBarItem = new ToolbarItem(AppResources.Save, null, async () =>
var saveToolBarItem = new ToolbarItem(AppResources.Save, Helpers.ToolbarImage("envelope.png"), async () =>
{
if(_lastAction.LastActionWasRecent())
{

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

@ -132,7 +132,7 @@ namespace Bit.App.Pages
Margin = new Thickness(0, 40, 0, 0)
};
var saveToolBarItem = new ToolbarItem(AppResources.Save, null, async () =>
var saveToolBarItem = new ToolbarItem(AppResources.Save, Helpers.ToolbarImage("envelope.png"), async () =>
{
if(_lastAction.LastActionWasRecent() || _cipher == null)
{

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

@ -64,7 +64,7 @@ namespace Bit.App.Pages
Margin = new Thickness(10, 40, 10, 0)
};
SaveToolbarItem = new ToolbarItem(AppResources.Save, null, async () =>
SaveToolbarItem = new ToolbarItem(AppResources.Save, Helpers.ToolbarImage("envelope.png"), async () =>
{
if(_lastAction.LastActionWasRecent() || _cipher == null)
{

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

@ -438,7 +438,7 @@ namespace Bit.App.Pages
private void InitSave()
{
var saveToolBarItem = new ToolbarItem(AppResources.Save, null, async () =>
var saveToolBarItem = new ToolbarItem(AppResources.Save, Helpers.ToolbarImage("envelope.png"), async () =>
{
if(_lastAction.LastActionWasRecent())
{

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

@ -500,6 +500,7 @@ namespace Bit.App.Pages
_page = page;
_cipherId = cipherId;
Text = AppResources.Edit;
Icon = Helpers.ToolbarImage("cog.png");
ClickAction = async () => await ClickedItem();
}

11
src/App/Utilities/Helpers.cs
View file

@ -73,6 +73,17 @@ namespace Bit.App.Utilities
return " ";
}
public static string ToolbarImage(string image)
{
if (Device.RuntimePlatform == Device.iOS || Device.RuntimePlatform == Device.Android)
{
return null;
}
return image;
}
public static async void CipherMoreClickedAsync(Page page, VaultListPageModel.Cipher cipher, bool autofill)
{
var buttons = new List<string> { AppResources.View, AppResources.Edit };