Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: use native SDK 11.6.0 #42

Merged
merged 1 commit into from
Sep 10, 2024
Merged

feat: use native SDK 11.6.0 #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions src/libs/Mapbox.Maui/Mapbox.Maui.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
<RepositoryUrl>https://github.com/tuyen-vuduc/mapbox-maui</RepositoryUrl>
<PackageProjectUrl>https://mapbox.tuyen-vuduc.tech</PackageProjectUrl>
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
<PackageVersion>11.5.1-alpha09</PackageVersion>
<PackageVersion>11.6.0-alpha01</PackageVersion>
<PackageReadmeFile>README.md</PackageReadmeFile>
<PackageLicenseFile>LICENSE</PackageLicenseFile>
<PackageIcon>tv-mapbox.png</PackageIcon>
Expand All @@ -80,18 +80,18 @@
<PackageReference Update="Microsoft.Maui.Controls.Compatibility" Version="8.0.40" />
</ItemGroup>
<ItemGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">
<PackageReference Include="Com.Mapbox.Maps.Android" Version="11.5.1" />
<PackageReference Include="Com.Mapbox.Maps.Android" Version="11.6.0" />
<PackageReference Include="Xamarin.AndroidX.AppCompat" Version="1.6.1.10" />
<PackageReference Include="Xamarin.AndroidX.Fragment " Version="1.7.0.2" />
<PackageReference Include="Xamarin.AndroidX.Fragment.Ktx" Version="1.7.0.2" />
<PackageReference Include="Xamarin.Kotlin.StdLib" Version="2.0.0.1" PrivateAssets="none" />
<PackageReference Include="Xamarin.Kotlin.StdLib" Version="2.0.0.2" PrivateAssets="none" />
<PackageReference Include="Xamarin.Kotlin.StdLib.Common" Version="2.0.0.1" PrivateAssets="none" />
<PackageReference Include="Dependencies.Gradle" Version="8.6.0.1" />
<PackageReference Include="Xamarin.AndroidX.Annotation" Version="1.8.0.1" />
<PackageReference Include="Xamarin.AndroidX.Annotation" Version="1.8.1.1" />
</ItemGroup>
<ItemGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">
<PackageReference Include="MapboxMapsObjC.iOS" Version="11.5.2.7" />
<PackageReference Include="MapboxMaps.iOS" Version="11.5.2" />
<PackageReference Include="MapboxMapsObjC.iOS" Version="11.6.0" />
<PackageReference Include="MapboxMaps.iOS" Version="11.6.0" />
</ItemGroup>
<ItemGroup>
<Folder Include="Models\Gestures\" />
Expand Down
6 changes: 4 additions & 2 deletions src/qs/MapboxMauiQs/Examples/02.AddOneMarkerSymbol/AddOneMarkerSymbolExample.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,9 @@ private void Map_StyleLoaded(object sender, EventArgs e)

var layer = new SymbolLayer(@"LAYER_ID", sourceId)
{
IconImage = new PropertyValue<ResolvedImage>(image)
IconImage = new PropertyValue<ResolvedImage>(image),
IconAnchor = IconAnchor.Bottom,
IconOffset = new PropertyValue<double[]>(new double [] { 0.0, 12.0 }),
};

map.Layers = new[] { layer };
Expand All @@ -50,7 +52,7 @@ private void Map_MapReady(object sender, EventArgs e)

map.CameraOptions = cameraOptions;

map.MapboxStyle = MapboxStyle.MAPBOX_STREETS;
map.MapboxStyle = MapboxStyle.STANDARD;
}

public void ApplyQueryAttributes(IDictionary<string, object> query)
Expand Down
6 changes: 4 additions & 2 deletions src/qs/MapboxMauiQs/Examples/09.BasicMap/BasicMapExample.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,10 @@ private void Map_MapReady(object sender, EventArgs e)
map.MapboxStyle = MapboxStyle.STANDARD;
map.CameraOptions = new CameraOptions
{
Center = new MapPosition(21.028511, 105.804817),
Zoom = 9,
Center = new MapPosition(41.879, -87.635),
Zoom = 16,
Bearing = 12,
Pitch = 60,
};
}

Expand Down
10 changes: 5 additions & 5 deletions src/qs/MapboxMauiQs/MapboxMauiQs.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,21 +93,21 @@
</ItemGroup>

<ItemGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">
<PackageReference Include="Com.Mapbox.Maps.Android" Version="11.5.1" />
<PackageReference Include="Com.Mapbox.Maps.Android" Version="11.6.0" />
<PackageReference Include="Xamarin.AndroidX.AppCompat" Version="1.6.1.10" />
<PackageReference Include="Xamarin.AndroidX.Fragment " Version="1.7.0.2" />
<PackageReference Include="Xamarin.AndroidX.Fragment.Ktx" Version="1.7.0.2" />
<PackageReference Include="Xamarin.Kotlin.StdLib" Version="2.0.0.1" PrivateAssets="none" />
<PackageReference Include="Xamarin.Kotlin.StdLib" Version="2.0.0.2" PrivateAssets="none" />
<PackageReference Include="Xamarin.Kotlin.StdLib.Common" Version="2.0.0.1" PrivateAssets="none" />
<PackageReference Include="Xamarin.AndroidX.Annotation" Version="1.8.0.1" />
<PackageReference Include="Xamarin.AndroidX.Annotation" Version="1.8.1.1" />

<Compile Include="..\..\libs\Mapbox.Maui\Platforms\Android\**\**\*.cs">
<Link>Platforms\Android\Shared\%(RecursiveDir)%(Filename)%(Extension)</Link>
</Compile>
</ItemGroup>
<ItemGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">
<PackageReference Include="MapboxMapsObjC.iOS" Version="11.5.2.7" />
<PackageReference Include="MapboxMaps.iOS" Version="11.5.2" />
<PackageReference Include="MapboxMapsObjC.iOS" Version="11.6.0" />
<PackageReference Include="MapboxMaps.iOS" Version="11.6.0" />

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