mirrors/bitwarden-android
1
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2024-11-01 07:35:52 +03:00
Code Issues Projects Releases Packages Wiki Activity

Revert "Update to Forms 2.4"

Browse source 
This reverts commit 09ef1b66cc.
This commit is contained in:
Kyle Spearrin 2017-12-13 23:30:43 -05:00
parent 4fd70ad252
commit 444d48a259
14 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/App/App.csproj
View file

@ -25,7 +25,7 @@
<PackageReference Include="Xam.Plugin.Connectivity" Version="3.0.3" /> <PackageReference Include="Xam.Plugin.Connectivity" Version="3.0.3" />
<PackageReference Include="Xam.Plugins.Settings" Version="3.1.1" /> <PackageReference Include="Xam.Plugins.Settings" Version="3.1.1" />
<PackageReference Include="Xamarin.FFImageLoading.Forms" Version="2.2.9" /> <PackageReference Include="Xamarin.FFImageLoading.Forms" Version="2.2.9" />
<PackageReference Include="Xamarin.Forms" Version="2.4.0.91020" /> <PackageReference Include="Xamarin.Forms" Version="2.3.4.267" />
<PackageReference Include="XLabs.IoC" Version="2.0.5782" /> <PackageReference Include="XLabs.IoC" Version="2.0.5782" />
<PackageReference Include="ZXing.Net.Mobile.Forms" Version="2.1.47" /> <PackageReference Include="ZXing.Net.Mobile.Forms" Version="2.1.47" />
</ItemGroup> </ItemGroup>

2
src/App/Controls/ExtendedTableView.cs
View file

@ -43,7 +43,7 @@ namespace Bit.App.Controls
protected override SizeRequest OnSizeRequest(double widthConstraint, double heightConstraint) 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<IReflectionService>(); var reflectionService = Resolver.Resolve<IReflectionService>();
var baseBaseOnSizeRequest = reflectionService.GetVisualElementOnSizeRequest(this); var baseBaseOnSizeRequest = reflectionService.GetVisualElementOnSizeRequest(this);

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

@ -68,7 +68,7 @@ namespace Bit.App.Pages
Children = { _zxing, _overlay } 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)); ToolbarItems.Add(new DismissModalToolBarItem(this, AppResources.Close));
} }

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

@ -79,7 +79,7 @@ namespace Bit.App.Pages
Spacing = 0 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)); ToolbarItems.Add(new DismissModalToolBarItem(this, AppResources.Close));
} }

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

@ -106,7 +106,7 @@ namespace Bit.App.Pages
Title = AppResources.AddFolder; Title = AppResources.AddFolder;
Content = table; Content = table;
ToolbarItems.Add(saveToolBarItem); 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)); ToolbarItems.Add(new DismissModalToolBarItem(this, AppResources.Cancel));
} }

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

@ -120,7 +120,7 @@ namespace Bit.App.Pages
Title = AppResources.EditFolder; Title = AppResources.EditFolder;
Content = mainTable; Content = mainTable;
ToolbarItems.Add(saveToolBarItem); 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)); ToolbarItems.Add(new DismissModalToolBarItem(this, AppResources.Cancel));
} }

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

@ -103,7 +103,7 @@ namespace Bit.App.Pages
Spacing = 0 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)); ToolbarItems.Add(new DismissModalToolBarItem(this, AppResources.Close));
} }

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

@ -41,7 +41,7 @@ namespace Bit.App.Pages
ItemTemplate = new DataTemplate(() => new SettingsFolderListViewCell(this)) 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)); ToolbarItems.Add(new DismissModalToolBarItem(this, AppResources.Close));
} }

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

@ -223,7 +223,7 @@ namespace Bit.App.Pages
Content = StackLayout 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.RowHeight = websiteIconsTable.RowHeight = totpTable.RowHeight = -1;
analyticsTable.EstimatedRowHeight = websiteIconsTable.EstimatedRowHeight = analyticsTable.EstimatedRowHeight = websiteIconsTable.EstimatedRowHeight =

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

@ -56,7 +56,7 @@ namespace Bit.App.Pages
PinControl.Label.GestureRecognizers.Add(Tgr); PinControl.Label.GestureRecognizers.Add(Tgr);
instructionLabel.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)); ToolbarItems.Add(new DismissModalToolBarItem(this, AppResources.Cancel));
} }

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

@ -57,7 +57,7 @@ namespace Bit.App.Pages
Padding = new Thickness(15, 0) 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)); ToolbarItems.Add(new DismissModalToolBarItem(this, AppResources.Close));
} }

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

@ -156,7 +156,7 @@ namespace Bit.App.Pages
{ {
Title = AppResources.SearchVault; 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)); ToolbarItems.Add(new DismissModalToolBarItem(this));
} }

4
src/App/Utilities/Extentions.cs
View file

@ -55,7 +55,7 @@ namespace Bit.App
public static async Task PushForDeviceAsync(this INavigation navigation, Page page) 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); await navigation.PushModalAsync(new ExtendedNavigationPage(page), true);
} }
@ -69,7 +69,7 @@ namespace Bit.App
{ {
if(navigation.ModalStack.Count < 1) 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(); await navigation.PopAsync();
} }

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

@ -33,7 +33,7 @@ namespace Bit.App.Utilities
return Android; return Android;
case Device.WinPhone: case Device.WinPhone:
return WinPhone; return WinPhone;
case Device.UWP: case Device.Windows:
return Windows; return Windows;
default: default:
throw new Exception("Unsupported platform."); throw new Exception("Unsupported platform.");