feat(maps): Restore iOS/Android maps control

unoplatform · May 9, 2023 · 814bd7e · 814bd7e
1 parent d60ba29
commit 814bd7e
Show file tree

Hide file tree

Showing 6 changed files with 326 additions and 180 deletions.
diff --git a/build/Uno.UI.Build.csproj b/build/Uno.UI.Build.csproj
@@ -481,10 +481,7 @@
 			<_diffPackage Include="$(PackageNamePrefix)" Other="$(PackageNamePrefix).$(GITVERSION_SemVer).nupkg" />
 			<_diffPackage Include="$(PackageNamePrefix).Foldable" Other="..\..\..\NugetPackages-Artifacts-netcoremobile-$(ArtifactsPlatformName)\vslatest-netcoremobile\$(PackageNamePrefix).Foldable.$(GITVERSION_SemVer).nupkg" />
 			<_diffPackage Include="$(PackageNamePrefix).Lottie" Other="$(PackageNamePrefix).Lottie.$(GITVERSION_SemVer).nupkg" />
-			<!--
-			To be restored before uno 5
 			<_diffPackage Include="$(PackageNamePrefix).Maps" Other="..\..\..\NugetPackages-Artifacts-netcoremobile-$(ArtifactsPlatformName)\vslatest-netcoremobile\$(PackageNamePrefix).Maps.$(GITVERSION_SemVer).nupkg" />
-			-->
 			<_diffPackage Include="$(PackageNamePrefix).MSAL" Other="$(PackageNamePrefix).MSAL.$(GITVERSION_SemVer).nupkg" />
 			<_diffPackage Include="$(PackageNamePrefix).Svg" Other="$(PackageNamePrefix).Svg.$(GITVERSION_SemVer).nupkg" />
 			<!-- <_diffPackage Include="$(PackageNamePrefix).RemoteControl" Other="$(PackageNamePrefix).RemoteControl.$(GITVERSION_SemVer).nupkg" /> -->

diff --git a/src/Uno.UI-netcoremobile-only.slnf b/src/Uno.UI-netcoremobile-only.slnf
@@ -21,6 +21,7 @@
       "Uno.UI.BindingHelper.Android\\Uno.UI.BindingHelper.Android.netcoremobile.csproj",
       "Uno.UI.Composition\\Uno.UI.Composition.netcoremobile.csproj",
       "Uno.UI.Dispatching\\Uno.UI.Dispatching.netcoremobile.csproj",
+      "Uno.UI.Maps\\Uno.UI.Maps.netcoremobile.csproj",
       "Uno.UI.FluentTheme.v1\\Uno.UI.FluentTheme.v1.netcoremobile.csproj",
       "Uno.UI.FluentTheme.v2\\Uno.UI.FluentTheme.v2.netcoremobile.csproj",
       "Uno.UI.FluentTheme\\Uno.UI.FluentTheme.netcoremobile.csproj",

diff --git a/src/Uno.UI.Maps/MapPresenter.Android.cs b/src/Uno.UI.Maps/MapPresenter.Android.cs
@@ -131,7 +131,7 @@ private void OnControlUnloaded()
 			}
 		}
 
-		private void MapTouchOccurred(object sender, MotionEvent e)
+		private void MapTouchOccurred(object? sender, MotionEvent e)
 		{
 
 		}

diff --git a/src/Uno.UI.Maps/MapPresenter.iOS.cs b/src/Uno.UI.Maps/MapPresenter.iOS.cs
@@ -78,7 +78,7 @@ private IDisposable UpdateOwnerSubscriptions(MapControl owner)
 			return disposables;
 		}
 
-		private void OnRegionChanged(object sender, MKMapViewChangeEventArgs e)
+		private void OnRegionChanged(object? sender, MKMapViewChangeEventArgs e)
 		{
 			if (!_changingCenter)
 			{
@@ -165,7 +165,7 @@ private void OnChildrenCollectionChanged(object sender, IVectorChangedEventArgs?
 
 				foreach (var child in allItems)
 				{
-					MapControlAnnotation annotation;
+					MapControlAnnotation? annotation;
 
 					if (!_elements.TryGetValue(child, out annotation))
 					{
@@ -198,7 +198,7 @@ private void SetUpOverlayRenderer()
 
 		private MKOverlayRenderer OnGetOverlayRenderer(MKMapView mapView, IMKOverlay overlay)
 		{
-			return _overlayRenderers.GetValueOrDefault(overlay);
+			return _overlayRenderers.GetValueOrDefault(overlay)!;
 		}
 
 		private MKAnnotationView? OnGetViewForAnnotation(MKMapView mapView, AnnotationAlias annotation)

diff --git a/src/Uno.UI.Maps/Uno.UI.Maps.netcoremobile.csproj b/src/Uno.UI.Maps/Uno.UI.Maps.netcoremobile.csproj
@@ -0,0 +1,103 @@
+<Project Sdk="MSBuild.Sdk.Extras" ToolsVersion="15.0">
+	<PropertyGroup>
+		<TargetFrameworks>net8.0-android;net8.0-ios</TargetFrameworks>
+		<TargetFrameworks>$(TargetFrameworks);net8.0-maccatalyst;net8.0-macos</TargetFrameworks>
+
+		<TargetFrameworks>$(TargetFrameworks);net7.0-android;net7.0-ios</TargetFrameworks>
+		<TargetFrameworks>$(TargetFrameworks);net7.0-maccatalyst;net7.0-macos</TargetFrameworks>
+	</PropertyGroup>
+
+	<PropertyGroup>
+		<Authors>uno platform</Authors>
+		<PackageProjectUrl>https://github.com/unoplatform/uno</PackageProjectUrl>
+		<PackageIcon>uno.png</PackageIcon>
+		<RepositoryUrl>https://github.com/unoplatform/uno</RepositoryUrl>
+		<Description>This package provides the ability for Uno Platform based apps to use the MapControl</Description>
+		<Copyright>Copyright (C) 2015-2023 nventive inc. - all rights reserved</Copyright>
+	</PropertyGroup>
+
+	<PropertyGroup>
+		<AssemblyName>Uno.UI.Maps</AssemblyName>
+		<RootNamespace>Uno.UI.Maps</RootNamespace>
+
+		<PackageId Condition="'$(UNO_UWP_BUILD)'!='true'">Uno.WinUI.Maps</PackageId>
+
+		<GeneratePackageOnBuild Condition="'$(Configuration)'=='Release'">true</GeneratePackageOnBuild>
+	</PropertyGroup>
+
+
+	<ItemGroup>
+		<None Include="..\Common\uno.png" Pack="true" PackagePath="\" Visible="false"/>
+	</ItemGroup>
+
+	<Import Project="../targetframework-override.props" />
+
+	<PropertyGroup>
+		<NoWarn>$(NoWarn);NU1701</NoWarn>
+
+		<ProduceReferenceAssembly>false</ProduceReferenceAssembly>
+		<Deterministic>true</Deterministic>
+	</PropertyGroup>
+
+	<ItemGroup>
+		<ProjectReference Include="..\Uno.UI\Uno.UI.netcoremobile.csproj" />
+		<ProjectReference Include="..\Uno.UWP\Uno.netcoremobile.csproj" TreatAsPackageReference="false" PrivateAssets="all" />
+		<ProjectReference Include="..\Uno.Foundation\Uno.Foundation.netcoremobile.csproj" TreatAsPackageReference="false" PrivateAssets="all" />
+		<ProjectReference Include="..\Uno.UI.BindingHelper.Android\Uno.UI.BindingHelper.Android.netcoremobile.csproj" Condition="$(IsAndroid)" TreatAsPackageReference="false" PrivateAssets="all" />
+	</ItemGroup>
+
+	<ItemGroup Condition=" '$(TargetFramework)' == 'net8.0-android'">
+		<PackageReference Include="Xamarin.GooglePlayServices.Location" Version="120.0.0.1" />
+		<PackageReference Include="Xamarin.GooglePlayServices.Maps" Version="118.1.0.1" />
+		<PackageReference Include="Xamarin.AndroidX.Legacy.Support.v4" PrivateAssets="none" />
+	</ItemGroup>
+
+	<ItemGroup Condition=" '$(TargetFramework)' == 'net7.0-android'">
+		<PackageReference Include="Xamarin.GooglePlayServices.Location" Version="120.0.0.1" />
+		<PackageReference Include="Xamarin.GooglePlayServices.Maps" Version="118.1.0.1" />
+		<PackageReference Include="Xamarin.AndroidX.Legacy.Support.v4" PrivateAssets="none" />
+	</ItemGroup>
+
+	<Import Project="..\SourceGenerators\Uno.UI.SourceGenerators\Content\Uno.UI.SourceGenerators.props" />
+
+	<Target Name="_UnoToolkitOverrideNuget" AfterTargets="AfterBuild" DependsOnTargets="BuiltProjectOutputGroup" Condition="'$(UnoNugetOverrideVersion)'!=''">
+
+		<PropertyGroup>
+			<_OverrideTargetFramework>$(TargetFramework)</_OverrideTargetFramework>
+			<_baseNugetPath Condition="'$(USERPROFILE)'!=''">$(USERPROFILE)</_baseNugetPath>
+			<_baseNugetPath Condition="'$(HOME)'!=''">$(HOME)</_baseNugetPath>
+			<_TargetNugetFolder>$(_baseNugetPath)\.nuget\packages\$(PackageId)\$(UnoNugetOverrideVersion)\lib\$(_OverrideTargetFramework)</_TargetNugetFolder>
+		</PropertyGroup>
+		<ItemGroup>
+			<_OutputFiles Include="$(TargetDir)**" />
+		</ItemGroup>
+		<MakeDir Directories="$(_TargetNugetFolder)" />
+
+		<Message Importance="high" Text="OVERRIDING NUGET PACKAGE CACHE: $(_TargetNugetFolder)" />
+
+		<Copy SourceFiles="@(_OutputFiles)" DestinationFiles="@(_OutputFiles->'$(_TargetNugetFolder)\%(RecursiveDir)%(Filename)%(Extension)')" />
+		<Copy SourceFiles="@(_OutputFilesPDB)" DestinationFiles="@(_OutputFilesPDB->'$(_TargetNugetFolder)\%(RecursiveDir)%(Filename).pdb')" />
+	</Target>
+
+	<ItemGroup>
+		<None Update="themes\Generic.xaml">
+			<Generator>MSBuild:Compile</Generator>
+		</None>
+	</ItemGroup>
+
+	<ItemGroup>
+		<Page Update="themes\Generic.xaml">
+			<Generator>MSBuild:Compile</Generator>
+		</Page>
+	</ItemGroup>
+
+	<ItemGroup Condition="'$(UNO_UWP_BUILD)'!='true'">
+		<!-- Maps are not yet supported by WinUI 3.0 -->
+		<Compile Remove="**\*.cs" />
+	</ItemGroup>
+	<PropertyGroup Condition="'$(UNO_UWP_BUILD)'!='true'">
+		<!-- Maps are not yet supported by WinUI 3.0 -->
+		<EnableAutomaticXamlPageInclusion>false</EnableAutomaticXamlPageInclusion>
+	</PropertyGroup>
+
+</Project>
-Original file line number
+Diff line change
@@ Expand Up / @@ -131,7 +131,7 @@ private void OnControlUnloaded() @@
     			}
     		}
-    		private void MapTouchOccurred(object sender, MotionEvent e)
+    		private void MapTouchOccurred(object? sender, MotionEvent e)
     		{
     		}
@@ Expand Down @@