diff --git a/src/libs/Mapbox.Maui/Mapbox.Maui.csproj b/src/libs/Mapbox.Maui/Mapbox.Maui.csproj index 737f97e..11bf076 100644 --- a/src/libs/Mapbox.Maui/Mapbox.Maui.csproj +++ b/src/libs/Mapbox.Maui/Mapbox.Maui.csproj @@ -53,7 +53,7 @@ https://github.com/tuyen-vuduc/mapbox-maui https://mapbox.tuyen-vuduc.tech false - 11.3.0-alpha04 + 11.4.0-alpha01 README.md LICENSE tv-mapbox.png @@ -72,15 +72,16 @@ - - - - - + + + + + + - - + + diff --git a/src/libs/Mapbox.Maui/Platforms/iOS/MapboxViewHandler.Camera.cs b/src/libs/Mapbox.Maui/Platforms/iOS/MapboxViewHandler.Camera.cs index 3d6afc6..367863e 100644 --- a/src/libs/Mapbox.Maui/Platforms/iOS/MapboxViewHandler.Camera.cs +++ b/src/libs/Mapbox.Maui/Platforms/iOS/MapboxViewHandler.Camera.cs @@ -1,4 +1,5 @@ using MapboxMapsObjC; +using UIKit; namespace MapboxMaui; @@ -11,9 +12,20 @@ public void EaseTo(CameraOptions cameraOptions, AnimationOptions animationOption if (mapView == null) return; var xcameraOptions = cameraOptions.ToNative(); + var curve = animationOptions?.Curve is not null + ? animationOptions.Curve switch + { + TimingCurve.EaseIn => UIViewAnimationCurve.EaseIn, + TimingCurve.EaseInOut => UIViewAnimationCurve.EaseInOut, + TimingCurve.EaseOut => UIViewAnimationCurve.EaseOut, + TimingCurve.Linear => UIViewAnimationCurve.Linear, + _ => UIViewAnimationCurve.EaseOut, + } + : UIViewAnimationCurve.EaseOut; mapView.Camera().FlyTo( xcameraOptions, animationOptions?.Duration / 1000L ?? 0, + curve, (position) => { var xposition = position switch @@ -34,9 +46,20 @@ public void FlyTo(CameraOptions cameraOptions, AnimationOptions animationOptions if (mapView == null) return; var xcameraOptions = cameraOptions.ToNative(); + var curve = animationOptions?.Curve is not null + ? animationOptions.Curve switch + { + TimingCurve.EaseIn => UIViewAnimationCurve.EaseIn, + TimingCurve.EaseInOut => UIViewAnimationCurve.EaseInOut, + TimingCurve.EaseOut => UIViewAnimationCurve.EaseOut, + TimingCurve.Linear => UIViewAnimationCurve.Linear, + _ => UIViewAnimationCurve.EaseOut, + } + : UIViewAnimationCurve.EaseOut; mapView.Camera().FlyTo( xcameraOptions, animationOptions?.Duration / 1000L ?? 0, + curve, (position) => { var xposition = position switch diff --git a/src/qs/MapboxMauiQs/MapboxMauiQs.csproj b/src/qs/MapboxMauiQs/MapboxMauiQs.csproj index 78b2892..fdbb110 100644 --- a/src/qs/MapboxMauiQs/MapboxMauiQs.csproj +++ b/src/qs/MapboxMauiQs/MapboxMauiQs.csproj @@ -93,19 +93,20 @@ - - - - - + + + + + + Platforms\Android\Shared\%(RecursiveDir)%(Filename)%(Extension) - - + + Platforms\iOS\Shared\%(RecursiveDir)%(Filename)%(Extension)