Skip to content

Commit 359b334

Browse files
author
Edward Smith
committed
Merge QA.
2 parents e7b67f0 + a3a9efd commit 359b334

File tree

12 files changed

+127
-11
lines changed

12 files changed

+127
-11
lines changed

Branch-SDK/Branch-SDK/BNCConfig.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@
1616

1717
NSString * const BNC_API_VERSION = @"v1";
1818
NSString * const BNC_LINK_URL = @"https://bnc.lt";
19-
NSString * const BNC_SDK_VERSION = @"0.14.10";
19+
NSString * const BNC_SDK_VERSION = @"0.14.11";

Branch-TestBed/Branch-TestBed.xcodeproj/project.pbxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@
104104
4DA577221E67B28700A43BDD /* NSString+Branch.m in Sources */ = {isa = PBXBuildFile; fileRef = 4DA577211E67B28700A43BDD /* NSString+Branch.m */; };
105105
4DA577241E67B2A000A43BDD /* NSString+Branch.Test.m in Sources */ = {isa = PBXBuildFile; fileRef = 4DA577231E67B2A000A43BDD /* NSString+Branch.Test.m */; };
106106
4DA577261E688C6000A43BDD /* Branch-SDK-Tests.strings in Resources */ = {isa = PBXBuildFile; fileRef = 4DA577251E688C6000A43BDD /* Branch-SDK-Tests.strings */; };
107-
4DB567331E79F46000A8A324 /* BranchShareLink.h in Headers */ = {isa = PBXBuildFile; fileRef = 4DB567311E79F46000A8A324 /* BranchShareLink.h */; };
107+
4DB567331E79F46000A8A324 /* BranchShareLink.h in Headers */ = {isa = PBXBuildFile; fileRef = 4DB567311E79F46000A8A324 /* BranchShareLink.h */; settings = {ATTRIBUTES = (Public, ); }; };
108108
4DB567341E79F46000A8A324 /* BranchShareLink.m in Sources */ = {isa = PBXBuildFile; fileRef = 4DB567321E79F46000A8A324 /* BranchShareLink.m */; };
109109
4DDC52621DCC08E700CFB737 /* iAd.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4DDC52611DCC08E700CFB737 /* iAd.framework */; };
110110
54391A151BA249FA0061CB0F /* BranchCSSearchableItemAttributeSet.h in Headers */ = {isa = PBXBuildFile; fileRef = 54391A131BA249FA0061CB0F /* BranchCSSearchableItemAttributeSet.h */; };
@@ -650,12 +650,12 @@
650650
46946B871B26898E00627BCC /* BranchLogoutRequest.h in Headers */,
651651
46946B991B2689A100627BCC /* BranchRedeemRewardsRequest.h in Headers */,
652652
466B587D1B17780A00A69EDE /* BNCLinkCache.h in Headers */,
653-
4DB567331E79F46000A8A324 /* BranchShareLink.h in Headers */,
654653
466B587C1B17780A00A69EDE /* BNCLinkData.h in Headers */,
655654
462B50461B449DF000967B81 /* BranchDeepLinkingController.h in Headers */,
656655
E2B9474A1D15D75000F2270D /* BNCCallbacks.h in Headers */,
657656
54FF1F951BD20EB50004CE2E /* BranchRegisterViewRequest.h in Headers */,
658657
46946B851B26898800627BCC /* BNCServerRequest.h in Headers */,
658+
4DB567331E79F46000A8A324 /* BranchShareLink.h in Headers */,
659659
4DA577171E67B1D600A43BDD /* BNCLog.h in Headers */,
660660
466B58741B17780A00A69EDE /* BNCPreferenceHelper.h in Headers */,
661661
4D8EE7A51E1F0A5D00B1F450 /* BNCCommerceEvent.h in Headers */,

Branch.framework.zip

1.72 KB
Binary file not shown.

Branch.framework/Versions/A/Branch

0 Bytes
Binary file not shown.
Lines changed: 112 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,112 @@
1+
//
2+
// BranchShareLink.h
3+
// Branch-SDK
4+
//
5+
// Created by Edward Smith on 3/13/17.
6+
// Copyright © 2017 Branch Metrics. All rights reserved.
7+
//
8+
9+
#import <Foundation/Foundation.h>
10+
#import "BranchUniversalObject.h"
11+
@class BranchShareLink;
12+
13+
@protocol BranchShareLinkDelegate <NSObject>
14+
@optional
15+
16+
/**
17+
This delegate method is called during the course of user interaction while sharing a
18+
Branch link. The linkProperties, such as channel, or the share text parameters can be
19+
altered as appropriate for the particular user-chosen activityType.
20+
21+
This delegate method will be called multiple times during a share interaction and might be
22+
called on a background thread.
23+
24+
@param shareLink The calling BranchShareLink that is currently sharing.
25+
*/
26+
- (void) branchShareLinkWillShare:(BranchShareLink*_Nonnull)shareLink;
27+
28+
/**
29+
This delegate method is called when sharing has completed.
30+
31+
@param shareLink The Branch share action sheet that has just completed.
32+
@param completed This parameter is YES if sharing completed successfully and the user did not cancel.
33+
@param error This parameter contains any errors that occurred will attempting to share.
34+
*/
35+
- (void) branchShareLink:(BranchShareLink*_Nonnull)shareLink
36+
didComplete:(BOOL)completed
37+
withError:(NSError*_Nullable)error;
38+
@end
39+
40+
#pragma mark - BranchShareLink
41+
42+
/**
43+
The `BranchShareLink` class facilitates sharing Branch links using a `UIActivityViewController`
44+
user experience.
45+
46+
The `BranchShareLink` is a new class that is similar to but has more functionality than the old
47+
`[BranchUniversalObject showShareSheetWithLinkProperties:...]` methods.
48+
49+
The `BranchShareLink` is initialized with the `BranchUniversalObject` and `BranchLinkProperties`
50+
objects that will be used to generate the Branch link.
51+
52+
After the `BranchShareLink` object is created, set any configuration properties on the activity
53+
sheet object, and then call `showFromViewController:anchor:` to show the activity sheet.
54+
55+
A delegate on the BranchShareLink can further configure the share experience. For instance the link
56+
parameters can be changed depending on the activity that the user selects.
57+
*/
58+
59+
@interface BranchShareLink : NSObject
60+
61+
/**
62+
Creates a BranchShareLink object.
63+
64+
@oaram universalObject The Branch Universal Object the will be shared.
65+
@param linkProperties The link properties that the link will have.
66+
*/
67+
- (instancetype _Nullable) initWithUniversalObject:(BranchUniversalObject*_Nonnull)universalObject
68+
linkProperties:(BranchLinkProperties*_Nonnull)linkProperties;
69+
70+
71+
///Returns an array of activity item providers, one for the Branch Universal Object,
72+
///one for the share text (if provided), and one for the shareObject (if provided).
73+
- (NSArray<UIActivityItemProvider*>*_Nonnull) activityItems;
74+
75+
/**
76+
Presents a UIActivityViewController that shares the Branch link.
77+
78+
@oaram viewController The parent view controller from which to present the the activity sheet.
79+
@param anchor The anchor point for the activity sheet. Used for iPad form factors.
80+
*/
81+
- (void) presentActivityViewControllerFromViewController:(UIViewController*_Nullable)viewController
82+
anchor:(UIBarButtonItem*_Nullable)anchor;
83+
84+
///The title for the share sheet.
85+
@property (nonatomic, strong) NSString*_Nullable title;
86+
87+
///Share text for the item.
88+
///This text can be changed later when the `branchShareSheetWillShare:` delegate method is called.
89+
@property (nonatomic, strong) NSString*_Nullable shareText;
90+
91+
///An additional, user defined, non-typed, object to be shared.
92+
///This object can be changed later when the `branchShareSheetWillShare:` delegate method is called.
93+
@property (nonatomic, strong) id _Nullable shareObject;
94+
95+
///The resulting Branch URL that was shared.
96+
@property (nonatomic, strong, readonly) NSURL*_Nullable shareURL;
97+
98+
///The activity type that the user chose.
99+
@property (nonatomic, strong, readonly) NSString*_Nullable activityType;
100+
101+
///Extra server parameters that should be included with the link data.
102+
@property (nonatomic, strong) NSMutableDictionary*_Nullable serverParameters;
103+
104+
///The Branch Universal Object that will be shared.
105+
@property (nonatomic, strong, readonly) BranchUniversalObject*_Nonnull universalObject;
106+
107+
///The link properties for the created URL.
108+
@property (nonatomic, strong, readonly) BranchLinkProperties*_Nonnull linkProperties;
109+
110+
///The delegate. See 'BranchShareLinkDelegate' above for a description.
111+
@property (nonatomic, weak) id<BranchShareLinkDelegate>_Nullable delegate;
112+
@end

Branch.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = "Branch"
3-
s.version = "0.14.10"
3+
s.version = "0.14.11"
44
s.summary = "Create an HTTP URL for any piece of content in your app"
55
s.description = <<-DESC
66
- Want the highest possible conversions on your sharing feature?

ChangeLog.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
Branch iOS SDK Change Log
22

3+
- v0.14.11
4+
* *Master Release*
5+
* Added `BranchShareLink.h` to public headers.
6+
37
- v0.14.10
48
* *Master Release*
59
* Fixed a crash bug in `[BNCSystemObserver appBuildDate]`.

carthage-files/BranchSDK.xcodeproj/project.pbxproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -433,7 +433,7 @@
433433
E298D0491C73D1B800589D22 /* Project object */ = {
434434
isa = PBXProject;
435435
attributes = {
436-
LastUpgradeCheck = 0820;
436+
LastUpgradeCheck = 0830;
437437
ORGANIZATIONNAME = "Ahmed Nawar";
438438
TargetAttributes = {
439439
E298D0511C73D1B800589D22 = {

carthage-files/BranchSDK.xcodeproj/xcshareddata/xcschemes/Branch iOS SDK Carthage.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0820"
3+
LastUpgradeVersion = "0830"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

carthage-files/Info.plist

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515
<key>CFBundlePackageType</key>
1616
<string>FMWK</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>0.14.10</string>
18+
<string>0.14.11</string>
1919
<key>CFBundleSignature</key>
2020
<string>????</string>
2121
<key>CFBundleVersion</key>
22-
<string>0.14.10</string>
22+
<string>0.14.11</string>
2323
<key>NSPrincipalClass</key>
2424
<string></string>
2525
</dict>

0 commit comments

Comments
 (0)