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

Commit 3d8f2f3

Browse files
tuyen-vuductuyen-vuduc
committed
Close #4 -> publish new package
1 parent f61f7c3 commit 3d8f2f3

File tree

6 files changed

+159
-82
lines changed

6 files changed

+159
-82
lines changed

Naxam.Mapbox.Droid.5.1.1.1.nupkg renamed to Naxam.Mapbox.Droid.5.1.1.2.nupkg

13.1 MB
Binary file not shown.

‎Naxam.Mapbox.Droid/Additions/Marker.cs‎

Lines changed: 75 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -3,83 +3,89 @@
33

44
namespace Com.Mapbox.Mapboxsdk.Annotations
55
{
6-
public partial class Marker
7-
{
8-
public override int CompareTo(Java.Lang.Object obj)
9-
{
10-
return CompareTo((Marker)obj);
11-
}
12-
}
6+
public partial class Marker
7+
{
8+
public override int CompareTo(Java.Lang.Object obj)
9+
{
10+
return CompareTo((Marker)obj);
11+
}
12+
}
1313

14-
public partial class Polygon
15-
{
16-
public override int CompareTo(Java.Lang.Object obj)
17-
{
18-
return CompareTo((Polygon)obj);
19-
}
20-
}
14+
public partial class Polygon
15+
{
16+
public override int CompareTo(Java.Lang.Object obj)
17+
{
18+
return CompareTo((Polygon)obj);
19+
}
20+
}
2121

22-
public partial class Polyline
23-
{
24-
public override int CompareTo(Java.Lang.Object obj)
25-
{
26-
return CompareTo((Polyline)obj);
27-
}
28-
}
22+
public partial class Polyline
23+
{
24+
public override int CompareTo(Java.Lang.Object obj)
25+
{
26+
return CompareTo((Polyline)obj);
27+
}
28+
}
2929

30-
public partial class MarkerOptions
31-
{
32-
protected override Java.Lang.Object RawMarker
33-
{
34-
get { return Marker; }
35-
}
30+
public partial class MarkerOptions
31+
{
32+
public override BaseMarkerOptions This
33+
{
34+
get { return ThisMarkerOptions(); }
35+
}
36+
}
3637

37-
protected override Java.Lang.Object RawThis
38-
{
39-
get { return This; }
40-
}
41-
}
38+
public partial class MarkerViewOptions
39+
{
40+
public override BaseMarkerViewOptions This
41+
{
42+
get { return ThisMarkerViewOptions(); }
43+
}
44+
}
4245

46+
partial class PolygonOptions
47+
{
4348

44-
public partial class MarkerViewOptions
45-
{
46-
protected override Java.Lang.Object RawMarker
47-
{
48-
get { return Marker; }
49-
}
49+
static IntPtr id_addHole_arrayLjava_util_List_;
50+
// Metadata.xml XPath method reference: path="/api/package[@name='com.mapbox.mapboxsdk.annotations']/class[@name='PolygonOptions']/method[@name='addHole' and count(parameter)=1 and parameter[1][@type='java.util.List<com.mapbox.mapboxsdk.geometry.LatLng>...']]"
51+
[Register("addHole", "([Ljava/util/List;)Lcom/mapbox/mapboxsdk/annotations/PolygonOptions;", "")]
52+
public unsafe global::Com.Mapbox.Mapboxsdk.Annotations.PolygonOptions AddHole(params global::System.Collections.Generic.IList<global::Com.Mapbox.Mapboxsdk.Geometry.LatLng>[] p0)
53+
{
54+
if (id_addHole_arrayLjava_util_List_ == IntPtr.Zero)
55+
id_addHole_arrayLjava_util_List_ = JNIEnv.GetMethodID(class_ref, "addHole", "([Ljava/util/List;)Lcom/mapbox/mapboxsdk/annotations/PolygonOptions;");
56+
IntPtr native_p0 = JNIEnv.NewArray(p0);
57+
try
58+
{
59+
JValue* __args = stackalloc JValue[1];
60+
__args[0] = new JValue(native_p0);
61+
global::Com.Mapbox.Mapboxsdk.Annotations.PolygonOptions __ret = Java.Lang.Object.GetObject<global::Com.Mapbox.Mapboxsdk.Annotations.PolygonOptions>(JNIEnv.CallObjectMethod(((global::Java.Lang.Object)this).Handle, id_addHole_arrayLjava_util_List_, __args), JniHandleOwnership.TransferLocalRef);
62+
return __ret;
63+
}
64+
finally
65+
{
66+
if (p0 != null)
67+
{
68+
JNIEnv.CopyArray(native_p0, p0);
69+
JNIEnv.DeleteLocalRef(native_p0);
70+
}
71+
}
72+
}
5073

51-
protected override Java.Lang.Object RawThis
52-
{
53-
get { return This; }
54-
}
55-
}
74+
}
5675

57-
partial class PolygonOptions {
5876

59-
static IntPtr id_addHole_arrayLjava_util_List_;
60-
// Metadata.xml XPath method reference: path="/api/package[@name='com.mapbox.mapboxsdk.annotations']/class[@name='PolygonOptions']/method[@name='addHole' and count(parameter)=1 and parameter[1][@type='java.util.List&lt;com.mapbox.mapboxsdk.geometry.LatLng&gt;...']]"
61-
[Register("addHole", "([Ljava/util/List;)Lcom/mapbox/mapboxsdk/annotations/PolygonOptions;", "")]
62-
public unsafe global::Com.Mapbox.Mapboxsdk.Annotations.PolygonOptions AddHole(params global::System.Collections.Generic.IList<global::Com.Mapbox.Mapboxsdk.Geometry.LatLng>[] p0)
63-
{
64-
if (id_addHole_arrayLjava_util_List_ == IntPtr.Zero)
65-
id_addHole_arrayLjava_util_List_ = JNIEnv.GetMethodID(class_ref, "addHole", "([Ljava/util/List;)Lcom/mapbox/mapboxsdk/annotations/PolygonOptions;");
66-
IntPtr native_p0 = JNIEnv.NewArray(p0);
67-
try
68-
{
69-
JValue* __args = stackalloc JValue[1];
70-
__args[0] = new JValue(native_p0);
71-
global::Com.Mapbox.Mapboxsdk.Annotations.PolygonOptions __ret = Java.Lang.Object.GetObject<global::Com.Mapbox.Mapboxsdk.Annotations.PolygonOptions>(JNIEnv.CallObjectMethod(((global::Java.Lang.Object)this).Handle, id_addHole_arrayLjava_util_List_, __args), JniHandleOwnership.TransferLocalRef);
72-
return __ret;
73-
}
74-
finally
75-
{
76-
if (p0 != null)
77-
{
78-
JNIEnv.CopyArray(native_p0, p0);
79-
JNIEnv.DeleteLocalRef(native_p0);
80-
}
81-
}
82-
}
77+
public static class BaseOptionsExtensions
78+
{
79+
public static T This<T>(this BaseMarkerOptions options) where T : BaseMarkerOptions
80+
{
81+
return (T)options.This;
82+
}
83+
84+
public static T This<T>(this BaseMarkerViewOptions options) where T : BaseMarkerViewOptions
85+
{
86+
return (T)options.This;
87+
}
88+
89+
}
8390

84-
}
8591
}

‎Naxam.Mapbox.Droid/Properties/AssemblyInfo.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
// Change them to the values specific to your project.
77

88
[assembly: AssemblyTitle("Naxam.Mapbox.Droid")]
9-
[assembly: AssemblyDescription("")]
9+
[assembly: AssemblyDescription("Xamarin Binding Library - Mapbox for Android")]
1010
[assembly: AssemblyConfiguration("")]
11-
[assembly: AssemblyCompany("NAXAM CO.,LTD")]
12-
[assembly: AssemblyProduct("")]
11+
[assembly: AssemblyCompany("NAXAM COMPANY LIMITED")]
12+
[assembly: AssemblyProduct("X Bindings")]
1313
[assembly: AssemblyCopyright("Copyright (c) 2017 NAXAM")]
1414
[assembly: AssemblyTrademark("NAXAM")]
1515
[assembly: AssemblyCulture("")]
@@ -18,7 +18,7 @@
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("5.1.1")]
21+
[assembly: AssemblyVersion("5.1.1.2")]
2222

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

‎Naxam.Mapbox.Droid/Transforms/Metadata.xml‎

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,66 @@
1313
<remove-node path="/api/package[@name='com.almeros.android.multitouch.gesturedetectors']/class[@name='TwoFingerGestureDetector']/method[@name='handleStartProgressEvent']" />
1414

1515
<remove-node path="/api/package[@name='com.mapbox.mapboxsdk.annotations']/class[@name='PolygonOptions']/method[@name='addHole' and count(parameter)=1 and parameter[1][@type='java.util.List&lt;com.mapbox.mapboxsdk.geometry.LatLng&gt;...']]" />
16+
17+
<attr path="/api/package[@name='com.mapbox.mapboxsdk.annotations']/class[@name='BaseMarkerOptions']/method[@name='setIcon' and count(parameter)=1]" name="return">com.mapbox.mapboxsdk.annotations.BaseMarkerOptions</attr>
18+
<attr path="/api/package[@name='com.mapbox.mapboxsdk.annotations']/class[@name='BaseMarkerOptions']/method[@name='setPosition' and count(parameter)=1]" name="return">com.mapbox.mapboxsdk.annotations.BaseMarkerOptions</attr>
19+
<attr path="/api/package[@name='com.mapbox.mapboxsdk.annotations']/class[@name='BaseMarkerOptions']/method[@name='setSnippet' and count(parameter)=1]" name="return">com.mapbox.mapboxsdk.annotations.BaseMarkerOptions</attr>
20+
<attr path="/api/package[@name='com.mapbox.mapboxsdk.annotations']/class[@name='BaseMarkerOptions']/method[@name='setTitle' and count(parameter)=1]" name="return">com.mapbox.mapboxsdk.annotations.BaseMarkerOptions</attr>
21+
22+
<attr path="/api/package[@name='com.mapbox.mapboxsdk.annotations']/class[@name='BaseMarkerOptions']/field[@name='icon']" name="managedName">_icon</attr>
23+
<attr path="/api/package[@name='com.mapbox.mapboxsdk.annotations']/class[@name='BaseMarkerOptions']/field[@name='position']" name="managedName">_position</attr>
24+
<attr path="/api/package[@name='com.mapbox.mapboxsdk.annotations']/class[@name='BaseMarkerOptions']/field[@name='snippet']" name="managedName">_snippet</attr>
25+
<attr path="/api/package[@name='com.mapbox.mapboxsdk.annotations']/class[@name='BaseMarkerOptions']/field[@name='title']" name="managedName">_title</attr>
26+
27+
<attr path="/api/package[@name='com.mapbox.mapboxsdk.annotations']/class[@name='BaseMarkerViewOptions']/field[@name='alpha']" name="managedName">_alpha</attr>
28+
<attr path="/api/package[@name='com.mapbox.mapboxsdk.annotations']/class[@name='BaseMarkerViewOptions']/field[@name='anchorU']" name="managedName">_anchorU</attr>
29+
<attr path="/api/package[@name='com.mapbox.mapboxsdk.annotations']/class[@name='BaseMarkerViewOptions']/field[@name='anchorV']" name="managedName">_anchorV</attr>
30+
<attr path="/api/package[@name='com.mapbox.mapboxsdk.annotations']/class[@name='BaseMarkerViewOptions']/field[@name='flat']" name="managedName">_flat</attr>
31+
<attr path="/api/package[@name='com.mapbox.mapboxsdk.annotations']/class[@name='BaseMarkerViewOptions']/field[@name='icon']" name="managedName">_icon</attr>
32+
<attr path="/api/package[@name='com.mapbox.mapboxsdk.annotations']/class[@name='BaseMarkerViewOptions']/field[@name='infoWindowAnchorU']" name="managedName">_infoWindowAnchorU</attr>
33+
<attr path="/api/package[@name='com.mapbox.mapboxsdk.annotations']/class[@name='BaseMarkerViewOptions']/field[@name='infoWindowAnchorV']" name="managedName">_infoWindowAnchorV</attr>
34+
<attr path="/api/package[@name='com.mapbox.mapboxsdk.annotations']/class[@name='BaseMarkerViewOptions']/field[@name='position']" name="managedName">_position</attr>
35+
<attr path="/api/package[@name='com.mapbox.mapboxsdk.annotations']/class[@name='BaseMarkerViewOptions']/field[@name='rotation']" name="managedName">_rotation</attr>
36+
<attr path="/api/package[@name='com.mapbox.mapboxsdk.annotations']/class[@name='BaseMarkerViewOptions']/field[@name='selected']" name="managedName">_selected</attr>
37+
<attr path="/api/package[@name='com.mapbox.mapboxsdk.annotations']/class[@name='BaseMarkerViewOptions']/field[@name='snippet']" name="managedName">_snippet</attr>
38+
<attr path="/api/package[@name='com.mapbox.mapboxsdk.annotations']/class[@name='BaseMarkerViewOptions']/field[@name='title']" name="managedName">_title</attr>
39+
<attr path="/api/package[@name='com.mapbox.mapboxsdk.annotations']/class[@name='BaseMarkerViewOptions']/field[@name='visible']" name="managedName">_visible</attr>
40+
41+
<attr path="/api/package[@name='com.mapbox.mapboxsdk.annotations']/class[@name='BaseMarkerViewOptions']/method['alpha']" name="return">com.mapbox.mapboxsdk.annotations.BaseMarkerViewOptions</attr>
42+
<attr path="/api/package[@name='com.mapbox.mapboxsdk.annotations']/class[@name='BaseMarkerViewOptions']/method['anchorU']" name="return">com.mapbox.mapboxsdk.annotations.BaseMarkerViewOptions</attr>
43+
<attr path="/api/package[@name='com.mapbox.mapboxsdk.annotations']/class[@name='BaseMarkerViewOptions']/method['anchorV']" name="return">com.mapbox.mapboxsdk.annotations.BaseMarkerViewOptions</attr>
44+
<attr path="/api/package[@name='com.mapbox.mapboxsdk.annotations']/class[@name='BaseMarkerViewOptions']/method['flat']" name="return">com.mapbox.mapboxsdk.annotations.BaseMarkerViewOptions</attr>
45+
<attr path="/api/package[@name='com.mapbox.mapboxsdk.annotations']/class[@name='BaseMarkerViewOptions']/method['icon']" name="return">com.mapbox.mapboxsdk.annotations.BaseMarkerViewOptions</attr>
46+
<attr path="/api/package[@name='com.mapbox.mapboxsdk.annotations']/class[@name='BaseMarkerViewOptions']/method['infoWindowAnchorU']" name="return">com.mapbox.mapboxsdk.annotations.BaseMarkerViewOptions</attr>
47+
<attr path="/api/package[@name='com.mapbox.mapboxsdk.annotations']/class[@name='BaseMarkerViewOptions']/method['infoWindowAnchorV']" name="return">com.mapbox.mapboxsdk.annotations.BaseMarkerViewOptions</attr>
48+
<attr path="/api/package[@name='com.mapbox.mapboxsdk.annotations']/class[@name='BaseMarkerViewOptions']/method['position']" name="return">com.mapbox.mapboxsdk.annotations.BaseMarkerViewOptions</attr>
49+
<attr path="/api/package[@name='com.mapbox.mapboxsdk.annotations']/class[@name='BaseMarkerViewOptions']/method['rotation']" name="return">com.mapbox.mapboxsdk.annotations.BaseMarkerViewOptions</attr>
50+
<attr path="/api/package[@name='com.mapbox.mapboxsdk.annotations']/class[@name='BaseMarkerViewOptions']/method['selected']" name="return">com.mapbox.mapboxsdk.annotations.BaseMarkerViewOptions</attr>
51+
<attr path="/api/package[@name='com.mapbox.mapboxsdk.annotations']/class[@name='BaseMarkerViewOptions']/method['snippet']" name="return">com.mapbox.mapboxsdk.annotations.BaseMarkerViewOptions</attr>
52+
<attr path="/api/package[@name='com.mapbox.mapboxsdk.annotations']/class[@name='BaseMarkerViewOptions']/method['title']" name="return">com.mapbox.mapboxsdk.annotations.BaseMarkerViewOptions</attr>
53+
<attr path="/api/package[@name='com.mapbox.mapboxsdk.annotations']/class[@name='BaseMarkerViewOptions']/method['visible']" name="return">com.mapbox.mapboxsdk.annotations.BaseMarkerViewOptions</attr>
54+
55+
<attr path="/api/package[@name='com.mapbox.mapboxsdk.annotations']/class[@name='BaseMarkerViewOptions']/method[@name='getMarker']" name="return">com.mapbox.mapboxsdk.annotations.MarkerView</attr>
56+
<attr path="/api/package[@name='com.mapbox.mapboxsdk.annotations']/class[@name='BaseMarkerViewOptions']/method[@name='getMarker']" name="visibility">public</attr>
57+
58+
<attr path="/api/package[@name='com.almeros.android.multitouch.gesturedetectors']/class[@name='BaseGestureDetector']/field[@name='context']" name="managedName">_context</attr>
59+
<attr path="/api/package[@name='com.almeros.android.multitouch.gesturedetectors']/class[@name='BaseGestureDetector']/field[@name='currEvent']" name="managedName">_currEvent</attr>
60+
<attr path="/api/package[@name='com.almeros.android.multitouch.gesturedetectors']/class[@name='BaseGestureDetector']/field[@name='currPressure']" name="managedName">_currPressure</attr>
61+
<attr path="/api/package[@name='com.almeros.android.multitouch.gesturedetectors']/class[@name='BaseGestureDetector']/field[@name='gestureInProgress']" name="managedName">_gestureInProgress</attr>
62+
<attr path="/api/package[@name='com.almeros.android.multitouch.gesturedetectors']/class[@name='BaseGestureDetector']/field[@name='prevEvent']" name="managedName">_prevEvent</attr>
63+
<attr path="/api/package[@name='com.almeros.android.multitouch.gesturedetectors']/class[@name='BaseGestureDetector']/field[@name='prevPressure']" name="managedName">_prevPressure</attr>
64+
<attr path="/api/package[@name='com.almeros.android.multitouch.gesturedetectors']/class[@name='BaseGestureDetector']/field[@name='timeDelta']" name="managedName">_timeDelta</attr>
65+
66+
<attr path="/api/package[@name='com.mapbox.mapboxsdk.annotations']/class[@name='MarkerViewOptions']/method[@name='getThis' and count(parameter)=0]" name="managedName">ThisMarkerViewOptions</attr>
67+
68+
<attr path="/api/package[@name='com.mapbox.mapboxsdk.annotations']/class[@name='Annotation']/field[@name='mapView']" name="managedName">_mapView</attr>
69+
<attr path="/api/package[@name='com.mapbox.mapboxsdk.annotations']/class[@name='Annotation']/field[@name='mapboxMap']" name="managedName">_mapboxMap</attr>
70+
71+
<attr path="/api/package[@name='com.mapbox.mapboxsdk.annotations']/class[@name='InfoWindow']/field[@name='view']" name="managedName">_view</attr>
72+
73+
<attr path="/api/package[@name='com.mapbox.mapboxsdk.style.layers']/class[@name='PropertyValue']/field[@name='value']" name="managedName">_value</attr>
74+
75+
<attr path="/api/package[@name='com.mapbox.mapboxsdk.annotations']/class[@name='BaseMarkerOptions']/method[@name='getThis' and count(parameter)=0]" name="return">com.mapbox.mapboxsdk.annotations.BaseMarkerOptions</attr>
76+
<attr path="/api/package[@name='com.mapbox.mapboxsdk.annotations']/class[@name='BaseMarkerOptions']/method[@name='getMarker' and count(parameter)=0]" name="return">com.mapbox.mapboxsdk.annotations.Marker</attr>
77+
<attr path="/api/package[@name='com.mapbox.mapboxsdk.annotations']/class[@name='MarkerOptions']/method[@name='getThis' and count(parameter)=0]" name="managedName">ThisMarkerOptions</attr>
1678
</metadata>

‎demo/Naxam.MapboxQs/MainActivity.cs‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
using Android.Support.V7.App;
77
using Com.Mapbox.Mapboxsdk.Camera;
88
using Com.Mapbox.Mapboxsdk.Geometry;
9+
using Com.Mapbox.Mapboxsdk.Annotations;
910

1011
namespace Naxam.MapboxQs
1112
{
@@ -30,9 +31,17 @@ protected override void OnCreate(Bundle bundle)
3031

3132
mapView.GetMapAsync(this);
3233

33-
//global::Xamarin.Forms.Forms.Init(this, bundle);
34+
//global::Xamarin.Forms.Forms.Init(this, bundle);
3435

35-
//LoadApplication(new App());
36+
//LoadApplication(new App());
37+
38+
MarkerOptions options = new MarkerOptions()
39+
.SetTitle("Hello")
40+
.This<MarkerOptions>();
41+
42+
MarkerViewOptions viewOptions = new MarkerViewOptions()
43+
.InvokeTitle("Hello")
44+
.This<MarkerViewOptions>();
3645
}
3746

3847
protected override void OnStart()

‎mapbox.nuspec‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@
33
<metadata>
44
<!-- Required elements-->
55
<id>Naxam.Mapbox.Droid</id>
6-
<version>5.1.1.1</version>
7-
<description>Xamarin Binding Library - Mapbox Android SDK</description>
8-
<authors>Vu Duc Tuyen</authors>
9-
<owners>NAXAM CO.,LTD</owners>
6+
<version>5.1.1.2</version>
7+
<authors>NAXAM</authors>
8+
<owners>NAXAM COMPANY LIMITED</owners>
109
<requireLicenseAcceptance>false</requireLicenseAcceptance>
11-
12-
<!-- Optional elements -->
1310
<title>Naxam - Mapbox Android SDK</title>
11+
<summary>Xamarin Binding Library - Mapbox Android SDK</summary>
12+
<description>Xamarin Binding Library - Mapbox Android SDK</description>
13+
<iconUrl>https://avatars0.githubusercontent.com/u/600935</iconUrl>
1414
<licenseUrl>https://opensource.org/licenses/MIT</licenseUrl>
1515
<projectUrl>https://github.com/NAXAM/xam-mapbox-android</projectUrl>
16-
<copyright>(c) 2017 NAXAM</copyright>
16+
<copyright>Copyright (c) 2017 NAXAM</copyright>
1717
<tags>Xamarin.Android, Mapbox</tags>
1818
<dependencies>
1919
<dependency id="Naxam.SquareUp.OkHttp3" version="3.7.0" />

0 commit comments

Comments
 (0)