From 444d48a259a8e95d30c611b64215cb59ee9f935b Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Wed, 13 Dec 2017 23:30:43 -0500 Subject: [PATCH] Revert "Update to Forms 2.4" This reverts commit 09ef1b66cc7dc5adfca35fbab3415d7a69726925. --- src/App/App.csproj | 2 +- src/App/Controls/ExtendedTableView.cs | 2 +- src/App/Pages/ScanPage.cs | 2 +- src/App/Pages/Settings/SettingsAboutPage.cs | 2 +- src/App/Pages/Settings/SettingsAddFolderPage.cs | 2 +- src/App/Pages/Settings/SettingsEditFolderPage.cs | 2 +- src/App/Pages/Settings/SettingsHelpPage.cs | 2 +- src/App/Pages/Settings/SettingsListFoldersPage.cs | 2 +- src/App/Pages/Settings/SettingsOptionsPage.cs | 2 +- src/App/Pages/Settings/SettingsPinPage.cs | 2 +- src/App/Pages/Settings/SettingsSyncPage.cs | 2 +- src/App/Pages/Vault/VaultListCiphersPage.cs | 2 +- src/App/Utilities/Extentions.cs | 4 ++-- src/App/Utilities/Helpers.cs | 2 +- 14 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/App/App.csproj b/src/App/App.csproj index 402a4c815..5b4ede89f 100644 --- a/src/App/App.csproj +++ b/src/App/App.csproj @@ -25,7 +25,7 @@ - + diff --git a/src/App/Controls/ExtendedTableView.cs b/src/App/Controls/ExtendedTableView.cs index 85dd30399..42a954208 100644 --- a/src/App/Controls/ExtendedTableView.cs +++ b/src/App/Controls/ExtendedTableView.cs @@ -43,7 +43,7 @@ namespace Bit.App.Controls protected override SizeRequest OnSizeRequest(double widthConstraint, double heightConstraint) { - if(!VerticalOptions.Expands && Device.RuntimePlatform != Device.UWP) + if(!VerticalOptions.Expands && Device.RuntimePlatform != Device.Windows) { var reflectionService = Resolver.Resolve(); var baseBaseOnSizeRequest = reflectionService.GetVisualElementOnSizeRequest(this); diff --git a/src/App/Pages/ScanPage.cs b/src/App/Pages/ScanPage.cs index 2e8b8c784..a3cd92fda 100644 --- a/src/App/Pages/ScanPage.cs +++ b/src/App/Pages/ScanPage.cs @@ -68,7 +68,7 @@ namespace Bit.App.Pages Children = { _zxing, _overlay } }; - if(Device.RuntimePlatform == Device.iOS || Device.RuntimePlatform == Device.UWP) + if(Device.RuntimePlatform == Device.iOS || Device.RuntimePlatform == Device.Windows) { ToolbarItems.Add(new DismissModalToolBarItem(this, AppResources.Close)); } diff --git a/src/App/Pages/Settings/SettingsAboutPage.cs b/src/App/Pages/Settings/SettingsAboutPage.cs index ff41bba1f..2eb5aa121 100644 --- a/src/App/Pages/Settings/SettingsAboutPage.cs +++ b/src/App/Pages/Settings/SettingsAboutPage.cs @@ -79,7 +79,7 @@ namespace Bit.App.Pages Spacing = 0 }; - if(Device.RuntimePlatform == Device.iOS || Device.RuntimePlatform == Device.UWP) + if(Device.RuntimePlatform == Device.iOS || Device.RuntimePlatform == Device.Windows) { ToolbarItems.Add(new DismissModalToolBarItem(this, AppResources.Close)); } diff --git a/src/App/Pages/Settings/SettingsAddFolderPage.cs b/src/App/Pages/Settings/SettingsAddFolderPage.cs index fa0c65a5a..cb17231df 100644 --- a/src/App/Pages/Settings/SettingsAddFolderPage.cs +++ b/src/App/Pages/Settings/SettingsAddFolderPage.cs @@ -106,7 +106,7 @@ namespace Bit.App.Pages Title = AppResources.AddFolder; Content = table; ToolbarItems.Add(saveToolBarItem); - if(Device.RuntimePlatform == Device.iOS || Device.RuntimePlatform == Device.UWP) + if(Device.RuntimePlatform == Device.iOS || Device.RuntimePlatform == Device.Windows) { ToolbarItems.Add(new DismissModalToolBarItem(this, AppResources.Cancel)); } diff --git a/src/App/Pages/Settings/SettingsEditFolderPage.cs b/src/App/Pages/Settings/SettingsEditFolderPage.cs index 2055010cc..348cda4cc 100644 --- a/src/App/Pages/Settings/SettingsEditFolderPage.cs +++ b/src/App/Pages/Settings/SettingsEditFolderPage.cs @@ -120,7 +120,7 @@ namespace Bit.App.Pages Title = AppResources.EditFolder; Content = mainTable; ToolbarItems.Add(saveToolBarItem); - if(Device.RuntimePlatform == Device.iOS || Device.RuntimePlatform == Device.UWP) + if(Device.RuntimePlatform == Device.iOS || Device.RuntimePlatform == Device.Windows) { ToolbarItems.Add(new DismissModalToolBarItem(this, AppResources.Cancel)); } diff --git a/src/App/Pages/Settings/SettingsHelpPage.cs b/src/App/Pages/Settings/SettingsHelpPage.cs index 4961aace1..01235f9d3 100644 --- a/src/App/Pages/Settings/SettingsHelpPage.cs +++ b/src/App/Pages/Settings/SettingsHelpPage.cs @@ -103,7 +103,7 @@ namespace Bit.App.Pages Spacing = 0 }; - if(Device.RuntimePlatform == Device.iOS || Device.RuntimePlatform == Device.UWP) + if(Device.RuntimePlatform == Device.iOS || Device.RuntimePlatform == Device.Windows) { ToolbarItems.Add(new DismissModalToolBarItem(this, AppResources.Close)); } diff --git a/src/App/Pages/Settings/SettingsListFoldersPage.cs b/src/App/Pages/Settings/SettingsListFoldersPage.cs index 34d674590..e07f2a3a4 100644 --- a/src/App/Pages/Settings/SettingsListFoldersPage.cs +++ b/src/App/Pages/Settings/SettingsListFoldersPage.cs @@ -41,7 +41,7 @@ namespace Bit.App.Pages ItemTemplate = new DataTemplate(() => new SettingsFolderListViewCell(this)) }; - if(Device.RuntimePlatform == Device.iOS || Device.RuntimePlatform == Device.UWP) + if(Device.RuntimePlatform == Device.iOS || Device.RuntimePlatform == Device.Windows) { ToolbarItems.Add(new DismissModalToolBarItem(this, AppResources.Close)); } diff --git a/src/App/Pages/Settings/SettingsOptionsPage.cs b/src/App/Pages/Settings/SettingsOptionsPage.cs index b1e5dfb34..e1bb9b589 100644 --- a/src/App/Pages/Settings/SettingsOptionsPage.cs +++ b/src/App/Pages/Settings/SettingsOptionsPage.cs @@ -223,7 +223,7 @@ namespace Bit.App.Pages Content = StackLayout }; - if(Device.RuntimePlatform == Device.iOS || Device.RuntimePlatform == Device.UWP) + if(Device.RuntimePlatform == Device.iOS || Device.RuntimePlatform == Device.Windows) { analyticsTable.RowHeight = websiteIconsTable.RowHeight = totpTable.RowHeight = -1; analyticsTable.EstimatedRowHeight = websiteIconsTable.EstimatedRowHeight = diff --git a/src/App/Pages/Settings/SettingsPinPage.cs b/src/App/Pages/Settings/SettingsPinPage.cs index d453d7cac..cd827a8fd 100644 --- a/src/App/Pages/Settings/SettingsPinPage.cs +++ b/src/App/Pages/Settings/SettingsPinPage.cs @@ -56,7 +56,7 @@ namespace Bit.App.Pages PinControl.Label.GestureRecognizers.Add(Tgr); instructionLabel.GestureRecognizers.Add(Tgr); - if(Device.RuntimePlatform == Device.iOS || Device.RuntimePlatform == Device.UWP) + if(Device.RuntimePlatform == Device.iOS || Device.RuntimePlatform == Device.Windows) { ToolbarItems.Add(new DismissModalToolBarItem(this, AppResources.Cancel)); } diff --git a/src/App/Pages/Settings/SettingsSyncPage.cs b/src/App/Pages/Settings/SettingsSyncPage.cs index e79b3e728..0b8980af3 100644 --- a/src/App/Pages/Settings/SettingsSyncPage.cs +++ b/src/App/Pages/Settings/SettingsSyncPage.cs @@ -57,7 +57,7 @@ namespace Bit.App.Pages Padding = new Thickness(15, 0) }; - if(Device.RuntimePlatform == Device.iOS || Device.RuntimePlatform == Device.UWP) + if(Device.RuntimePlatform == Device.iOS || Device.RuntimePlatform == Device.Windows) { ToolbarItems.Add(new DismissModalToolBarItem(this, AppResources.Close)); } diff --git a/src/App/Pages/Vault/VaultListCiphersPage.cs b/src/App/Pages/Vault/VaultListCiphersPage.cs index f34234b2d..2b3596de8 100644 --- a/src/App/Pages/Vault/VaultListCiphersPage.cs +++ b/src/App/Pages/Vault/VaultListCiphersPage.cs @@ -156,7 +156,7 @@ namespace Bit.App.Pages { Title = AppResources.SearchVault; - if(Device.RuntimePlatform == Device.iOS || Device.RuntimePlatform == Device.UWP) + if(Device.RuntimePlatform == Device.iOS || Device.RuntimePlatform == Device.Windows) { ToolbarItems.Add(new DismissModalToolBarItem(this)); } diff --git a/src/App/Utilities/Extentions.cs b/src/App/Utilities/Extentions.cs index 5ea3c317f..7927bd018 100644 --- a/src/App/Utilities/Extentions.cs +++ b/src/App/Utilities/Extentions.cs @@ -55,7 +55,7 @@ namespace Bit.App public static async Task PushForDeviceAsync(this INavigation navigation, Page page) { - if (Device.RuntimePlatform != Device.UWP) + if (Device.RuntimePlatform != Device.Windows) { await navigation.PushModalAsync(new ExtendedNavigationPage(page), true); } @@ -69,7 +69,7 @@ namespace Bit.App { if(navigation.ModalStack.Count < 1) { - if (navigation.NavigationStack.Count > 0 && Device.RuntimePlatform == Device.UWP) + if (navigation.NavigationStack.Count > 0 && Device.RuntimePlatform == Device.Windows) { await navigation.PopAsync(); } diff --git a/src/App/Utilities/Helpers.cs b/src/App/Utilities/Helpers.cs index a99b415f7..cc431dd8c 100644 --- a/src/App/Utilities/Helpers.cs +++ b/src/App/Utilities/Helpers.cs @@ -33,7 +33,7 @@ namespace Bit.App.Utilities return Android; case Device.WinPhone: return WinPhone; - case Device.UWP: + case Device.Windows: return Windows; default: throw new Exception("Unsupported platform.");