Skip to content

Commit 7cb02ea

Browse files
tuyen-vuductuyen-vuduc
committed
- update to use latest binding libs
1 parent 979948d commit 7cb02ea

File tree

3 files changed

+40
-15
lines changed

3 files changed

+40
-15
lines changed

‎src/libs/Mapbox.Maui/Mapbox.Maui.csproj

+9-8
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
<RepositoryUrl>https://github.com/tuyen-vuduc/mapbox-maui</RepositoryUrl>
5454
<PackageProjectUrl>https://mapbox.tuyen-vuduc.tech</PackageProjectUrl>
5555
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
56-
<PackageVersion>11.3.0-alpha04</PackageVersion>
56+
<PackageVersion>11.4.0-alpha01</PackageVersion>
5757
<PackageReadmeFile>README.md</PackageReadmeFile>
5858
<PackageLicenseFile>LICENSE</PackageLicenseFile>
5959
<PackageIcon>tv-mapbox.png</PackageIcon>
@@ -72,15 +72,16 @@
7272
<PackageReference Include="Microsoft.Maui.Controls" Version="8.0.40" />
7373
</ItemGroup>
7474
<ItemGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">
75-
<PackageReference Include="Com.Mapbox.Maps.Android" Version="11.3.1.7" />
76-
<PackageReference Include="Xamarin.AndroidX.AppCompat" Version="1.6.1.8" />
77-
<PackageReference Include="Xamarin.AndroidX.Fragment.Ktx" Version="1.6.2.3" />
78-
<PackageReference Include="Xamarin.Kotlin.StdLib" Version="1.9.23.1" PrivateAssets="none" />
79-
<PackageReference Include="Xamarin.Kotlin.StdLib.Common" Version="1.9.23.1" PrivateAssets="none" />
75+
<PackageReference Include="Com.Mapbox.Maps.Android" Version="11.4.1" />
76+
<PackageReference Include="Xamarin.AndroidX.AppCompat" Version="1.6.1.10" />
77+
<PackageReference Include="Xamarin.AndroidX.Fragment " Version="1.7.0.2" />
78+
<PackageReference Include="Xamarin.AndroidX.Fragment.Ktx" Version="1.7.0.2" />
79+
<PackageReference Include="Xamarin.Kotlin.StdLib" Version="1.9.23.3" PrivateAssets="none" />
80+
<PackageReference Include="Xamarin.Kotlin.StdLib.Common" Version="1.9.23.3" PrivateAssets="none" />
8081
</ItemGroup>
8182
<ItemGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">
82-
<PackageReference Include="MapboxMapsObjC.iOS" Version="11.3.0.3" />
83-
<PackageReference Include="MapboxMaps.iOS" Version="11.3.0.2" />
83+
<PackageReference Include="MapboxMapsObjC.iOS" Version="11.4.0" />
84+
<PackageReference Include="MapboxMaps.iOS" Version="11.4.0" />
8485
</ItemGroup>
8586
<ItemGroup>
8687
<Folder Include="Models\Styles\" />

‎src/libs/Mapbox.Maui/Platforms/iOS/MapboxViewHandler.Camera.cs

+23
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using MapboxMapsObjC;
2+
using UIKit;
23

34
namespace MapboxMaui;
45

@@ -11,9 +12,20 @@ public void EaseTo(CameraOptions cameraOptions, AnimationOptions animationOption
1112
if (mapView == null) return;
1213

1314
var xcameraOptions = cameraOptions.ToNative();
15+
var curve = animationOptions?.Curve is not null
16+
? animationOptions.Curve switch
17+
{
18+
TimingCurve.EaseIn => UIViewAnimationCurve.EaseIn,
19+
TimingCurve.EaseInOut => UIViewAnimationCurve.EaseInOut,
20+
TimingCurve.EaseOut => UIViewAnimationCurve.EaseOut,
21+
TimingCurve.Linear => UIViewAnimationCurve.Linear,
22+
_ => UIViewAnimationCurve.EaseOut,
23+
}
24+
: UIViewAnimationCurve.EaseOut;
1425
mapView.Camera().FlyTo(
1526
xcameraOptions,
1627
animationOptions?.Duration / 1000L ?? 0,
28+
curve,
1729
(position) =>
1830
{
1931
var xposition = position switch
@@ -34,9 +46,20 @@ public void FlyTo(CameraOptions cameraOptions, AnimationOptions animationOptions
3446
if (mapView == null) return;
3547

3648
var xcameraOptions = cameraOptions.ToNative();
49+
var curve = animationOptions?.Curve is not null
50+
? animationOptions.Curve switch
51+
{
52+
TimingCurve.EaseIn => UIViewAnimationCurve.EaseIn,
53+
TimingCurve.EaseInOut => UIViewAnimationCurve.EaseInOut,
54+
TimingCurve.EaseOut => UIViewAnimationCurve.EaseOut,
55+
TimingCurve.Linear => UIViewAnimationCurve.Linear,
56+
_ => UIViewAnimationCurve.EaseOut,
57+
}
58+
: UIViewAnimationCurve.EaseOut;
3759
mapView.Camera().FlyTo(
3860
xcameraOptions,
3961
animationOptions?.Duration / 1000L ?? 0,
62+
curve,
4063
(position) =>
4164
{
4265
var xposition = position switch

‎src/qs/MapboxMauiQs/MapboxMauiQs.csproj

+8-7
Original file line numberDiff line numberDiff line change
@@ -93,19 +93,20 @@
9393
</ItemGroup>
9494

9595
<ItemGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">
96-
<PackageReference Include="Com.Mapbox.Maps.Android" Version="11.3.1.7" />
97-
<PackageReference Include="Xamarin.AndroidX.AppCompat" Version="1.6.1.8" />
98-
<PackageReference Include="Xamarin.AndroidX.Fragment.Ktx" Version="1.6.2.3" />
99-
<PackageReference Include="Xamarin.Kotlin.StdLib" Version="1.9.23.1" PrivateAssets="none" />
100-
<PackageReference Include="Xamarin.Kotlin.StdLib.Common" Version="1.9.23.1" PrivateAssets="none" />
96+
<PackageReference Include="Com.Mapbox.Maps.Android" Version="11.4.1" />
97+
<PackageReference Include="Xamarin.AndroidX.AppCompat" Version="1.6.1.10" />
98+
<PackageReference Include="Xamarin.AndroidX.Fragment " Version="1.7.0.2" />
99+
<PackageReference Include="Xamarin.AndroidX.Fragment.Ktx" Version="1.7.0.2" />
100+
<PackageReference Include="Xamarin.Kotlin.StdLib" Version="1.9.23.3" PrivateAssets="none" />
101+
<PackageReference Include="Xamarin.Kotlin.StdLib.Common" Version="1.9.23.3" PrivateAssets="none" />
101102

102103
<Compile Include="..\..\libs\Mapbox.Maui\Platforms\Android\**\**\*.cs">
103104
<Link>Platforms\Android\Shared\%(RecursiveDir)%(Filename)%(Extension)</Link>
104105
</Compile>
105106
</ItemGroup>
106107
<ItemGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">
107-
<PackageReference Include="MapboxMapsObjC.iOS" Version="11.3.0.3" />
108-
<PackageReference Include="MapboxMaps.iOS" Version="11.3.0.2" />
108+
<PackageReference Include="MapboxMapsObjC.iOS" Version="11.4.0" />
109+
<PackageReference Include="MapboxMaps.iOS" Version="11.4.0" />
109110

110111
<Compile Include="..\..\libs\Mapbox.Maui\Platforms\iOS\**\**\*.cs">
111112
<Link>Platforms\iOS\Shared\%(RecursiveDir)%(Filename)%(Extension)</Link>

0 commit comments

Comments
 (0)