From c4a298addd00e575183a618a77baddad6bdb8a7b Mon Sep 17 00:00:00 2001 From: Ilya Grechuhin Date: Mon, 19 Feb 2018 17:07:27 +0300 Subject: [PATCH] [MAPSME-6511] [ios] Updated bookmarks sharing interface. --- .../Maps/Classes/Share/MWMActivityViewController.h | 7 ++++++- .../Classes/Share/MWMActivityViewController.mm | 14 ++++++++++++-- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/iphone/Maps/Classes/Share/MWMActivityViewController.h b/iphone/Maps/Classes/Share/MWMActivityViewController.h index 46e6741fbe..72d31bf979 100644 --- a/iphone/Maps/Classes/Share/MWMActivityViewController.h +++ b/iphone/Maps/Classes/Share/MWMActivityViewController.h @@ -4,10 +4,15 @@ + (instancetype)shareControllerForEditorViral; -+ (instancetype)shareControllerForMyPosition:(CLLocationCoordinate2D const &)location; ++ (instancetype)shareControllerForMyPosition:(CLLocationCoordinate2D)location; + (instancetype)shareControllerForPlacePageObject:(id)object; ++ (instancetype)shareControllerForURL:(NSURL *)url + message:(NSString *)message + completionHandler: + (UIActivityViewControllerCompletionWithItemsHandler)completionHandler; + - (void)presentInParentViewController:(UIViewController *)parentVC anchorView:(UIView *)anchorView; @end diff --git a/iphone/Maps/Classes/Share/MWMActivityViewController.mm b/iphone/Maps/Classes/Share/MWMActivityViewController.mm index 740d5a13a2..12c77a6707 100644 --- a/iphone/Maps/Classes/Share/MWMActivityViewController.mm +++ b/iphone/Maps/Classes/Share/MWMActivityViewController.mm @@ -26,18 +26,28 @@ return self; } -+ (instancetype)shareControllerForMyPosition:(CLLocationCoordinate2D const &)location ++ (instancetype)shareControllerForMyPosition:(CLLocationCoordinate2D)location { MWMShareActivityItem * item = [[MWMShareActivityItem alloc] initForMyPositionAtLocation:location]; return [[self alloc] initWithActivityItem:item]; } -+ (instancetype)shareControllerForPlacePageObject:(id)object; ++ (instancetype)shareControllerForPlacePageObject:(id)object { MWMShareActivityItem * item = [[MWMShareActivityItem alloc] initForPlacePageObject:object]; return [[self alloc] initWithActivityItem:item]; } ++ (instancetype)shareControllerForURL:(NSURL *)url + message:(NSString *)message + completionHandler: + (UIActivityViewControllerCompletionWithItemsHandler)completionHandler +{ + MWMActivityViewController * shareVC = [[self alloc] initWithActivityItems:@[message, url]]; + shareVC.completionWithItemsHandler = completionHandler; + return shareVC; +} + + (instancetype)shareControllerForEditorViral { MWMEditorViralActivityItem * item = [[MWMEditorViralActivityItem alloc] init];