Skip to content

Commit b11855a

Browse files
authored
Merge pull request #385 from BranchMetrics/bulky
lots of fixes
2 parents 7017650 + 243165a commit b11855a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+3036
-74
lines changed

build.gradle

Lines changed: 0 additions & 18 deletions
This file was deleted.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "branch-cordova-sdk",
33
"description": "Branch Metrics Cordova SDK",
44
"main": "src/branch.js",
5-
"version": "2.6.15",
5+
"version": "2.6.16",
66
"homepage": "https://github.com/BranchMetrics/cordova-ionic-phonegap-branch-deep-linking",
77
"repository": {
88
"type": "git",

plugin.template.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ SOFTWARE.
2424
<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
2525
xmlns:android="http://schemas.android.com/apk/res/android"
2626
id="branch-cordova-sdk"
27-
version="2.6.15">
27+
version="2.6.16">
2828

2929
<!-- DO NOT EDIT THIS FILE. MAKE ALL CHANGES TO plugin.template.xml INSTEAD -->
3030

@@ -63,7 +63,7 @@ SOFTWARE.
6363
</config-file>
6464

6565
<source-file src="src/android/io/branch/BranchSDK.java" target-dir="src/io/branch" />
66-
<framework src="build.gradle" custom="true" type="gradleReference" />
66+
<lib-file src="src/android/dependencies/Branch.jar" />
6767
</platform>
6868

6969
<!-- iOS -->

plugin.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ SOFTWARE.
2424
<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
2525
xmlns:android="http://schemas.android.com/apk/res/android"
2626
id="branch-cordova-sdk"
27-
version="2.6.15">
27+
version="2.6.16">
2828

2929
<!-- DO NOT EDIT THIS FILE. MAKE ALL CHANGES TO plugin.template.xml INSTEAD -->
3030

@@ -63,7 +63,7 @@ SOFTWARE.
6363
</config-file>
6464

6565
<source-file src="src/android/io/branch/BranchSDK.java" target-dir="src/io/branch" />
66-
<framework src="build.gradle" custom="true" type="gradleReference" />
66+
<lib-file src="src/android/dependencies/Branch.jar" />
6767
</platform>
6868

6969
<!-- iOS -->

src/ios/Branch.framework/Branch

6.21 MB
Binary file not shown.
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
//
2+
// BNCCallbacks.h
3+
// Branch-TestBed
4+
//
5+
// Created by Ahmed Nawar on 6/18/16.
6+
// Copyright © 2016 Branch Metrics. All rights reserved.
7+
//
8+
9+
#ifndef BNCCallbacks_h
10+
#define BNCCallbacks_h
11+
12+
@class BranchUniversalObject, BranchLinkProperties;
13+
14+
typedef void (^callbackWithParams) (NSDictionary * _Nullable params, NSError * _Nullable error);
15+
typedef void (^callbackWithUrl) (NSString * _Nullable url, NSError * _Nullable error);
16+
typedef void (^callbackWithStatus) (BOOL changed, NSError * _Nullable error);
17+
typedef void (^callbackWithList) (NSArray * _Nullable list, NSError * _Nullable error);
18+
typedef void (^callbackWithUrlAndSpotlightIdentifier) (NSString * _Nullable url, NSString * _Nullable spotlightIdentifier, NSError * _Nullable error);
19+
typedef void (^callbackWithBranchUniversalObject) (BranchUniversalObject * _Nullable universalObject, BranchLinkProperties * _Nullable linkProperties, NSError * _Nullable error);
20+
21+
#endif /* BNCCallbacks_h */
Lines changed: 269 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,269 @@
1+
//
2+
// BNCCommerceEvent.h
3+
// BranchSDK-iOS
4+
//
5+
// Created by Edward Smith on 12/14/16.
6+
// Copyright (c) 2016 Branch Metrics. All rights reserved.
7+
//
8+
9+
10+
@import Foundation;
11+
#import "BNCServerRequest.h"
12+
13+
14+
#pragma mark BNCProductCategory
15+
16+
typedef NSString*const BNCProductCategory;
17+
18+
extern BNCProductCategory BNCProductCategoryAnimalSupplies;
19+
extern BNCProductCategory BNCProductCategoryApparel;
20+
extern BNCProductCategory BNCProductCategoryArtsEntertainment;
21+
extern BNCProductCategory BNCProductCategoryBabyToddler;
22+
extern BNCProductCategory BNCProductCategoryBusinessIndustrial;
23+
extern BNCProductCategory BNCProductCategoryCamerasOptics;
24+
extern BNCProductCategory BNCProductCategoryElectronics;
25+
extern BNCProductCategory BNCProductCategoryFoodBeverageTobacco;
26+
extern BNCProductCategory BNCProductCategoryFurniture;
27+
extern BNCProductCategory BNCProductCategoryHardware;
28+
extern BNCProductCategory BNCProductCategoryHealthBeauty;
29+
extern BNCProductCategory BNCProductCategoryHomeGarden;
30+
extern BNCProductCategory BNCProductCategoryLuggageBags;
31+
extern BNCProductCategory BNCProductCategoryMature;
32+
extern BNCProductCategory BNCProductCategoryMedia;
33+
extern BNCProductCategory BNCProductCategoryOfficeSupplies;
34+
extern BNCProductCategory BNCProductCategoryReligious;
35+
extern BNCProductCategory BNCProductCategorySoftware;
36+
extern BNCProductCategory BNCProductCategorySportingGoods;
37+
extern BNCProductCategory BNCProductCategoryToysGames;
38+
extern BNCProductCategory BNCProductCategoryVehiclesParts;
39+
40+
#pragma mark - BNCCurrency
41+
42+
typedef NSString*const BNCCurrency;
43+
44+
extern BNCCurrency BNCCurrencyAED;
45+
extern BNCCurrency BNCCurrencyAFN;
46+
extern BNCCurrency BNCCurrencyALL;
47+
extern BNCCurrency BNCCurrencyAMD;
48+
extern BNCCurrency BNCCurrencyANG;
49+
extern BNCCurrency BNCCurrencyAOA;
50+
extern BNCCurrency BNCCurrencyARS;
51+
extern BNCCurrency BNCCurrencyAUD;
52+
extern BNCCurrency BNCCurrencyAWG;
53+
extern BNCCurrency BNCCurrencyAZN;
54+
extern BNCCurrency BNCCurrencyBAM;
55+
extern BNCCurrency BNCCurrencyBBD;
56+
57+
extern BNCCurrency BNCCurrencyBDT;
58+
extern BNCCurrency BNCCurrencyBGN;
59+
extern BNCCurrency BNCCurrencyBHD;
60+
extern BNCCurrency BNCCurrencyBIF;
61+
extern BNCCurrency BNCCurrencyBMD;
62+
extern BNCCurrency BNCCurrencyBND;
63+
extern BNCCurrency BNCCurrencyBOB;
64+
extern BNCCurrency BNCCurrencyBOV;
65+
extern BNCCurrency BNCCurrencyBRL;
66+
extern BNCCurrency BNCCurrencyBSD;
67+
extern BNCCurrency BNCCurrencyBTN;
68+
extern BNCCurrency BNCCurrencyBWP;
69+
70+
extern BNCCurrency BNCCurrencyBYN;
71+
extern BNCCurrency BNCCurrencyBYR;
72+
extern BNCCurrency BNCCurrencyBZD;
73+
extern BNCCurrency BNCCurrencyCAD;
74+
extern BNCCurrency BNCCurrencyCDF;
75+
extern BNCCurrency BNCCurrencyCHE;
76+
extern BNCCurrency BNCCurrencyCHF;
77+
extern BNCCurrency BNCCurrencyCHW;
78+
extern BNCCurrency BNCCurrencyCLF;
79+
extern BNCCurrency BNCCurrencyCLP;
80+
extern BNCCurrency BNCCurrencyCNY;
81+
extern BNCCurrency BNCCurrencyCOP;
82+
83+
extern BNCCurrency BNCCurrencyCOU;
84+
extern BNCCurrency BNCCurrencyCRC;
85+
extern BNCCurrency BNCCurrencyCUC;
86+
extern BNCCurrency BNCCurrencyCUP;
87+
extern BNCCurrency BNCCurrencyCVE;
88+
extern BNCCurrency BNCCurrencyCZK;
89+
extern BNCCurrency BNCCurrencyDJF;
90+
extern BNCCurrency BNCCurrencyDKK;
91+
extern BNCCurrency BNCCurrencyDOP;
92+
extern BNCCurrency BNCCurrencyDZD;
93+
extern BNCCurrency BNCCurrencyEGP;
94+
extern BNCCurrency BNCCurrencyERN;
95+
96+
extern BNCCurrency BNCCurrencyETB;
97+
extern BNCCurrency BNCCurrencyEUR;
98+
extern BNCCurrency BNCCurrencyFJD;
99+
extern BNCCurrency BNCCurrencyFKP;
100+
extern BNCCurrency BNCCurrencyGBP;
101+
extern BNCCurrency BNCCurrencyGEL;
102+
extern BNCCurrency BNCCurrencyGHS;
103+
extern BNCCurrency BNCCurrencyGIP;
104+
extern BNCCurrency BNCCurrencyGMD;
105+
extern BNCCurrency BNCCurrencyGNF;
106+
extern BNCCurrency BNCCurrencyGTQ;
107+
extern BNCCurrency BNCCurrencyGYD;
108+
109+
extern BNCCurrency BNCCurrencyHKD;
110+
extern BNCCurrency BNCCurrencyHNL;
111+
extern BNCCurrency BNCCurrencyHRK;
112+
extern BNCCurrency BNCCurrencyHTG;
113+
extern BNCCurrency BNCCurrencyHUF;
114+
extern BNCCurrency BNCCurrencyIDR;
115+
extern BNCCurrency BNCCurrencyILS;
116+
extern BNCCurrency BNCCurrencyINR;
117+
extern BNCCurrency BNCCurrencyIQD;
118+
extern BNCCurrency BNCCurrencyIRR;
119+
extern BNCCurrency BNCCurrencyISK;
120+
extern BNCCurrency BNCCurrencyJMD;
121+
122+
extern BNCCurrency BNCCurrencyJOD;
123+
extern BNCCurrency BNCCurrencyJPY;
124+
extern BNCCurrency BNCCurrencyKES;
125+
extern BNCCurrency BNCCurrencyKGS;
126+
extern BNCCurrency BNCCurrencyKHR;
127+
extern BNCCurrency BNCCurrencyKMF;
128+
extern BNCCurrency BNCCurrencyKPW;
129+
extern BNCCurrency BNCCurrencyKRW;
130+
extern BNCCurrency BNCCurrencyKWD;
131+
extern BNCCurrency BNCCurrencyKYD;
132+
extern BNCCurrency BNCCurrencyKZT;
133+
extern BNCCurrency BNCCurrencyLAK;
134+
135+
extern BNCCurrency BNCCurrencyLBP;
136+
extern BNCCurrency BNCCurrencyLKR;
137+
extern BNCCurrency BNCCurrencyLRD;
138+
extern BNCCurrency BNCCurrencyLSL;
139+
extern BNCCurrency BNCCurrencyLYD;
140+
extern BNCCurrency BNCCurrencyMAD;
141+
extern BNCCurrency BNCCurrencyMDL;
142+
extern BNCCurrency BNCCurrencyMGA;
143+
extern BNCCurrency BNCCurrencyMKD;
144+
extern BNCCurrency BNCCurrencyMMK;
145+
extern BNCCurrency BNCCurrencyMNT;
146+
extern BNCCurrency BNCCurrencyMOP;
147+
148+
extern BNCCurrency BNCCurrencyMRO;
149+
extern BNCCurrency BNCCurrencyMUR;
150+
extern BNCCurrency BNCCurrencyMVR;
151+
extern BNCCurrency BNCCurrencyMWK;
152+
extern BNCCurrency BNCCurrencyMXN;
153+
extern BNCCurrency BNCCurrencyMXV;
154+
extern BNCCurrency BNCCurrencyMYR;
155+
extern BNCCurrency BNCCurrencyMZN;
156+
extern BNCCurrency BNCCurrencyNAD;
157+
extern BNCCurrency BNCCurrencyNGN;
158+
extern BNCCurrency BNCCurrencyNIO;
159+
extern BNCCurrency BNCCurrencyNOK;
160+
161+
extern BNCCurrency BNCCurrencyNPR;
162+
extern BNCCurrency BNCCurrencyNZD;
163+
extern BNCCurrency BNCCurrencyOMR;
164+
extern BNCCurrency BNCCurrencyPAB;
165+
extern BNCCurrency BNCCurrencyPEN;
166+
extern BNCCurrency BNCCurrencyPGK;
167+
extern BNCCurrency BNCCurrencyPHP;
168+
extern BNCCurrency BNCCurrencyPKR;
169+
extern BNCCurrency BNCCurrencyPLN;
170+
extern BNCCurrency BNCCurrencyPYG;
171+
extern BNCCurrency BNCCurrencyQAR;
172+
extern BNCCurrency BNCCurrencyRON;
173+
174+
extern BNCCurrency BNCCurrencyRSD;
175+
extern BNCCurrency BNCCurrencyRUB;
176+
extern BNCCurrency BNCCurrencyRWF;
177+
extern BNCCurrency BNCCurrencySAR;
178+
extern BNCCurrency BNCCurrencySBD;
179+
extern BNCCurrency BNCCurrencySCR;
180+
extern BNCCurrency BNCCurrencySDG;
181+
extern BNCCurrency BNCCurrencySEK;
182+
extern BNCCurrency BNCCurrencySGD;
183+
extern BNCCurrency BNCCurrencySHP;
184+
extern BNCCurrency BNCCurrencySLL;
185+
extern BNCCurrency BNCCurrencySOS;
186+
187+
extern BNCCurrency BNCCurrencySRD;
188+
extern BNCCurrency BNCCurrencySSP;
189+
extern BNCCurrency BNCCurrencySTD;
190+
extern BNCCurrency BNCCurrencySYP;
191+
extern BNCCurrency BNCCurrencySZL;
192+
extern BNCCurrency BNCCurrencyTHB;
193+
extern BNCCurrency BNCCurrencyTJS;
194+
extern BNCCurrency BNCCurrencyTMT;
195+
extern BNCCurrency BNCCurrencyTND;
196+
extern BNCCurrency BNCCurrencyTOP;
197+
extern BNCCurrency BNCCurrencyTRY;
198+
extern BNCCurrency BNCCurrencyTTD;
199+
200+
extern BNCCurrency BNCCurrencyTWD;
201+
extern BNCCurrency BNCCurrencyTZS;
202+
extern BNCCurrency BNCCurrencyUAH;
203+
extern BNCCurrency BNCCurrencyUGX;
204+
extern BNCCurrency BNCCurrencyUSD;
205+
extern BNCCurrency BNCCurrencyUSN;
206+
extern BNCCurrency BNCCurrencyUYI;
207+
extern BNCCurrency BNCCurrencyUYU;
208+
extern BNCCurrency BNCCurrencyUZS;
209+
extern BNCCurrency BNCCurrencyVEF;
210+
extern BNCCurrency BNCCurrencyVND;
211+
extern BNCCurrency BNCCurrencyVUV;
212+
213+
extern BNCCurrency BNCCurrencyWST;
214+
extern BNCCurrency BNCCurrencyXAF;
215+
extern BNCCurrency BNCCurrencyXAG;
216+
extern BNCCurrency BNCCurrencyXAU;
217+
extern BNCCurrency BNCCurrencyXBA;
218+
extern BNCCurrency BNCCurrencyXBB;
219+
extern BNCCurrency BNCCurrencyXBC;
220+
extern BNCCurrency BNCCurrencyXBD;
221+
extern BNCCurrency BNCCurrencyXCD;
222+
extern BNCCurrency BNCCurrencyXDR;
223+
extern BNCCurrency BNCCurrencyXFU;
224+
extern BNCCurrency BNCCurrencyXOF;
225+
226+
extern BNCCurrency BNCCurrencyXPD;
227+
extern BNCCurrency BNCCurrencyXPF;
228+
extern BNCCurrency BNCCurrencyXPT;
229+
extern BNCCurrency BNCCurrencyXSU;
230+
extern BNCCurrency BNCCurrencyXTS;
231+
extern BNCCurrency BNCCurrencyXUA;
232+
extern BNCCurrency BNCCurrencyXXX;
233+
extern BNCCurrency BNCCurrencyYER;
234+
extern BNCCurrency BNCCurrencyZAR;
235+
extern BNCCurrency BNCCurrencyZMW;
236+
237+
#pragma mark - BNCProduct
238+
239+
@interface BNCProduct : NSObject
240+
@property (nonatomic, strong) NSString *sku;
241+
@property (nonatomic, strong) NSString *name;
242+
@property (nonatomic, strong) NSDecimalNumber *price;
243+
@property (nonatomic, strong) NSNumber *quantity;
244+
@property (nonatomic, strong) NSString *brand;
245+
@property (nonatomic, strong) BNCProductCategory category;
246+
@property (nonatomic, strong) NSString *variant;
247+
@end
248+
249+
#pragma mark - BNCCommerceEvent
250+
251+
@interface BNCCommerceEvent : NSObject
252+
@property (nonatomic, strong) NSDecimalNumber *revenue;
253+
@property (nonatomic, strong) BNCCurrency currency;
254+
@property (nonatomic, strong) NSString *transactionID;
255+
@property (nonatomic, strong) NSDecimalNumber *shipping;
256+
@property (nonatomic, strong) NSDecimalNumber *tax;
257+
@property (nonatomic, strong) NSString *coupon;
258+
@property (nonatomic, strong) NSString *affiliation;
259+
@property (nonatomic, strong) NSArray<BNCProduct*> *products;
260+
@end
261+
262+
263+
@interface BranchCommerceEventRequest : BNCServerRequest <NSCoding>
264+
265+
- (instancetype) initWithCommerceEvent:(BNCCommerceEvent*)commerceEvent
266+
metadata:(NSDictionary*)dictionary
267+
completion:(void (^)(NSDictionary* response, NSError* error))callBack;
268+
269+
@end
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
//
2+
// BNCConfig.h
3+
// Branch-SDK
4+
//
5+
// Created by Qinwei Gong on 10/6/14.
6+
// Copyright (c) 2014 Branch Metrics. All rights reserved.
7+
//
8+
9+
@import Foundation;
10+
11+
extern NSString * const BNC_SDK_VERSION;
12+
extern NSString * const BNC_API_VERSION;
13+
extern BOOL const BNC_API_PINNED;
14+
extern NSString * const BNC_API_BASE_URL;
15+
extern NSString * const BNC_LINK_URL;

0 commit comments

Comments
 (0)