Skip to content
This repository was archived by the owner on Jul 16, 2023. It is now read-only.

Commit 22916d8

Browse files
committed
Mapbox 5.0.2
1 parent d4966ca commit 22916d8

11 files changed

Lines changed: 939 additions & 918 deletions

File tree

Naxam.Mapbox.Droid/Additions/Marker.cs

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,29 @@
11
using System;
2-
namespace Mapbox.Sdk.Annotations
2+
namespace Mapbox.MapboxSdk.Annotations
33
{
44
public partial class Marker
55
{
66
public override int CompareTo(Java.Lang.Object obj)
77
{
8-
return 0;
8+
return CompareTo((Marker)obj);
99
}
10+
11+
public interface IMarkerListener { }
1012
}
1113

1214
public partial class Polygon
1315
{
1416
public override int CompareTo(Java.Lang.Object obj)
1517
{
16-
return 0;
18+
return CompareTo((Polygon)obj);
1719
}
1820
}
1921

2022
public partial class Polyline
2123
{
2224
public override int CompareTo(Java.Lang.Object obj)
2325
{
24-
return 0;
26+
return CompareTo((Polyline)obj);
2527
}
2628
}
2729

12.5 MB
Binary file not shown.

Naxam.Mapbox.Droid/Naxam.Mapbox.Droid.csproj

Lines changed: 53 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Import Project="..\packages\Xamarin.Build.Download.0.4.2\build\Xamarin.Build.Download.props" Condition="Exists('..\packages\Xamarin.Build.Download.0.4.2\build\Xamarin.Build.Download.props')" />
34
<PropertyGroup>
45
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
56
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -44,44 +45,62 @@
4445
<Reference Include="Square.OkIO">
4546
<HintPath>..\packages\Square.OkIO.1.11.0\lib\MonoAndroid\Square.OkIO.dll</HintPath>
4647
</Reference>
47-
<Reference Include="Square.OkHttp3">
48-
<HintPath>..\packages\Square.OkHttp3.3.5.0\lib\MonoAndroid\Square.OkHttp3.dll</HintPath>
48+
<Reference Include="Naxam.Mapzen.Lost.Droid">
49+
<HintPath>..\packages\Naxam.Mapzen.Lost.Droid.2.1.2\lib\MonoAndroid10\Naxam.Mapzen.Lost.Droid.dll</HintPath>
50+
</Reference>
51+
<Reference Include="Xamarin.Android.Support.Compat">
52+
<HintPath>..\packages\Xamarin.Android.Support.Compat.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.Compat.dll</HintPath>
53+
</Reference>
54+
<Reference Include="Xamarin.Android.Support.Core.UI">
55+
<HintPath>..\packages\Xamarin.Android.Support.Core.UI.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.Core.UI.dll</HintPath>
56+
</Reference>
57+
<Reference Include="Xamarin.Android.Support.Core.Utils">
58+
<HintPath>..\packages\Xamarin.Android.Support.Core.Utils.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.Core.Utils.dll</HintPath>
59+
</Reference>
60+
<Reference Include="Xamarin.Android.Support.Media.Compat">
61+
<HintPath>..\packages\Xamarin.Android.Support.Media.Compat.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.Media.Compat.dll</HintPath>
62+
</Reference>
63+
<Reference Include="Xamarin.Android.Support.Fragment">
64+
<HintPath>..\packages\Xamarin.Android.Support.Fragment.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.Fragment.dll</HintPath>
4965
</Reference>
5066
<Reference Include="Xamarin.Android.Support.v4">
51-
<HintPath>..\packages\Xamarin.Android.Support.v4.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll</HintPath>
67+
<HintPath>..\packages\Xamarin.Android.Support.v4.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.v4.dll</HintPath>
68+
</Reference>
69+
<Reference Include="Xamarin.Android.Support.Transition">
70+
<HintPath>..\packages\Xamarin.Android.Support.Transition.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.Transition.dll</HintPath>
5271
</Reference>
5372
<Reference Include="Xamarin.Android.Support.v7.RecyclerView">
54-
<HintPath>..\packages\Xamarin.Android.Support.v7.RecyclerView.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.RecyclerView.dll</HintPath>
73+
<HintPath>..\packages\Xamarin.Android.Support.v7.RecyclerView.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.v7.RecyclerView.dll</HintPath>
5574
</Reference>
5675
<Reference Include="Xamarin.Android.Support.Vector.Drawable">
57-
<HintPath>..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.Vector.Drawable.dll</HintPath>
76+
<HintPath>..\packages\Xamarin.Android.Support.Vector.Drawable.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.Vector.Drawable.dll</HintPath>
5877
</Reference>
5978
<Reference Include="Xamarin.Android.Support.Animated.Vector.Drawable">
60-
<HintPath>..\packages\Xamarin.Android.Support.Animated.Vector.Drawable.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.Animated.Vector.Drawable.dll</HintPath>
79+
<HintPath>..\packages\Xamarin.Android.Support.Animated.Vector.Drawable.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.Animated.Vector.Drawable.dll</HintPath>
6180
</Reference>
6281
<Reference Include="Xamarin.Android.Support.v7.AppCompat">
63-
<HintPath>..\packages\Xamarin.Android.Support.v7.AppCompat.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.AppCompat.dll</HintPath>
82+
<HintPath>..\packages\Xamarin.Android.Support.v7.AppCompat.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.v7.AppCompat.dll</HintPath>
6483
</Reference>
6584
<Reference Include="Xamarin.Android.Support.Design">
66-
<HintPath>..\packages\Xamarin.Android.Support.Design.23.3.0\lib\MonoAndroid43\Xamarin.Android.Support.Design.dll</HintPath>
85+
<HintPath>..\packages\Xamarin.Android.Support.Design.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.Design.dll</HintPath>
6786
</Reference>
68-
<Reference Include="Naxam.Retrofit2.Droid">
69-
<HintPath>..\packages\Naxam.Retrofit2.Droid.2.1.0\lib\MonoAndroid10\Naxam.Retrofit2.Droid.dll</HintPath>
87+
<Reference Include="Naxam.SquareUp.OkHttp3">
88+
<HintPath>..\packages\Naxam.SquareUp.OkHttp3.3.6.0\lib\MonoAndroid10\Naxam.SquareUp.OkHttp3.dll</HintPath>
7089
</Reference>
71-
<Reference Include="GoogleGson">
72-
<HintPath>..\packages\GoogleGson.2.6.2.0\lib\MonoAndroid\GoogleGson.dll</HintPath>
90+
<Reference Include="Naxam.Mapbox.Services.Android.Telemetry">
91+
<HintPath>..\packages\Naxam.Mapbox.Services.Android.Telemetry.2.0.0.1\lib\MonoAndroid10\Naxam.Mapbox.Services.Android.Telemetry.dll</HintPath>
7392
</Reference>
74-
<Reference Include="Naxam.Retrofit2.ConvertGson.Droid">
75-
<HintPath>..\packages\Naxam.Retrofit2.ConvertGson.Droid.2.1.0\lib\MonoAndroid10\Naxam.Retrofit2.ConvertGson.Droid.dll</HintPath>
93+
<Reference Include="Naxam.Jakewharton.Timber">
94+
<HintPath>..\packages\Naxam.Jakewharton.Timber.4.5.1\lib\MonoAndroid10\Naxam.Jakewharton.Timber.dll</HintPath>
7695
</Reference>
77-
<Reference Include="Naxam.Mapzen.Lost.Droid">
78-
<HintPath>..\packages\Naxam.Mapzen.Lost.Droid.1.1.1\lib\MonoAndroid10\Naxam.Mapzen.Lost.Droid.dll</HintPath>
96+
<Reference Include="Naxam.Google.Gson">
97+
<HintPath>..\packages\Naxam.Google.Gson.2.8.0\lib\MonoAndroid10\Naxam.Google.Gson.dll</HintPath>
7998
</Reference>
80-
<Reference Include="Naxam.Mapzen.Droid">
81-
<HintPath>..\packages\Naxam.Mapzen.Droid.1.2.1\lib\MonoAndroid10\Naxam.Mapzen.Droid.dll</HintPath>
99+
<Reference Include="Naxam.Mapbox.MapboxJavaCore">
100+
<HintPath>..\packages\Naxam.Mapbox.MapboxJavaCore.2.0.0.1\lib\MonoAndroid10\Naxam.Mapbox.MapboxJavaCore.dll</HintPath>
82101
</Reference>
83-
<Reference Include="Naxam.Mapbox.Services.Droid">
84-
<HintPath>..\packages\Naxam.Mapbox.Services.Droid.1.3.1\lib\MonoAndroid10\Naxam.Mapbox.Services.Droid.dll</HintPath>
102+
<Reference Include="Naxam.Mapbox.MapboxJavaGeojson">
103+
<HintPath>..\packages\Naxam.Mapbox.MapboxJavaGeojson.2.0.0\lib\MonoAndroid10\Naxam.Mapbox.MapboxJavaGeojson.dll</HintPath>
85104
</Reference>
86105
</ItemGroup>
87106
<ItemGroup>
@@ -99,8 +118,20 @@
99118
<TransformFile Include="Transforms\Metadata.xml" />
100119
</ItemGroup>
101120
<ItemGroup>
102-
<LibraryProjectZip Include="Jars\mapbox-android-sdk-4.2.2.aar" />
121+
<LibraryProjectZip Include="Jars\mapbox-android-sdk-5.0.2.aar" />
103122
</ItemGroup>
104123
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.Bindings.targets" />
105-
<Import Project="..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\build\Xamarin.Android.Support.Vector.Drawable.targets" Condition="Exists('..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\build\Xamarin.Android.Support.Vector.Drawable.targets')" />
124+
<Import Project="..\packages\Xamarin.Build.Download.0.4.2\build\Xamarin.Build.Download.targets" Condition="Exists('..\packages\Xamarin.Build.Download.0.4.2\build\Xamarin.Build.Download.targets')" />
125+
<Import Project="..\packages\Xamarin.Android.Support.Compat.25.1.1\build\MonoAndroid70\Xamarin.Android.Support.Compat.targets" Condition="Exists('..\packages\Xamarin.Android.Support.Compat.25.1.1\build\MonoAndroid70\Xamarin.Android.Support.Compat.targets')" />
126+
<Import Project="..\packages\Xamarin.Android.Support.Core.UI.25.1.1\build\MonoAndroid70\Xamarin.Android.Support.Core.UI.targets" Condition="Exists('..\packages\Xamarin.Android.Support.Core.UI.25.1.1\build\MonoAndroid70\Xamarin.Android.Support.Core.UI.targets')" />
127+
<Import Project="..\packages\Xamarin.Android.Support.Core.Utils.25.1.1\build\MonoAndroid70\Xamarin.Android.Support.Core.Utils.targets" Condition="Exists('..\packages\Xamarin.Android.Support.Core.Utils.25.1.1\build\MonoAndroid70\Xamarin.Android.Support.Core.Utils.targets')" />
128+
<Import Project="..\packages\Xamarin.Android.Support.Media.Compat.25.1.1\build\MonoAndroid70\Xamarin.Android.Support.Media.Compat.targets" Condition="Exists('..\packages\Xamarin.Android.Support.Media.Compat.25.1.1\build\MonoAndroid70\Xamarin.Android.Support.Media.Compat.targets')" />
129+
<Import Project="..\packages\Xamarin.Android.Support.Fragment.25.1.1\build\MonoAndroid70\Xamarin.Android.Support.Fragment.targets" Condition="Exists('..\packages\Xamarin.Android.Support.Fragment.25.1.1\build\MonoAndroid70\Xamarin.Android.Support.Fragment.targets')" />
130+
<Import Project="..\packages\Xamarin.Android.Support.Transition.25.1.1\build\MonoAndroid70\Xamarin.Android.Support.Transition.targets" Condition="Exists('..\packages\Xamarin.Android.Support.Transition.25.1.1\build\MonoAndroid70\Xamarin.Android.Support.Transition.targets')" />
131+
<Import Project="..\packages\Xamarin.Android.Support.v4.25.1.1\build\MonoAndroid70\Xamarin.Android.Support.v4.targets" Condition="Exists('..\packages\Xamarin.Android.Support.v4.25.1.1\build\MonoAndroid70\Xamarin.Android.Support.v4.targets')" />
132+
<Import Project="..\packages\Xamarin.Android.Support.v7.RecyclerView.25.1.1\build\MonoAndroid70\Xamarin.Android.Support.v7.RecyclerView.targets" Condition="Exists('..\packages\Xamarin.Android.Support.v7.RecyclerView.25.1.1\build\MonoAndroid70\Xamarin.Android.Support.v7.RecyclerView.targets')" />
133+
<Import Project="..\packages\Xamarin.Android.Support.Vector.Drawable.25.1.1\build\MonoAndroid70\Xamarin.Android.Support.Vector.Drawable.targets" Condition="Exists('..\packages\Xamarin.Android.Support.Vector.Drawable.25.1.1\build\MonoAndroid70\Xamarin.Android.Support.Vector.Drawable.targets')" />
134+
<Import Project="..\packages\Xamarin.Android.Support.Animated.Vector.Drawable.25.1.1\build\MonoAndroid70\Xamarin.Android.Support.Animated.Vector.Drawable.targets" Condition="Exists('..\packages\Xamarin.Android.Support.Animated.Vector.Drawable.25.1.1\build\MonoAndroid70\Xamarin.Android.Support.Animated.Vector.Drawable.targets')" />
135+
<Import Project="..\packages\Xamarin.Android.Support.v7.AppCompat.25.1.1\build\MonoAndroid70\Xamarin.Android.Support.v7.AppCompat.targets" Condition="Exists('..\packages\Xamarin.Android.Support.v7.AppCompat.25.1.1\build\MonoAndroid70\Xamarin.Android.Support.v7.AppCompat.targets')" />
136+
<Import Project="..\packages\Xamarin.Android.Support.Design.25.1.1\build\MonoAndroid70\Xamarin.Android.Support.Design.targets" Condition="Exists('..\packages\Xamarin.Android.Support.Design.25.1.1\build\MonoAndroid70\Xamarin.Android.Support.Design.targets')" />
106137
</Project>

Naxam.Mapbox.Droid/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
// The form "{Major}.{Minor}.*" will automatically update the build and revision,
1919
// and "{Major}.{Minor}.{Build}.*" will update just the revision.
2020

21-
[assembly: AssemblyVersion("4.2.2.1")]
22-
[assembly: AssemblyInformationalVersion("4.2.2.1-beta")]
21+
[assembly: AssemblyVersion("5.0.2")]
22+
[assembly: AssemblyInformationalVersion("5.0.2-alpha")]
2323

2424
// The following attributes are used to specify the signing key for the assembly,
2525
// if desired. See the Mono documentation for more information about signing.

Naxam.Mapbox.Droid/Transforms/Metadata.xml

Lines changed: 23 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -9,29 +9,33 @@
99
-->
1010
<attr path="/api/package[@name='com.almeros.android.multitouch.gesturedetectors']" name="managedName">Almeros.Multitouch.Gesturedetectors</attr>
1111

12-
<attr path="/api/package[@name='com.mapbox.mapboxsdk']" name="managedName">Mapbox.Sdk</attr>
13-
<attr path="/api/package[@name='com.mapbox.mapboxsdk.annotations']" name="managedName">Mapbox.Sdk.Annotations</attr>
14-
<attr path="/api/package[@name='com.mapbox.mapboxsdk.camera']" name="managedName">Mapbox.Sdk.Camera</attr>
15-
<attr path="/api/package[@name='com.mapbox.mapboxsdk.constants']" name="managedName">Mapbox.Sdk.Constants</attr>
16-
<attr path="/api/package[@name='com.mapbox.mapboxsdk.exceptions']" name="managedName">Mapbox.Sdk.Exceptions</attr>
17-
<attr path="/api/package[@name='com.mapbox.mapboxsdk.geometry']" name="managedName">Mapbox.Sdk.Geometry</attr>
18-
<attr path="/api/package[@name='com.mapbox.mapboxsdk.http']" name="managedName">Mapbox.Sdk.Http</attr>
19-
<attr path="/api/package[@name='com.mapbox.mapboxsdk.location']" name="managedName">Mapbox.Sdk.Location</attr>
20-
<attr path="/api/package[@name='com.mapbox.mapboxsdk.maps']" name="managedName">Mapbox.Sdk.Maps</attr>
21-
<attr path="/api/package[@name='com.mapbox.mapboxsdk.maps.widgets']" name="managedName">Mapbox.Sdk.Maps.Widgets</attr>
22-
<attr path="/api/package[@name='com.mapbox.mapboxsdk.net']" name="managedName">Mapbox.Sdk.Net</attr>
23-
<attr path="/api/package[@name='com.mapbox.mapboxsdk.offline']" name="managedName">Mapbox.Sdk.Offline</attr>
24-
<attr path="/api/package[@name='com.mapbox.mapboxsdk.style.layers']" name="managedName">Mapbox.Sdk.Style.Layers</attr>
25-
<attr path="/api/package[@name='com.mapbox.mapboxsdk.style.sources']" name="managedName">Mapbox.Sdk.Style.Sources</attr>
26-
<attr path="/api/package[@name='com.mapbox.mapboxsdk.telemetry']" name="managedName">Mapbox.Sdk.Telemetry</attr>
27-
<attr path="/api/package[@name='com.mapbox.mapboxsdk.utils']" name="managedName">Mapbox.Sdk.Utils</attr>
12+
<attr path="/api/package[@name='com.mapbox.mapboxsdk']" name="managedName">Mapbox.MapboxSdk</attr>
13+
<attr path="/api/package[@name='com.mapbox.mapboxsdk.annotations']" name="managedName">Mapbox.MapboxSdk.Annotations</attr>
14+
<attr path="/api/package[@name='com.mapbox.mapboxsdk.camera']" name="managedName">Mapbox.MapboxSdk.Camera</attr>
15+
<attr path="/api/package[@name='com.mapbox.mapboxsdk.constants']" name="managedName">Mapbox.MapboxSdk.Constants</attr>
16+
<attr path="/api/package[@name='com.mapbox.mapboxsdk.exceptions']" name="managedName">Mapbox.MapboxSdk.Exceptions</attr>
17+
<attr path="/api/package[@name='com.mapbox.mapboxsdk.geometry']" name="managedName">Mapbox.MapboxSdk.Geometry</attr>
18+
<attr path="/api/package[@name='com.mapbox.mapboxsdk.http']" name="managedName">Mapbox.MapboxSdk.Http</attr>
19+
<attr path="/api/package[@name='com.mapbox.mapboxsdk.location']" name="managedName">Mapbox.MapboxSdk.Location</attr>
20+
<attr path="/api/package[@name='com.mapbox.mapboxsdk.maps']" name="managedName">Mapbox.MapboxSdk.Maps</attr>
21+
<attr path="/api/package[@name='com.mapbox.mapboxsdk.maps.widgets']" name="managedName">Mapbox.MapboxSdk.Maps.Widgets</attr>
22+
<attr path="/api/package[@name='com.mapbox.mapboxsdk.net']" name="managedName">Mapbox.MapboxSdk.Net</attr>
23+
<attr path="/api/package[@name='com.mapbox.mapboxsdk.offline']" name="managedName">Mapbox.MapboxSdk.Offline</attr>
24+
<attr path="/api/package[@name='com.mapbox.mapboxsdk.storage']" name="managedName">Mapbox.MapboxSdk.Style.Storage</attr>
25+
<attr path="/api/package[@name='com.mapbox.mapboxsdk.style.functions']" name="managedName">Mapbox.MapboxSdk.Style.Functions</attr>
26+
<attr path="/api/package[@name='com.mapbox.mapboxsdk.style.layers']" name="managedName">Mapbox.MapboxSdk.Style.Layers</attr>
27+
<attr path="/api/package[@name='com.mapbox.mapboxsdk.style.sources']" name="managedName">Mapbox.MapboxSdk.Style.Sources</attr>
28+
<attr path="/api/package[@name='com.mapbox.mapboxsdk.style.functions.stops']" name="managedName">Mapbox.Mapboxsdk.Style.Functions.Stops</attr>
29+
<attr path="/api/package[@name='com.mapbox.mapboxsdk.utils']" name="managedName">Mapbox.MapboxSdk.Utils</attr>
2830

29-
<attr path="/api/package[@name='com.mapbox.mapboxsdk.style.layers']/class[@name='Function']/method[@name='zoom']" name="managedReturn">Mapbox.Style.Layers.Function.Stop[]</attr>
30-
31-
<attr path="/api/package[@name='com.mapbox.mapboxsdk.maps']/class[@name='MapboxMap']/method[@name='queryRenderedFeatures']" name="managedReturn">System.Collections.Generic.IList&lt;Mapbox.Services.Commons.GeoJson.Feature&gt;</attr>
31+
<attr path="/api/package[@name='com.mapbox.mapboxsdk.style.functions.stops']/class[@name='Stops']/method[@name='getTypeName']" name="visibility">public</attr>
32+
<attr path="/api/package[@name='com.mapbox.mapboxsdk.style.functions.stops']/class[@name='IdentityStops']/method[@name='getTypeName']" name="visibility">public</attr>
3233

34+
<attr path="/api/package[@name='com.mapbox.mapboxsdk.maps']/class[@name='MapboxMap']/method[@name='queryRenderedFeatures']" name="managedReturn">System.Collections.Generic.IList&lt;Mapbox.Services.Commons.Geojson.Feature&gt;</attr>
35+
<attr path="/api/package[@name='com.mapbox.mapboxsdk.maps']/class[@name='Transform']" name="visibility">public</attr>
3336
<attr path="/api/package[@name='com.mapbox.mapboxsdk.annotations']/class[@name='MarkerViewManager.ImageMarkerViewAdapter']/method[@name='getView']/parameter[@name='p0']" name="type">Java.Lang.Object</attr>
3437

38+
<remove-node path="/api/package[@name='com.mapbox.mapboxsdk.maps']/interface[@name='MapboxMap.OnRegisterTouchListener']" />
3539
<remove-node path="/api/package[@name='com.almeros.android.multitouch.gesturedetectors']/class[@name='TwoFingerGestureDetector']/method[@name='handleInProgressEvent']" />
3640
<remove-node path="/api/package[@name='com.almeros.android.multitouch.gesturedetectors']/class[@name='TwoFingerGestureDetector']/method[@name='handleStartProgressEvent']" />
3741
</metadata>

0 commit comments

Comments
 (0)