Skip to content

Commit 4c823f3

Browse files
antonargunovantonargunov
authored
Merge pull request #112 from antonargunov/master
version 6.0.1
2 parents 4c7a99d + 98c2f7d commit 4c823f3

File tree

9 files changed

+940
-688
lines changed

9 files changed

+940
-688
lines changed

‎Branch-Xamarin-Lib.iOS/ApiDefinition.cs‎

Lines changed: 846 additions & 621 deletions
Large diffs are not rendered by default.

‎Branch-Xamarin-Lib.iOS/Branch-Xamarin-Lib.iOS.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<ProjectGuid>{7057987E-4B0F-4D43-BEEB-65C13A57AAD0}</ProjectGuid>
88
<TemplateGuid>{b6f3ff35-79b2-4f25-a2fc-60a7cf61013b}</TemplateGuid>
99
<OutputType>Library</OutputType>
10-
<RootNamespace>NativeLibrary</RootNamespace>
10+
<RootNamespace>Branch-Xamarin-Lib.iOS</RootNamespace>
1111
<IPhoneResourcePrefix>Resources</IPhoneResourcePrefix>
1212
<AssemblyName>Branch-Xamarin-Lib.iOS</AssemblyName>
1313
<RestoreProjectStyle>PackageReference</RestoreProjectStyle>
@@ -23,7 +23,6 @@
2323
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
2424
</PropertyGroup>
2525
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
26-
<DebugType>full</DebugType>
2726
<Optimize>true</Optimize>
2827
<OutputPath>bin\Release</OutputPath>
2928
<ErrorReport>prompt</ErrorReport>
@@ -49,7 +48,8 @@
4948
<ItemGroup>
5049
<NativeReference Include="Branch.a">
5150
<Kind>Static</Kind>
52-
<SmartLink>False</SmartLink>
51+
<ForceLoad>True</ForceLoad>
52+
<Frameworks>SystemConfiguration</Frameworks>
5353
</NativeReference>
5454
</ItemGroup>
5555
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.ObjCBinding.CSharp.targets" />

‎Branch-Xamarin-Lib.iOS/Branch.a‎

952 KB
Binary file not shown.

‎Branch-Xamarin-Lib.iOS/Structs.cs‎

Lines changed: 70 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -1,74 +1,84 @@
11
using System;
22
using System.Runtime.InteropServices;
3-
//using Branch;
43
using Foundation;
54
using ObjCRuntime;
65

76
namespace IOSNativeBranch {
87

9-
[Native]
8+
[Native]
109
public enum BNCErrorCode : long
11-
{
12-
InitError = 1000,
13-
DuplicateResourceError = 1001,
14-
RedeemCreditsError = 1002,
15-
BadRequestError = 1003,
16-
ServerProblemError = 1004,
17-
NilLogError = 1005,
18-
VersionError = 1006,
19-
NetworkServiceInterfaceError = 1007,
20-
InvalidNetworkPublicKeyError = 1008,
21-
ContentIdentifierError = 1009,
22-
SpotlightNotAvailableError = 1010,
23-
SpotlightTitleError = 1011,
24-
RedeemZeroCreditsError = 1012,
25-
SpotlightIdentifierError = 1013,
26-
SpotlightPublicIndexError = 1014,
27-
TrackingDisabledError = 1015,
28-
HighestError
29-
}
10+
{
11+
InitError = 1000,
12+
DuplicateResourceError = 1001,
13+
RedeemCreditsError = 1002,
14+
BadRequestError = 1003,
15+
ServerProblemError = 1004,
16+
NilLogError = 1005,
17+
VersionError = 1006,
18+
NetworkServiceInterfaceError = 1007,
19+
InvalidNetworkPublicKeyError = 1008,
20+
ContentIdentifierError = 1009,
21+
SpotlightNotAvailableError = 1010,
22+
SpotlightTitleError = 1011,
23+
RedeemZeroCreditsError = 1012,
24+
SpotlightIdentifierError = 1013,
25+
SpotlightPublicIndexError = 1014,
26+
TrackingDisabledError = 1015,
27+
GeneralError = 1016,
28+
HighestError
29+
}
3030

31-
[Native]
32-
public enum BranchLinkType : ulong
33-
{
34-
UnlimitedUse = 0,
35-
OneTimeUse = 1
36-
}
31+
[Native]
32+
public enum BranchLinkType : ulong
33+
{
34+
UnlimitedUse = 0,
35+
OneTimeUse = 1
36+
}
3737

38-
[Native]
39-
public enum BNCLogLevel : long
40-
{
41-
All = 0,
42-
DebugSDK = All,
43-
BreakPoint,
44-
Debug,
45-
Warning,
46-
Error,
47-
Assert,
48-
Log,
49-
None,
50-
Max
51-
}
38+
[Native]
39+
public enum BNCLogLevel : long
40+
{
41+
All = 0,
42+
DebugSDK = All,
43+
BreakPoint,
44+
Debug,
45+
Warning,
46+
Error,
47+
Assert,
48+
Log,
49+
None,
50+
Max
51+
}
5252

53-
[Native]
54-
public enum BNCViewControllerPresentationOption : long
55-
{
56-
Show,
57-
Push,
58-
Present
59-
}
53+
[Native]
54+
public enum BNCViewControllerPresentationOption : long
55+
{
56+
Show,
57+
Push,
58+
Present
59+
}
6060

61-
[Native]
62-
public enum BranchContentIndexMode : long
63-
{
64-
ublic,
65-
rivate
66-
}
61+
[Native]
62+
public enum BranchContentIndexMode : long
63+
{
64+
Public,
65+
Private
66+
}
6767

68-
[Native]
69-
public enum BranchCreditHistoryOrder : ulong
70-
{
71-
MostRecentFirst,
72-
LeastRecentFirst
73-
}
68+
[Native]
69+
public enum BranchEventAdType : long
70+
{
71+
None,
72+
Banner,
73+
Interstitial,
74+
RewardedVideo,
75+
Native
76+
}
77+
78+
[Native]
79+
public enum BranchCreditHistoryOrder : ulong
80+
{
81+
MostRecentFirst,
82+
LeastRecentFirst
83+
}
7484
}

‎Branch-Xamarin-SDK.Droid/BranchAndroid.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ private AndroidNativeBranch NativeBranch {
4646
public Activity CurrActivity { get; set; }
4747

4848
public static void GetAutoInstance(Context appContext) {
49-
AndroidNativeBranch.GetAutoInstance(appContext);
49+
AndroidNativeBranch.GetAutoInstance(appContext);
5050
//AndroidNativeBranch.DisableInstantDeepLinking(true);
5151
}
5252

‎Branch-Xamarin-SDK.iOS/BranchIOS.cs‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,10 @@ public static void Init(String branchKey, NSDictionary launchOptions, IBranchSes
5252
Branch.branchInstance = instance;
5353
instance.branchKey = branchKey;
5454

55-
if (launchOptions != null) {
55+
instance.NativeBranch.RegisterPluginName("xamarin.ios", "6.0.1");
56+
//IOSNativeBranch.RegisterPluginName();
57+
58+
if (launchOptions != null) {
5659
instance.launchOptions = new NSDictionary (launchOptions);
5760
} else {
5861
instance.launchOptions = new NSDictionary ();

‎ChangeLog.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
Branch Xamarin SDK change log
22

3+
- 6.0.1
4+
* Updating Branch to iOS version 0.31.0
5+
36
- 6.0.0
47
* Updating Branch to Android version 4.2.0 and iOS version 0.30.1
58
* Moving Xamarin SDK from PCL to .net standard 1.2

NuGet/Branch-Xamarin-Linking-SDK.6.0.0.nupkg renamed to NuGet/Branch-Xamarin-Linking-SDK.6.0.1.nupkg

12.6 MB
Binary file not shown.

‎NuGet/Branch-Xamarin-SDK.nuspec‎

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<id>Branch-Xamarin-Linking-SDK</id>
55
<title>Branch Xamarin SDK</title>
66
<summary>Hosted deep links for your Xamarin-based Android or iOS app by Branch</summary>
7-
<version>6.0.0</version>
7+
<version>6.0.1</version>
88
<authors>Branch Metrics, Inc.</authors>
99
<owners>Branch Metrics, Inc.</owners>
1010
<iconUrl> https://s3-us-west-1.amazonaws.com/branchhost/branch_icon.png</iconUrl>
@@ -15,7 +15,18 @@
1515
<copyright>Copyright 2019 Branch Metrics, Inc.</copyright>
1616
<tags>Xamarin Branch deep linking tracking measurement iOS Android sharing referral invite analytics</tags>
1717
<dependencies>
18-
<dependency id="Newtonsoft.Json" version="12.0.3" />
18+
<group>
19+
<dependency id="Newtonsoft.Json" version="12.0.3" />
20+
</group>
21+
<group targetFramework=".NETStandard1.2" >
22+
<dependency id="Newtonsoft.Json" version="12.0.3" />
23+
</group>
24+
<group targetFramework="MonoAndroid0.0" >
25+
<dependency id="Newtonsoft.Json" version="12.0.3" />
26+
</group>
27+
<group targetFramework="Xamarin.iOS1.0" >
28+
<dependency id="Newtonsoft.Json" version="12.0.3" />
29+
</group>
1930
</dependencies>
2031

2132
<license type="file">LICENSE.txt</license>

0 commit comments

Comments
 (0)