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

Commit 375887b

Browse files
author
Tuyen Vuduc
committed
Mapbox Android v8
1 parent e174537 commit 375887b

20 files changed

+568
-328
lines changed

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

Lines changed: 38 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using System;
22
using Android.Runtime;
3+
using Java.Lang;
34

45
namespace Com.Mapbox.Mapboxsdk.Annotations
56
{
@@ -35,13 +36,13 @@ public override BaseMarkerOptions This
3536
}
3637
}
3738

38-
public partial class MarkerViewOptions
39-
{
40-
public override BaseMarkerViewOptions This
41-
{
42-
get { return ThisMarkerViewOptions(); }
43-
}
44-
}
39+
//public partial class MarkerViewOptions
40+
//{
41+
// public override BaseMarkerViewOptions This
42+
// {
43+
// get { return ThisMarkerViewOptions(); }
44+
// }
45+
//}
4546

4647
partial class PolygonOptions
4748
{
@@ -76,16 +77,39 @@ partial class PolygonOptions
7677

7778
public static class BaseOptionsExtensions
7879
{
79-
public static T This<T>(this BaseMarkerOptions options) where T : BaseMarkerOptions
80+
//public static T This<T>(this BaseMarkerOptions options) where T : BaseMarkerOptions
81+
//{
82+
// return (T)options.This;
83+
//}
84+
85+
//public static T This<T>(this BaseMarkerViewOptions options) where T : BaseMarkerViewOptions
86+
//{
87+
// return (T)options.This;
88+
//}
89+
90+
}
91+
92+
}
93+
94+
95+
namespace Com.Mapbox.Mapboxsdk.Utils
96+
{
97+
partial class FileUtils
98+
{
99+
partial class CheckFileReadPermissionTask
80100
{
81-
return (T)options.This;
101+
protected override Java.Lang.Object DoInBackground(params Java.Lang.Object[] @params)
102+
{
103+
return null;
104+
}
82105
}
83106

84-
public static T This<T>(this BaseMarkerViewOptions options) where T : BaseMarkerViewOptions
107+
partial class CheckFileWritePermissionTask
85108
{
86-
return (T)options.This;
109+
protected override Java.Lang.Object DoInBackground(params Java.Lang.Object[] @params)
110+
{
111+
return null;
112+
}
87113
}
88-
89114
}
90-
91-
}
115+
}

‎Naxam.Mapbox.Droid/Jars/mapbox-android-sdk.aar

-1.73 MB
Binary file not shown.

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,18 @@
7474
<PackageReference Include="Naxam.Mapbox.Services.Android.Telemetry">
7575
<Version>4.4.1</Version>
7676
</PackageReference>
77+
<PackageReference Include="Naxam.MapboxSdkTurf.Droid">
78+
<Version>4.8.0</Version>
79+
</PackageReference>
80+
<PackageReference Include="Xamarin.Android.Support.Fragment">
81+
<Version>28.0.0.1</Version>
82+
</PackageReference>
83+
<PackageReference Include="Xamarin.Android.Support.Annotations">
84+
<Version>28.0.0.1</Version>
85+
</PackageReference>
86+
<PackageReference Include="Xbindings.ReLinker.Droid">
87+
<Version>1.2.3</Version>
88+
</PackageReference>
7789
</ItemGroup>
7890
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.Bindings.targets" />
7991
</Project>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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("6.4.0.1")]
21+
[assembly: AssemblyVersion("8.0.0.0")]
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.MapboxAccounts.Droid/Jars/mapbox-android-accounts.aar

1.44 KB
Binary file not shown.

‎Naxam.MapboxAccounts.Droid/Naxam.MapboxAccounts.Droid.csproj

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
<RootNamespace>Naxam.MapboxAccounts.Droid</RootNamespace>
1414
<AssemblyName>Naxam.MapboxAccounts.Droid</AssemblyName>
1515
<FileAlignment>512</FileAlignment>
16-
<AndroidUseLatestPlatformSdk>false</AndroidUseLatestPlatformSdk>
1716
<TargetFrameworkVersion>v9.0</TargetFrameworkVersion>
1817
<AndroidClassParser>class-parse</AndroidClassParser>
1918
<AndroidCodegenTarget>XAJavaInterop1</AndroidCodegenTarget>
@@ -52,6 +51,9 @@
5251
<TransformFile Include="Transforms\EnumFields.xml" />
5352
<TransformFile Include="Transforms\EnumMethods.xml" />
5453
</ItemGroup>
54+
<ItemGroup>
55+
<LibraryProjectZip Include="Jars\mapbox-android-accounts.aar" />
56+
</ItemGroup>
5557
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.Bindings.targets" />
5658
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
5759
Other similar extension points exist, see Microsoft.Common.targets.

‎Naxam.MapboxGestures.Droid/Additions/Classes.cs

Lines changed: 0 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -5,59 +5,4 @@
55

66
namespace Com.Mapbox.Android.Gestures
77
{
8-
partial class AndroidGesturesManager
9-
{
10-
// Metadata.xml XPath constructor reference: path="/api/package[@name='com.mapbox.android.gestures']/class[@name='AndroidGesturesManager']/constructor[@name='AndroidGesturesManager' and count(parameter)=2 and parameter[1][@type='android.content.Context'] and parameter[2][@type='java.util.Set&lt;java.lang.Integer&gt;...']]"
11-
[Register(".ctor", "(Landroid/content/Context;[Ljava/util/Set;)V", "")]
12-
public unsafe AndroidGesturesManager(global::Android.Content.Context context, params global::System.Collections.Generic.ICollection<global::Java.Lang.Integer>[] exclusiveGestures)
13-
: base(IntPtr.Zero, JniHandleOwnership.DoNotTransfer)
14-
{
15-
const string __id = "(Landroid/content/Context;[Ljava/util/Set;)V";
16-
17-
if (((global::Java.Lang.Object)this).Handle != IntPtr.Zero)
18-
return;
19-
20-
IntPtr native_exclusiveGestures = JNIEnv.NewArray(exclusiveGestures);
21-
try
22-
{
23-
JniArgumentValue* __args = stackalloc JniArgumentValue[2];
24-
__args[0] = new JniArgumentValue((context == null) ? IntPtr.Zero : ((global::Java.Lang.Object)context).Handle);
25-
__args[1] = new JniArgumentValue(native_exclusiveGestures);
26-
var __r = _members.InstanceMethods.StartCreateInstance(__id, ((object)this).GetType(), __args);
27-
SetHandle(__r.Handle, JniHandleOwnership.TransferLocalRef);
28-
_members.InstanceMethods.FinishCreateInstance(__id, this, __args);
29-
}
30-
finally
31-
{
32-
if (exclusiveGestures != null)
33-
{
34-
JNIEnv.CopyArray(native_exclusiveGestures, exclusiveGestures);
35-
JNIEnv.DeleteLocalRef(native_exclusiveGestures);
36-
}
37-
}
38-
}
39-
40-
// Metadata.xml XPath method reference: path="/api/package[@name='com.mapbox.android.gestures']/class[@name='AndroidGesturesManager']/method[@name='setMutuallyExclusiveGestures' and count(parameter)=1 and parameter[1][@type='java.util.Set&lt;java.lang.Integer&gt;...']]"
41-
[Register("setMutuallyExclusiveGestures", "([Ljava/util/Set;)V", "")]
42-
public unsafe void SetMutuallyExclusiveGestures(params global::System.Collections.Generic.ICollection<global::Java.Lang.Integer>[] exclusiveGestures)
43-
{
44-
const string __id = "setMutuallyExclusiveGestures.([Ljava/util/Set;)V";
45-
IntPtr native_exclusiveGestures = JNIEnv.NewArray(exclusiveGestures);
46-
try
47-
{
48-
JniArgumentValue* __args = stackalloc JniArgumentValue[1];
49-
__args[0] = new JniArgumentValue(native_exclusiveGestures);
50-
_members.InstanceMethods.InvokeNonvirtualVoidMethod(__id, this, __args);
51-
}
52-
finally
53-
{
54-
if (exclusiveGestures != null)
55-
{
56-
JNIEnv.CopyArray(native_exclusiveGestures, exclusiveGestures);
57-
JNIEnv.DeleteLocalRef(native_exclusiveGestures);
58-
}
59-
}
60-
}
61-
62-
}
638
}

‎Naxam.MapboxGestures.Droid/Jars/mapbox-android-gestures.aar

-10.9 KB
Binary file not shown.

‎Naxam.MapboxGestures.Droid/Naxam.MapboxGestures.Droid.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
<RootNamespace>Naxam.MapboxGestures.Droid</RootNamespace>
1414
<AssemblyName>Naxam.MapboxGestures.Droid</AssemblyName>
1515
<FileAlignment>512</FileAlignment>
16-
<AndroidUseLatestPlatformSdk>false</AndroidUseLatestPlatformSdk>
1716
<TargetFrameworkVersion>v9.0</TargetFrameworkVersion>
1817
<AndroidClassParser>class-parse</AndroidClassParser>
1918
<AndroidCodegenTarget>XAJavaInterop1</AndroidCodegenTarget>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,6 @@
2525
//
2626
// You can specify all the values or you can default the Build and Revision Numbers
2727
// by using the '*' as shown below:
28-
// [assembly: AssemblyVersion("0.2.0")]
29-
[assembly: AssemblyVersion("0.2.0")]
28+
// [assembly: AssemblyVersion("0.4.2")]
29+
[assembly: AssemblyVersion("0.4.2")]
3030
[assembly: AssemblyFileVersion("1.0.0.0")]

0 commit comments

Comments
 (0)