Android Push/Pop Navigation (#837)

* Android Navigation * - fix layout * - changes * - yay pushing * - wire up nav to use bundle ids * - cleanup * - setup pop * - build up nav stack * - remove nav push * - remove graph xml * Update global.json * - add android to non net6 controls project * - fix namespace * Update Microsoft.Maui-net6.sln
dotnet · Apr 27, 2021 · 4f4fb9d · 4f4fb9d
1 parent dca3768
commit 4f4fb9d
Show file tree

Hide file tree

Showing 20 changed files with 1,779 additions and 83 deletions.
diff --git a/.nuspec/Microsoft.Maui.Controls.MultiTargeting.targets b/.nuspec/Microsoft.Maui.Controls.MultiTargeting.targets
@@ -78,6 +78,10 @@
     <PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" />
     <PackageReference Include="Xamarin.Google.Android.Material" />
     <PackageReference Include="Xamarin.AndroidX.Legacy.Support.V4" />
+    <PackageReference Include="Xamarin.AndroidX.Navigation.UI" />
+    <PackageReference Include="Xamarin.AndroidX.Navigation.Fragment" />
+    <PackageReference Include="Xamarin.AndroidX.Navigation.Runtime" />
+    <PackageReference Include="Xamarin.AndroidX.Navigation.Common" />
   </ItemGroup>
   <PropertyGroup Condition="$(TargetFramework.Contains('-windows')) == true ">
     <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>

diff --git a/eng/AndroidX.targets b/eng/AndroidX.targets
@@ -19,6 +19,22 @@
         Update="Xamarin.AndroidX.Lifecycle.LiveData"
         Version="2.3.1-$(_AndroidXVersion)"
     />
+    <PackageReference
+        Update="Xamarin.AndroidX.Navigation.UI"
+        Version="2.3.5-$(_AndroidXVersion)"
+    />
+    <PackageReference
+        Update="Xamarin.AndroidX.Navigation.Fragment"
+        Version="2.3.5-$(_AndroidXVersion)"
+    />
+    <PackageReference
+        Update="Xamarin.AndroidX.Navigation.Runtime"
+        Version="2.3.5-$(_AndroidXVersion)"
+    />
+    <PackageReference
+        Update="Xamarin.AndroidX.Navigation.Common"
+        Version="2.3.5-$(_AndroidXVersion)"
+    />
     <PackageReference
         Update="Xamarin.AndroidX.MediaRouter"
         Version="1.2.2.1-$(_AndroidXVersion)"

diff --git a/src/Controls/src/Core/Controls.Core.csproj b/src/Controls/src/Core/Controls.Core.csproj
@@ -1,6 +1,6 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="MSBuild.Sdk.Extras">
 	<PropertyGroup>
-		<TargetFrameworks>netstandard2.1;netstandard2.0</TargetFrameworks>
+		<TargetFrameworks>netstandard2.1;netstandard2.0;$(AndroidTargetFrameworks)</TargetFrameworks>
 		<AssemblyName>Microsoft.Maui.Controls</AssemblyName>
 	</PropertyGroup>
 	<PropertyGroup>