GitLab's annual major release is around the corner. Along with a lot of new and exciting features, there will be a few breaking changes. Learn more here.

Commit 26bd9bcd authored by Joshua Rehagen's avatar Joshua Rehagen
Browse files

thinkgeo/products/thinkgeosdk#277

Upgraded the dependencies, converted MasterDetail page to flyout page since it was obsoleted.
parent 3b992195
......@@ -54,14 +54,11 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="ThinkGeo.UI.Android">
<Version>12.3.5</Version>
<Version>13.0.0-beta225</Version>
</PackageReference>
<PackageReference Include="ThinkGeo.UI.XamarinForms" Version="12.3.5" />
<PackageReference Include="ThinkGeo.UI.XamarinForms.Android">
<Version>12.3.5</Version>
<Version>13.0.0-beta137</Version>
</PackageReference>
<PackageReference Include="Xamarin.Forms" Version="4.7.0.1351" />
<PackageReference Include="Xamarin.Essentials" Version="1.5.3.2" />
</ItemGroup>
<ItemGroup>
<Compile Include="MainActivity.cs" />
......
......@@ -236,7 +236,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="ThinkGeo.UI.XamarinForms.iOS">
<Version>13.0.0-beta127</Version>
<Version>13.0.0-beta132</Version>
</PackageReference>
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
......
......@@ -17,7 +17,7 @@ namespace HowDoISample
public App()
{
InitializeComponent();
Device.SetFlags(new string[] { "Expander_Experimental", "RadioButton_Experimental" });
// Device.SetFlags(new string[] { "Expander_Experimental", "RadioButton_Experimental" });
MainPage = new LoadingPage();
}
......
......@@ -433,10 +433,10 @@
<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="ThinkGeo.Core" Version="13.0.0-beta262" />
<PackageReference Include="ThinkGeo.PostgreSql" Version="13.0.0-beta252" />
<PackageReference Include="ThinkGeo.SqlServer" Version="13.0.0-beta250" />
<PackageReference Include="ThinkGeo.UI.XamarinForms" Version="13.0.0-beta115" />
<PackageReference Include="ThinkGeo.Core" Version="13.0.0-beta266" />
<PackageReference Include="ThinkGeo.PostgreSql" Version="13.0.0-beta256" />
<PackageReference Include="ThinkGeo.SqlServer" Version="13.0.0-beta255" />
<PackageReference Include="ThinkGeo.UI.XamarinForms" Version="13.0.0-beta120" />
<PackageReference Include="Xamarin.CommunityToolkit" Version="1.1.0" />
<PackageReference Include="Xamarin.Forms" Version="5.0.0.2012" />
<PackageReference Include="Xamarin.Essentials" Version="1.6.1" />
......
<?xml version="1.0" encoding="utf-8" ?>
<MasterDetailPage xmlns="http://xamarin.com/schemas/2014/forms"
<FlyoutPage xmlns="http://xamarin.com/schemas/2014/forms"
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
xmlns:d="http://xamarin.com/schemas/2014/forms/design"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
mc:Ignorable="d"
xmlns:views="clr-namespace:ThinkGeo.UI.XamarinForms.HowDoI"
xmlns:samples="clr-namespace:ThinkGeo.UI.XamarinForms.HowDoI"
x:Class="ThinkGeo.UI.XamarinForms.HowDoI.MainPage">
<MasterDetailPage.Master>
x:Class="ThinkGeo.UI.XamarinForms.HowDoI.MainPage"
FlyoutLayoutBehavior="Popover">
<FlyoutPage.Flyout>
<views:MenuPage />
</MasterDetailPage.Master>
</FlyoutPage.Flyout>
<MasterDetailPage.Detail>
<FlyoutPage.Detail>
<NavigationPage>
<x:Arguments>
<samples:BasicNavigationSample />
......@@ -23,6 +25,6 @@
</OnPlatform>
</NavigationPage.Icon>
</NavigationPage>
</MasterDetailPage.Detail>
</FlyoutPage.Detail>
</MasterDetailPage>
</FlyoutPage>
......@@ -11,13 +11,11 @@ namespace ThinkGeo.UI.XamarinForms.HowDoI
// Learn more about making custom code visible in the Xamarin.Forms previewer
// by visiting https://aka.ms/xamarinforms-previewer
[DesignTimeVisible(false)]
public partial class MainPage : MasterDetailPage
public partial class MainPage : FlyoutPage
{
public MainPage()
{
InitializeComponent();
MasterBehavior = MasterBehavior.Popover;
}
public async Task NavigateFromMenu(SampleMenuItem sample)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment