bitwarden/mobile
1
0
Fork 0
mirror of https://github.com/bitwarden/mobile synced 2026-01-04 17:43:17 +00:00
Code Issues Releases Wiki Activity

Improve the navigation on Windows platforms (#199)

Browse Source 
* App: Don't default to modal pushes on Windows

On Windows we generally want to avoid modal pushes as that doesn't give
us a back arrow on Windows 10. Default to non-modal pushes.

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

* App: LoginPage.cs: Don't add the cancel button on Windows

With Windows Phone having a HW back buton and the UWP toolbar now
supporting a back button we no longer need a cancel button.

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

* src: Set a icon for UWP cancel buttons

We can't always use modal pages and in that case we need to set a icon
for UWP otherwise the button can't be seen on the toolbar.

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

* App: Pages: Don't add Cancel/Close button on Windows

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

* Update DismissModalToolBarItem.cs
This commit is contained in:
Alistair Francis
2017-12-12 13:03:25 -08:00
committed by Kyle Spearrin
parent baf785d9f1
commit b4e7fd6fa8
15 changed files with 28 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/App/Pages/EnvironmentPage.cs
View File

@@ -115,7 +115,7 @@ namespace Bit.App.Pages
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)
if(Device.RuntimePlatform == Device.iOS)
{
table.RowHeight = table2.RowHeight = -1;
table.EstimatedRowHeight = table2.EstimatedRowHeight = 70;

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

@@ -102,7 +102,7 @@ namespace Bit.App.Pages
var scrollView = new ScrollView { Content = layout };
if(Device.RuntimePlatform == Device.iOS || Device.RuntimePlatform == Device.Windows)
if(Device.RuntimePlatform == Device.iOS)
{
table.RowHeight = -1;
table.EstimatedRowHeight = 70;

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

@@ -122,7 +122,7 @@ namespace Bit.App.Pages
await Register();
}, ToolbarItemOrder.Default, 0);
if(Device.RuntimePlatform == Device.iOS || Device.RuntimePlatform == Device.Windows)
if(Device.RuntimePlatform == Device.iOS)
{
table.RowHeight = table2.RowHeight = -1;
table.EstimatedRowHeight = table2.EstimatedRowHeight = 70;

2
src/App/Pages/ScanPage.cs
View File

@@ -68,7 +68,7 @@ namespace Bit.App.Pages
Children = { _zxing, _overlay }
};
if(Device.RuntimePlatform == Device.iOS || Device.RuntimePlatform == Device.Windows)
if(Device.RuntimePlatform == Device.iOS)
{
ToolbarItems.Add(new DismissModalToolBarItem(this, AppResources.Close));
}

2
src/App/Pages/Tools/ToolsExtensionPage.cs
View File

@@ -205,7 +205,7 @@ namespace Bit.App.Pages
VerticalOptions = LayoutOptions.FillAndExpand
};
if(Device.RuntimePlatform == Device.iOS || Device.RuntimePlatform == Device.Windows)
if(Device.RuntimePlatform == Device.iOS)
{
ToolbarItems.Add(new DismissModalToolBarItem(this, AppResources.Close));
}

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

@@ -87,7 +87,7 @@ namespace Bit.App.Pages
}
};
if(Device.RuntimePlatform == Device.iOS || Device.RuntimePlatform == Device.Windows)
if(Device.RuntimePlatform == Device.iOS)
{
table.RowHeight = -1;
table.EstimatedRowHeight = 44;

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

@@ -170,7 +170,7 @@ namespace Bit.App.Pages
Title = AppResources.AddItem;
Content = Table;
if(Device.RuntimePlatform == Device.iOS || Device.RuntimePlatform == Device.Windows)
if(Device.RuntimePlatform == Device.iOS)
{
ToolbarItems.Add(new DismissModalToolBarItem(this, AppResources.Cancel));
}

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

@@ -191,7 +191,7 @@ namespace Bit.App.Pages
ToolbarItems.Add(saveToolBarItem);
}
if(Device.RuntimePlatform == Device.iOS || Device.RuntimePlatform == Device.Windows)
if(Device.RuntimePlatform == Device.iOS)
{
ListView.RowHeight = -1;
NewTable.RowHeight = -1;

4
src/App/Pages/Vault/VaultCustomFieldsPage.cs
View File

@@ -159,7 +159,7 @@ namespace Bit.App.Pages
{
Content = Table;
ToolbarItems.Add(SaveToolbarItem);
if(Device.RuntimePlatform == Device.iOS || Device.RuntimePlatform == Device.Windows)
if(Device.RuntimePlatform == Device.iOS)
{
ToolbarItems.Add(new DismissModalToolBarItem(this, AppResources.Cancel));
}
@@ -211,7 +211,7 @@ namespace Bit.App.Pages
else
{
Content = NoDataLabel;
if(Device.RuntimePlatform == Device.iOS || Device.RuntimePlatform == Device.Windows)
if(Device.RuntimePlatform == Device.iOS)
{
ToolbarItems.Add(new DismissModalToolBarItem(this, AppResources.Close));
}

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

@@ -139,7 +139,7 @@ namespace Bit.App.Pages
Title = AppResources.EditItem;
Content = Table;
if(Device.RuntimePlatform == Device.iOS || Device.RuntimePlatform == Device.Windows)
if(Device.RuntimePlatform == Device.iOS)
{
ToolbarItems.Add(new DismissModalToolBarItem(this, AppResources.Cancel));
}

2
src/App/Pages/Vault/VaultViewCipherPage.cs
View File

@@ -76,7 +76,7 @@ namespace Bit.App.Pages
{
EditItem = new EditCipherToolBarItem(this, _cipherId);
ToolbarItems.Add(EditItem);
if(Device.RuntimePlatform == Device.iOS || Device.RuntimePlatform == Device.Windows)
if(Device.RuntimePlatform == Device.iOS)
{
ToolbarItems.Add(new DismissModalToolBarItem(this));
}