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

Commit

Permalink
Merge pull request #1 from NAXAM/v5.0.2
Browse files Browse the repository at this point in the history 
V5.0.2
  • Loading branch information
Vũ Đức Tuyến authored May 13, 2017
2 parents 49b4352 + 3491c02 commit 155db4f
Show file tree
Hide file tree
Showing 62 changed files with 3,976 additions and 5,578 deletions.
8 changes: 4 additions & 4 deletions Naxam.Mapbox.Droid/Additions/Marker.cs
View file
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
using System;
namespace Mapbox.Sdk.Annotations
namespace Com.Mapbox.Mapboxsdk.Annotations
{
public partial class Marker
{
public override int CompareTo(Java.Lang.Object obj)
{
return 0;
return CompareTo((Marker)obj);
}
}

public partial class Polygon
{
public override int CompareTo(Java.Lang.Object obj)
{
return 0;
return CompareTo((Polygon)obj);
}
}

public partial class Polyline
{
public override int CompareTo(Java.Lang.Object obj)
{
return 0;
return CompareTo((Polyline)obj);
}
}

Expand Down
Binary file renamed ...x.Droid/Jars/mapbox-android-sdk-4.2.2.aar → ...x.Droid/Jars/mapbox-android-sdk-5.0.2.aar
View file
Binary file not shown.
79 changes: 59 additions & 20 deletions Naxam.Mapbox.Droid/Naxam.Mapbox.Droid.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<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')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
Expand Down Expand Up @@ -44,26 +45,62 @@
<Reference Include="Square.OkIO">
<HintPath>..\packages\Square.OkIO.1.11.0\lib\MonoAndroid\Square.OkIO.dll</HintPath>
</Reference>
<Reference Include="Square.OkHttp3">
<HintPath>..\packages\Square.OkHttp3.3.5.0\lib\MonoAndroid\Square.OkHttp3.dll</HintPath>
<Reference Include="Naxam.Mapzen.Lost.Droid">
<HintPath>..\packages\Naxam.Mapzen.Lost.Droid.2.1.2\lib\MonoAndroid10\Naxam.Mapzen.Lost.Droid.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Android.Support.Compat">
<HintPath>..\packages\Xamarin.Android.Support.Compat.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.Compat.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Android.Support.Core.UI">
<HintPath>..\packages\Xamarin.Android.Support.Core.UI.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.Core.UI.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Android.Support.Core.Utils">
<HintPath>..\packages\Xamarin.Android.Support.Core.Utils.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.Core.Utils.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Android.Support.Media.Compat">
<HintPath>..\packages\Xamarin.Android.Support.Media.Compat.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.Media.Compat.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Android.Support.Fragment">
<HintPath>..\packages\Xamarin.Android.Support.Fragment.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.Fragment.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Android.Support.v4">
<HintPath>..\packages\Xamarin.Android.Support.v4.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll</HintPath>
<HintPath>..\packages\Xamarin.Android.Support.v4.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.v4.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Android.Support.Transition">
<HintPath>..\packages\Xamarin.Android.Support.Transition.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.Transition.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Android.Support.v7.RecyclerView">
<HintPath>..\packages\Xamarin.Android.Support.v7.RecyclerView.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.RecyclerView.dll</HintPath>
<HintPath>..\packages\Xamarin.Android.Support.v7.RecyclerView.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.v7.RecyclerView.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Android.Support.Vector.Drawable">
<HintPath>..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.Vector.Drawable.dll</HintPath>
<HintPath>..\packages\Xamarin.Android.Support.Vector.Drawable.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.Vector.Drawable.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Android.Support.Animated.Vector.Drawable">
<HintPath>..\packages\Xamarin.Android.Support.Animated.Vector.Drawable.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.Animated.Vector.Drawable.dll</HintPath>
<HintPath>..\packages\Xamarin.Android.Support.Animated.Vector.Drawable.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.Animated.Vector.Drawable.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Android.Support.v7.AppCompat">
<HintPath>..\packages\Xamarin.Android.Support.v7.AppCompat.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.AppCompat.dll</HintPath>
<HintPath>..\packages\Xamarin.Android.Support.v7.AppCompat.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.v7.AppCompat.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Android.Support.Design">
<HintPath>..\packages\Xamarin.Android.Support.Design.23.3.0\lib\MonoAndroid43\Xamarin.Android.Support.Design.dll</HintPath>
<HintPath>..\packages\Xamarin.Android.Support.Design.25.1.1\lib\MonoAndroid70\Xamarin.Android.Support.Design.dll</HintPath>
</Reference>
<Reference Include="Naxam.SquareUp.OkHttp3">
<HintPath>..\packages\Naxam.SquareUp.OkHttp3.3.6.0\lib\MonoAndroid10\Naxam.SquareUp.OkHttp3.dll</HintPath>
</Reference>
<Reference Include="Naxam.Jakewharton.Timber">
<HintPath>..\packages\Naxam.Jakewharton.Timber.4.5.1\lib\MonoAndroid10\Naxam.Jakewharton.Timber.dll</HintPath>
</Reference>
<Reference Include="Naxam.Google.Gson">
<HintPath>..\packages\Naxam.Google.Gson.2.8.0\lib\MonoAndroid10\Naxam.Google.Gson.dll</HintPath>
</Reference>
<Reference Include="Naxam.Mapbox.MapboxJavaCore">
<HintPath>..\packages\Naxam.Mapbox.MapboxJavaCore.2.0.0.2\lib\MonoAndroid10\Naxam.Mapbox.MapboxJavaCore.dll</HintPath>
</Reference>
<Reference Include="Naxam.Mapbox.MapboxJavaGeojson">
<HintPath>..\packages\Naxam.Mapbox.MapboxJavaGeojson.2.0.0.1\lib\MonoAndroid10\Naxam.Mapbox.MapboxJavaGeojson.dll</HintPath>
</Reference>
<Reference Include="Naxam.Mapbox.Services.Android.Telemetry">
<HintPath>..\packages\Naxam.Mapbox.Services.Android.Telemetry.2.0.0.2\lib\MonoAndroid10\Naxam.Mapbox.Services.Android.Telemetry.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
Expand All @@ -81,18 +118,20 @@
<TransformFile Include="Transforms\Metadata.xml" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Naxam.Mapzen.Lost.Droid\Naxam.Mapzen.Lost.Droid.csproj">
<Project>{02690F24-3F64-4ED2-9C83-DA07BAEC25C9}</Project>
<Name>Naxam.Mapzen.Lost.Droid</Name>
</ProjectReference>
<ProjectReference Include="..\Naxam.Mapbox.Services.Droid\Naxam.Mapbox.Services.Droid.csproj">
<Project>{750A5D78-D093-4052-962F-3FD29C25318E}</Project>
<Name>Naxam.Mapbox.Services.Droid</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<LibraryProjectZip Include="Jars\mapbox-android-sdk-4.2.2.aar" />
<LibraryProjectZip Include="Jars\mapbox-android-sdk-5.0.2.aar" />
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.Bindings.targets" />
<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')" />
<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')" />
<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')" />
<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')" />
<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')" />
<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')" />
<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')" />
<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')" />
<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')" />
<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')" />
<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')" />
<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')" />
<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')" />
<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')" />
</Project>
3 changes: 2 additions & 1 deletion Naxam.Mapbox.Droid/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@
// The form "{Major}.{Minor}.*" will automatically update the build and revision,
// and "{Major}.{Minor}.{Build}.*" will update just the revision.

[assembly: AssemblyVersion("4.2.2")]
[assembly: AssemblyVersion("5.0.2")]
[assembly: AssemblyInformationalVersion("5.0.2-alpha")]

// The following attributes are used to specify the signing key for the assembly,
// if desired. See the Mono documentation for more information about signing.
Expand Down
27 changes: 5 additions & 22 deletions Naxam.Mapbox.Droid/Transforms/Metadata.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,31 +7,14 @@
This sample removes the method: android.support.v4.content.CursorLoader.loadInBackground:
<remove-node path="/api/package[@name='android.support.v4.content']/class[@name='CursorLoader']/method[@name='loadInBackground']" />
-->
<attr path="/api/package[@name='com.almeros.android.multitouch.gesturedetectors']" name="managedName">Almeros.Multitouch.Gesturedetectors</attr>

<attr path="/api/package[@name='com.mapbox.mapboxsdk']" name="managedName">Mapbox.Sdk</attr>
<attr path="/api/package[@name='com.mapbox.mapboxsdk.annotations']" name="managedName">Mapbox.Sdk.Annotations</attr>
<attr path="/api/package[@name='com.mapbox.mapboxsdk.camera']" name="managedName">Mapbox.Sdk.Camera</attr>
<attr path="/api/package[@name='com.mapbox.mapboxsdk.constants']" name="managedName">Mapbox.Sdk.Constants</attr>
<attr path="/api/package[@name='com.mapbox.mapboxsdk.exceptions']" name="managedName">Mapbox.Sdk.Exceptions</attr>
<attr path="/api/package[@name='com.mapbox.mapboxsdk.geometry']" name="managedName">Mapbox.Sdk.Geometry</attr>
<attr path="/api/package[@name='com.mapbox.mapboxsdk.http']" name="managedName">Mapbox.Sdk.Http</attr>
<attr path="/api/package[@name='com.mapbox.mapboxsdk.location']" name="managedName">Mapbox.Sdk.Location</attr>
<attr path="/api/package[@name='com.mapbox.mapboxsdk.maps']" name="managedName">Mapbox.Sdk.Maps</attr>
<attr path="/api/package[@name='com.mapbox.mapboxsdk.maps.widgets']" name="managedName">Mapbox.Sdk.Maps.Widgets</attr>
<attr path="/api/package[@name='com.mapbox.mapboxsdk.net']" name="managedName">Mapbox.Sdk.Net</attr>
<attr path="/api/package[@name='com.mapbox.mapboxsdk.offline']" name="managedName">Mapbox.Sdk.Offline</attr>
<attr path="/api/package[@name='com.mapbox.mapboxsdk.style.layers']" name="managedName">Mapbox.Sdk.Style.Layers</attr>
<attr path="/api/package[@name='com.mapbox.mapboxsdk.style.sources']" name="managedName">Mapbox.Sdk.Style.Sources</attr>
<attr path="/api/package[@name='com.mapbox.mapboxsdk.telemetry']" name="managedName">Mapbox.Sdk.Telemetry</attr>
<attr path="/api/package[@name='com.mapbox.mapboxsdk.utils']" name="managedName">Mapbox.Sdk.Utils</attr>

<attr path="/api/package[@name='com.mapbox.mapboxsdk.style.layers']/class[@name='Function']/method[@name='zoom']" name="managedReturn">Mapbox.Style.Layers.Function.Stop[]</attr>

<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>
<attr path="/api/package[@name='com.mapbox.mapboxsdk.style.functions.stops']/class[@name='Stops']/method[@name='getTypeName']" name="visibility">public</attr>
<attr path="/api/package[@name='com.mapbox.mapboxsdk.style.functions.stops']/class[@name='IdentityStops']/method[@name='getTypeName']" name="visibility">public</attr>

<attr path="/api/package[@name='com.mapbox.mapboxsdk.maps']/class[@name='MapboxMap']/method[@name='queryRenderedFeatures']" name="managedReturn">System.Collections.Generic.IList&lt;Com.Mapbox.Services.Commons.Geojson.Feature&gt;</attr>
<attr path="/api/package[@name='com.mapbox.mapboxsdk.maps']/class[@name='Transform']" name="visibility">public</attr>
<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>

<remove-node path="/api/package[@name='com.mapbox.mapboxsdk.maps']/interface[@name='MapboxMap.OnRegisterTouchListener']" />
<remove-node path="/api/package[@name='com.almeros.android.multitouch.gesturedetectors']/class[@name='TwoFingerGestureDetector']/method[@name='handleInProgressEvent']" />
<remove-node path="/api/package[@name='com.almeros.android.multitouch.gesturedetectors']/class[@name='TwoFingerGestureDetector']/method[@name='handleStartProgressEvent']" />
</metadata>
27 changes: 20 additions & 7 deletions Naxam.Mapbox.Droid/packages.config
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,24 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Square.OkHttp3" version="3.5.0" targetFramework="monoandroid71" />
<package id="Naxam.Google.Gson" version="2.8.0" targetFramework="monoandroid71" />
<package id="Naxam.Jakewharton.Timber" version="4.5.1" targetFramework="monoandroid71" />
<package id="Naxam.Mapbox.MapboxJavaCore" version="2.0.0.2" targetFramework="monoandroid71" />
<package id="Naxam.Mapbox.MapboxJavaGeojson" version="2.0.0.1" targetFramework="monoandroid71" />
<package id="Naxam.Mapbox.Services.Android.Telemetry" version="2.0.0.2" targetFramework="monoandroid71" />
<package id="Naxam.Mapzen.Lost.Droid" version="2.1.2.1" targetFramework="monoandroid71" />
<package id="Naxam.SquareUp.OkHttp3" version="3.6.0" targetFramework="monoandroid71" />
<package id="Square.OkIO" version="1.11.0" targetFramework="monoandroid71" />
<package id="Xamarin.Android.Support.Animated.Vector.Drawable" version="23.3.0" targetFramework="monoandroid71" />
<package id="Xamarin.Android.Support.Design" version="23.3.0" targetFramework="monoandroid71" />
<package id="Xamarin.Android.Support.v4" version="23.3.0" targetFramework="monoandroid71" />
<package id="Xamarin.Android.Support.v7.AppCompat" version="23.3.0" targetFramework="monoandroid71" />
<package id="Xamarin.Android.Support.v7.RecyclerView" version="23.3.0" targetFramework="monoandroid71" />
<package id="Xamarin.Android.Support.Vector.Drawable" version="23.3.0" targetFramework="monoandroid71" />
<package id="Xamarin.Android.Support.Animated.Vector.Drawable" version="25.1.1" targetFramework="monoandroid71" />
<package id="Xamarin.Android.Support.Compat" version="25.1.1" targetFramework="monoandroid71" />
<package id="Xamarin.Android.Support.Core.UI" version="25.1.1" targetFramework="monoandroid71" />
<package id="Xamarin.Android.Support.Core.Utils" version="25.1.1" targetFramework="monoandroid71" />
<package id="Xamarin.Android.Support.Design" version="25.1.1" targetFramework="monoandroid71" />
<package id="Xamarin.Android.Support.Fragment" version="25.1.1" targetFramework="monoandroid71" />
<package id="Xamarin.Android.Support.Media.Compat" version="25.1.1" targetFramework="monoandroid71" />
<package id="Xamarin.Android.Support.Transition" version="25.1.1" targetFramework="monoandroid71" />
<package id="Xamarin.Android.Support.v4" version="25.1.1" targetFramework="monoandroid71" />
<package id="Xamarin.Android.Support.v7.AppCompat" version="25.1.1" targetFramework="monoandroid71" />
<package id="Xamarin.Android.Support.v7.RecyclerView" version="25.1.1" targetFramework="monoandroid71" />
<package id="Xamarin.Android.Support.Vector.Drawable" version="25.1.1" targetFramework="monoandroid71" />
<package id="Xamarin.Build.Download" version="0.4.2" targetFramework="monoandroid71" />
</packages>
48 changes: 0 additions & 48 deletions Naxam.Mapbox.Services.Droid/Additions/AboutAdditions.txt
View file

This file was deleted.

Loading

0 comments on commit 155db4f

Please sign in to comment.