Allow UIBarButtonItem or UIView as share presentation anchor AIS-360 AIS-376

Author: E-B-Smith

Branch-SDK/Branch-SDK/BranchShareLink.h

@@ -75,11 +75,11 @@ Creates a BranchShareLink object.
 /**
 Presents a UIActivityViewController that shares the Branch link.
 
-@param viewController   The parent view controller from which to present the the activity sheet.
-@param anchor           The anchor point for the activity sheet. Used for iPad form factors.
+@param viewController           The parent view controller from which to present the the activity sheet.
+@param anchorViewOrButtonItem   The anchor point for the activity sheet. Used for iPad form factors.
 */
 - (void) presentActivityViewControllerFromViewController:(UIViewController*_Nullable)viewController
-                                                  anchor:(UIBarButtonItem*_Nullable)anchor;
+                                                  anchor:(id _Nullable)anchorViewOrButtonItem;
 
 ///The title for the share sheet.
 @property (nonatomic, strong) NSString*_Nullable title;

Branch-SDK/Branch-SDK/BranchShareLink.m

@@ -153,7 +153,7 @@ - (void) shareDidComplete:(BOOL)completed activityError:(NSError*)error {
 }
 
 - (void) presentActivityViewControllerFromViewController:(UIViewController*_Nullable)viewController
-                                                  anchor:(UIBarButtonItem*_Nullable)anchor {
+                                                  anchor:(id _Nullable)anchorViewOrButtonItem {
 
     UIActivityViewController *shareViewController =
         [[UIActivityViewController alloc]
@@ -209,9 +209,17 @@ - (void) presentActivityViewControllerFromViewController:(UIViewController*_Null
 
     // Required for iPad/Universal apps on iOS 8+
     if ([presentingViewController respondsToSelector:@selector(popoverPresentationController)]) {
-        shareViewController.popoverPresentationController.sourceView = presentingViewController.view;
-        if (anchor) {
+        if ([anchorViewOrButtonItem isKindOfClass:UIBarButtonItem.class]) {
+            UIBarButtonItem *anchor = (UIBarButtonItem*) anchorViewOrButtonItem;
             shareViewController.popoverPresentationController.barButtonItem = anchor;
+        } else
+        if ([anchorViewOrButtonItem isKindOfClass:UIView.class]) {
+            UIView *anchor = (UIView*) anchorViewOrButtonItem;
+            shareViewController.popoverPresentationController.sourceView = anchor;
+            shareViewController.popoverPresentationController.sourceRect = anchor.bounds;
+        } else {
+            shareViewController.popoverPresentationController.sourceView = presentingViewController.view;
+            shareViewController.popoverPresentationController.sourceRect = CGRectMake(0.0, 0.0, 40.0, 40.0);
         }
     }
     [presentingViewController presentViewController:shareViewController animated:YES completion:nil];

Branch-SDK/Branch-SDK/BranchUniversalObject.h

@@ -63,10 +63,10 @@ typedef NS_ENUM(NSInteger, ContentIndexMode) {
 - (void)showShareSheetWithLinkProperties:(nullable BranchLinkProperties *)linkProperties andShareText:(nullable NSString *)shareText fromViewController:(nullable UIViewController *)viewController completionWithError:(nullable shareCompletionWithError)completion;
 
 //iPad
-- (void)showShareSheetWithLinkProperties:(nullable BranchLinkProperties *)linkProperties andShareText:(nullable NSString *)shareText fromViewController:(nullable UIViewController *)viewController anchor:(nullable UIBarButtonItem *)anchor completion:(nullable shareCompletion)completion;
+- (void)showShareSheetWithLinkProperties:(nullable BranchLinkProperties *)linkProperties andShareText:(nullable NSString *)shareText fromViewController:(nullable UIViewController *)viewController anchor:(nullable id)anchorViewOrBarbutton completion:(nullable shareCompletion)completion;
 
 // Returns with activityError as well
-- (void)showShareSheetWithLinkProperties:(nullable BranchLinkProperties *)linkProperties andShareText:(nullable NSString *)shareText fromViewController:(nullable UIViewController *)viewController anchor:(nullable UIBarButtonItem *)anchor completionWithError:(nullable shareCompletionWithError)completion;
+- (void)showShareSheetWithLinkProperties:(nullable BranchLinkProperties *)linkProperties andShareText:(nullable NSString *)shareText fromViewController:(nullable UIViewController *)viewController anchor:(nullable id)anchorViewOrBarButton completionWithError:(nullable shareCompletionWithError)completion;
 
 - (void)listOnSpotlight;
 - (void)listOnSpotlightWithCallback:(nullable callbackWithUrl)callback;

Branch-SDK/Branch-SDK/BranchUniversalObject.m

@@ -231,15 +231,20 @@ - (void)showShareSheetWithLinkProperties:(BranchLinkProperties *)linkProperties
 - (void)showShareSheetWithLinkProperties:(BranchLinkProperties *)linkProperties andShareText:(NSString *)shareText fromViewController:(UIViewController *)viewController completionWithError:(shareCompletionWithError)completion {
     [self showShareSheetWithLinkProperties:linkProperties andShareText:shareText fromViewController:viewController anchor:nil completion:nil orCompletionWithError:completion];
 }
-- (void)showShareSheetWithLinkProperties:(nullable BranchLinkProperties *)linkProperties andShareText:(nullable NSString *)shareText fromViewController:(nullable UIViewController *)viewController anchor:(nullable UIBarButtonItem *)anchor completion:(nullable shareCompletion)completion {
+- (void)showShareSheetWithLinkProperties:(nullable BranchLinkProperties *)linkProperties andShareText:(nullable NSString *)shareText fromViewController:(nullable UIViewController *)viewController anchor:(nullable id)anchor completion:(nullable shareCompletion)completion {
     [self showShareSheetWithLinkProperties:linkProperties andShareText:shareText fromViewController:viewController anchor:anchor completion:completion orCompletionWithError:nil];
 }
 
-- (void)showShareSheetWithLinkProperties:(nullable BranchLinkProperties *)linkProperties andShareText:(nullable NSString *)shareText fromViewController:(nullable UIViewController *)viewController anchor:(nullable UIBarButtonItem *)anchor completionWithError:(nullable shareCompletionWithError)completion {
+- (void)showShareSheetWithLinkProperties:(nullable BranchLinkProperties *)linkProperties andShareText:(nullable NSString *)shareText fromViewController:(nullable UIViewController *)viewController anchor:(nullable id)anchor completionWithError:(nullable shareCompletionWithError)completion {
     [self showShareSheetWithLinkProperties:linkProperties andShareText:shareText fromViewController:viewController anchor:anchor completion:nil orCompletionWithError:completion];
 }
 
-- (void)showShareSheetWithLinkProperties:(BranchLinkProperties *)linkProperties andShareText:(NSString *)shareText fromViewController:(UIViewController *)viewController anchor:(UIBarButtonItem *)anchor completion:(shareCompletion)completion orCompletionWithError:(shareCompletionWithError)completionError {
+- (void)showShareSheetWithLinkProperties:(BranchLinkProperties *)linkProperties
+                            andShareText:(NSString *)shareText
+                      fromViewController:(UIViewController *)viewController
+                                  anchor:(id)anchorViewOrButtonItem
+                              completion:(shareCompletion)completion
+                   orCompletionWithError:(shareCompletionWithError)completionError {
     // Log share initiated event
     [self userCompletedAction:BNCShareInitiatedEvent];
     UIActivityItemProvider *itemProvider = [self getBranchActivityItemWithLinkProperties:linkProperties];
@@ -290,9 +295,17 @@ - (void)showShareSheetWithLinkProperties:(BranchLinkProperties *)linkProperties
     if (presentingViewController) {
         // Required for iPad/Universal apps on iOS 8+
         if ([presentingViewController respondsToSelector:@selector(popoverPresentationController)]) {
-            shareViewController.popoverPresentationController.sourceView = presentingViewController.view;
-            if (anchor) {
+            if ([anchorViewOrButtonItem isKindOfClass:UIBarButtonItem.class]) {
+                UIBarButtonItem *anchor = (UIBarButtonItem*) anchorViewOrButtonItem;
                 shareViewController.popoverPresentationController.barButtonItem = anchor;
+            } else
+            if ([anchorViewOrButtonItem isKindOfClass:UIView.class]) {
+                UIView *anchor = (UIView*) anchorViewOrButtonItem;
+                shareViewController.popoverPresentationController.sourceView = anchor;
+                shareViewController.popoverPresentationController.sourceRect = anchor.bounds;
+            } else {
+                shareViewController.popoverPresentationController.sourceView = presentingViewController.view;
+                shareViewController.popoverPresentationController.sourceRect = CGRectMake(0.0, 0.0, 40.0, 40.0);
             }
         }
         [presentingViewController presentViewController:shareViewController animated:YES completion:nil];

Branch-TestBed/Branch-TestBed-UITests/UITestBed/TBBranchViewController.m

@@ -28,7 +28,8 @@
 
 @interface TBBranchViewController () <UITableViewDelegate, UITableViewDataSource>
 @property (nonatomic, strong)   TBTableData *tableData;
-@property (nonatomic, strong)   BranchUniversalObject *branchUniversalObject;
+@property (nonatomic, strong)   BranchUniversalObject *universalObject;
+@property (nonatomic, strong)   BranchLinkProperties  *linkProperties;
 @property (nonatomic, weak)     IBOutlet UITableView *tableView;
 @property (nonatomic, strong)   IBOutlet UINavigationItem *navigationItem;
 @end
@@ -58,6 +59,11 @@ - (void)initializeTableData {
     section(@"Events");
     row(@"Send Commerce Event", sendCommerceEvent:);
 
+    section(@"Sharing");
+    row(@"ShareLink from table row", sharelinkTableRow:);
+    row(@"ShareLink no anchor", sharelinkTableRowNilAnchor:);
+    row(@"BUO Share from table row", buoShareTableRow:);
+
     section(@"Miscellaneous");
     row(@"Show Local IP Addess", showLocalIPAddress:);
 
@@ -69,16 +75,16 @@ - (void)viewDidLoad {
     [super viewDidLoad];
     [self initializeTableData];
 
-    _branchUniversalObject =
+    _universalObject =
         [[BranchUniversalObject alloc] initWithCanonicalIdentifier: cononicalIdentifier];
-    _branchUniversalObject.canonicalUrl = canonicalUrl;
-    _branchUniversalObject.title = contentTitle;
-    _branchUniversalObject.contentDescription = contentDescription;
-    _branchUniversalObject.imageUrl = imageUrl;
-    _branchUniversalObject.price = 1000;
-    _branchUniversalObject.currency = @"$";
-    _branchUniversalObject.type = type;
-    [_branchUniversalObject
+    _universalObject.canonicalUrl = canonicalUrl;
+    _universalObject.title = contentTitle;
+    _universalObject.contentDescription = contentDescription;
+    _universalObject.imageUrl = imageUrl;
+    _universalObject.price = 1000;
+    _universalObject.currency = @"$";
+    _universalObject.type = type;
+    [_universalObject
         addMetadataKey:@"deeplink_text"
         value:[NSString stringWithFormat:
             @"This text was embedded as data in a Branch link with the following characteristics:\n\n"
@@ -101,6 +107,14 @@ - (void)viewDidLoad {
     r.size.height *= 1.75f;
     versionLabel.frame = r;
     self.tableView.tableHeaderView = versionLabel;
+
+    // Add a share button item:
+    UIBarButtonItem *barButtonItem =
+        [[UIBarButtonItem alloc]
+           initWithBarButtonSystemItem:UIBarButtonSystemItemAction
+           target:self
+           action:@selector(buoShareBarButton:)];
+   self.navigationItem.rightBarButtonItem = barButtonItem;
 }
 
 #pragma mark - Table View Delegate & Data Source
@@ -178,7 +192,7 @@ - (IBAction)createBranchLink:(TBTableRow*)sender {
     [linkProperties addControlParam:@"$desktop_url" withValue: desktop_url];
     [linkProperties addControlParam:@"$ios_url" withValue: ios_url];
 
-    [self.branchUniversalObject
+    [self.universalObject
         getShortUrlWithLinkProperties:linkProperties
         andCallback:^(NSString *url, NSError *error) {
             sender.value = url;
@@ -286,4 +300,46 @@ - (IBAction)showLocalIPAddress:(id)sender {
     ];
 }
 
+#pragma mark - Sharing
+
+- (IBAction) sharelinkTableRow:(id)sender {
+    NSIndexPath *indexPath = [self.tableData indexPathForRow:sender];
+    UITableViewCell *cell = [self.tableView cellForRowAtIndexPath:indexPath];
+    BranchShareLink *shareLink =
+        [[BranchShareLink alloc]
+            initWithUniversalObject:self.universalObject
+            linkProperties:self.linkProperties];
+    [shareLink presentActivityViewControllerFromViewController:self anchor:cell];
+}
+
+- (IBAction) sharelinkTableRowNilAnchor:(id)sender {
+    BranchShareLink *shareLink =
+        [[BranchShareLink alloc]
+            initWithUniversalObject:self.universalObject
+            linkProperties:self.linkProperties];
+    [shareLink presentActivityViewControllerFromViewController:self anchor:nil];
+}
+
+- (IBAction) buoShareTableRow:(id)sender {
+    NSIndexPath *indexPath = [self.tableData indexPathForRow:sender];
+    UITableViewCell *cell = [self.tableView cellForRowAtIndexPath:indexPath];
+    [self.universalObject showShareSheetWithLinkProperties:self.linkProperties
+        andShareText:@"Ha ha"
+        fromViewController:self
+        anchor:cell
+        completionWithError: ^ (NSString * _Nullable activityType, BOOL completed, NSError * _Nullable activityError) {
+            BNCLogDebug(@"Done.");
+    }];
+}
+
+- (IBAction) buoShareBarButton:(id)sender {
+    [self.universalObject showShareSheetWithLinkProperties:self.linkProperties
+        andShareText:@"Ha ha"
+        fromViewController:self
+        anchor:sender
+        completionWithError: ^ (NSString * _Nullable activityType, BOOL completed, NSError * _Nullable activityError) {
+            BNCLogDebug(@"Done.");
+    }];
+}
+
 @end

Branch-TestBed/Branch-TestBed-UITests/UITestBed/TBTableData.h

@@ -31,6 +31,8 @@
 
 - (TBTableSection*) addSectionWithTitle:(NSString*)title;
 - (TBTableRow*) addRowWithTitle:(NSString*)title selector:(SEL)selector;
+
+- (NSIndexPath*) indexPathForRow:(TBTableRow*)row;
 @end
 
 

Branch-TestBed/Branch-TestBed-UITests/UITestBed/TBTableData.m

@@ -77,4 +77,20 @@ - (TBTableRow*) addRowWithTitle:(NSString*)title selector:(SEL)selector {
     return r;
 }
 
+- (NSIndexPath*) indexPathForRow:(TBTableRow*)rowToFind {
+    NSInteger rowIndex = 0;
+    NSInteger sectionIndex = 0;
+    for (NSArray *sections in self.rows) {
+        for (TBTableRow *row in sections) {
+            if (row == rowToFind) {
+                return [NSIndexPath indexPathForRow:rowIndex inSection:sectionIndex];
+            }
+            rowIndex++;
+        }
+        rowIndex = 0;
+        sectionIndex++;
+    }
+    return nil;
+}
+
 @end

Branch-TestBed/Branch-TestBed/ViewController.m

@@ -264,7 +264,7 @@ - (IBAction)shareLinkButtonTouchUpInside:(id)sender {
         @"Shared from Branch's Branch-TestBed at %@.",
         [self.dateFormatter stringFromDate:[NSDate date]]];
 
-    [shareLink presentActivityViewControllerFromViewController:self anchor:nil];
+    [shareLink presentActivityViewControllerFromViewController:self anchor:sender];
 }
 
 - (IBAction)shareLinkAsActivityItem:(id)sender {