pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[ios] refactor the ActivityViewController: set creational methods to nonnull

Browse source 
Signed-off-by: Kiryl Kaveryn <kirylkaveryn@gmail.com>
This commit is contained in:
Kiryl Kaveryn 2024-07-06 16:09:27 +04:00 • committed by Roman Tsisyk
parent 43c46beb0f
commit 6879db4472
6 changed files with 8 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
iphone/Maps/Bookmarks/BookmarksList/BookmarksListViewController.swift
View file

@ -246,7 +246,7 @@ extension BookmarksListViewController: IBookmarksListView {
message: L("share_bookmarks_email_body")) { (_, _, _, _) in
completion()
}
shareController?.present(inParentViewController: self, anchorView: self.toolBar)
shareController.present(inParentViewController: self, anchorView: self.toolBar)
}
func showError(title: String, message: String) {

2
iphone/Maps/Bookmarks/Categories/BMCView/BMCViewController.swift
View file

@ -87,7 +87,7 @@ final class BMCViewController: MWMViewController {
{ [weak self] _, _, _, _ in
self?.viewModel?.finishShareCategory()
}
shareController?.present(inParentViewController: self, anchorView: anchorView)
shareController.present(inParentViewController: self, anchorView: anchorView)
case .emptyCategory:
MWMAlertViewController.activeAlert().presentInfoAlert(L("bookmarks_error_title_share_empty"),
text: L("bookmarks_error_message_share_empty"))

8
iphone/Maps/Classes/Share/MWMActivityViewController.h
View file

@ -6,13 +6,13 @@ NS_ASSUME_NONNULL_BEGIN
NS_SWIFT_NAME(ActivityViewController)
@interface MWMActivityViewController : UIActivityViewController
+ (nullable instancetype)shareControllerForEditorViral;
+ (instancetype)shareControllerForEditorViral;
+ (nullable instancetype)shareControllerForMyPosition:(CLLocationCoordinate2D)location;
+ (instancetype)shareControllerForMyPosition:(CLLocationCoordinate2D)location;
+ (nullable instancetype)shareControllerForPlacePage:(PlacePageData *)data;
+ (instancetype)shareControllerForPlacePage:(PlacePageData *)data;
+ (nullable instancetype)shareControllerForURL:(nullable NSURL *)url
+ (instancetype)shareControllerForURL:(nullable NSURL *)url
message:(NSString *)message
completionHandler:(nullable UIActivityViewControllerCompletionWithItemsHandler)completionHandler;

6
iphone/Maps/UI/PlacePage/PlacePageInteractor.swift
View file

@ -258,10 +258,8 @@ extension PlacePageInteractor: PlacePageHeaderViewControllerDelegate {
}
func previewDidPressShare(from sourceView: UIView) {
guard let shareViewController = ActivityViewController.share(forPlacePage: placePageData), let mapViewController else {
LOG(.error, "Failed to instantiate ActivityViewController.")
return
}
guard let mapViewController else { return }
let shareViewController = ActivityViewController.share(forPlacePage: placePageData)
shareViewController.present(inParentViewController: mapViewController, anchorView: sourceView)
}
}

5
iphone/Maps/UI/PlacePage/PlacePageManager/MWMPlacePageManager.mm
View file

@ -143,11 +143,6 @@ using namespace storage;
intermediateIndex:intermediateIndex];
}
- (void)share:(PlacePageData *)data {
MWMActivityViewController * shareVC = [MWMActivityViewController shareControllerForPlacePage:data];
[shareVC presentInParentViewController:self.ownerViewController anchorView:nil]; // TODO: add anchor for iPad
}
- (void)editPlace
{
[self.ownerViewController openEditor];

4
iphone/Maps/UI/PlacePage/PlacePageManager/MWMPlacePageManagerHelper.mm
View file

@ -165,10 +165,6 @@
[[MWMMapViewControlsManager manager].placePageManager book:data];
}
+ (void)share:(PlacePageData *)data {
[[MWMMapViewControlsManager manager].placePageManager share:data];
}
+ (void)routeFrom:(PlacePageData *)data {
[[MWMMapViewControlsManager manager].placePageManager routeFrom:data];
}