From 502fb56108f2c96bb32ac4387708d12611aa2c5a Mon Sep 17 00:00:00 2001
From: "o.bolovintseva" <olesya.bolovintseva@mapswithme.com>
Date: Thu, 22 Nov 2018 13:52:47 +0300
Subject: [PATCH] [ios] edit on web screen - activity view for category sharing

---
 .../BookmarksSharingViewController.swift      |  4 ++-
 .../Sharing/EditOnWebViewController.swift     | 28 +++++--------------
 iphone/Maps/Bridging-Header.h                 |  1 -
 3 files changed, 10 insertions(+), 23 deletions(-)

diff --git a/iphone/Maps/Bookmarks/Categories/Sharing/BookmarksSharingViewController.swift b/iphone/Maps/Bookmarks/Categories/Sharing/BookmarksSharingViewController.swift
index 5532636d19..33757f0d44 100644
--- a/iphone/Maps/Bookmarks/Categories/Sharing/BookmarksSharingViewController.swift
+++ b/iphone/Maps/Bookmarks/Categories/Sharing/BookmarksSharingViewController.swift
@@ -28,6 +28,8 @@ final class BookmarksSharingViewController: MWMTableViewController {
   
   private let kPropertiesSegueIdentifier = "chooseProperties"
   private let kTagsControllerIdentifier = "tags"
+  private let kEditOnWebSegueIdentifier = "editOnWeb"
+  
   private let publicSectionIndex = 0
   private let privateSectionIndex = 1
   private let editOnWebCellIndex = 3
@@ -318,6 +320,6 @@ extension BookmarksSharingViewController: SharingPropertiesViewControllerDelegat
 
 extension BookmarksSharingViewController: EditOnWebViewControllerDelegate {
   func editOnWebViewControllerDidFinish(_ viewController: EditOnWebViewController) {
-    dismiss(animated: true, completion: nil)
+    dismiss(animated: true)
   }
 }
diff --git a/iphone/Maps/Bookmarks/Categories/Sharing/EditOnWebViewController.swift b/iphone/Maps/Bookmarks/Categories/Sharing/EditOnWebViewController.swift
index 20e751a4d7..afd3739048 100644
--- a/iphone/Maps/Bookmarks/Categories/Sharing/EditOnWebViewController.swift
+++ b/iphone/Maps/Bookmarks/Categories/Sharing/EditOnWebViewController.swift
@@ -24,31 +24,17 @@ final class EditOnWebViewController: MWMViewController {
       return
     }
     
-    if MWMMailViewController.canSendMail() {
-      let mailController = MWMMailViewController()
-      mailController.mailComposeDelegate = self
-      mailController.setSubject(L("edit_guide_title"))
-      
-      let text = String(format: "%@\n\n%@", L("edit_your_guide_email_body"), guide.absoluteString)
-      mailController.setMessageBody(text, isHTML: false)
-      mailController.navigationBar.titleTextAttributes = [
-        NSAttributedStringKey.foregroundColor : UIColor.white
-      ]
-      self.present(mailController, animated: true, completion: nil)
-    } else {
-      MWMAlertViewController.activeAlert().presentInfoAlert(L("email_error_title"),
-                                                            text: L("email_error_body"))
+    let message = L("share_bookmarks_email_body")
+    let shareController = MWMActivityViewController.share(for: guide, message: message) {
+      [weak self] _, _, _, _ in
+      if let self = self {
+        self.delegate?.editOnWebViewControllerDidFinish(self)
+      }
     }
+    shareController?.present(inParentViewController: self, anchorView: nil)
   }
   
   @IBAction func cancelButtonPressed(_ sender: Any) {
     delegate?.editOnWebViewControllerDidFinish(self)
   }
 }
-
-extension EditOnWebViewController: MFMailComposeViewControllerDelegate {
-  func mailComposeController(_ controller: MFMailComposeViewController,
-                             didFinishWith result: MFMailComposeResult, error: Error?) {
-    delegate?.editOnWebViewControllerDidFinish(self)
-  }
-}
diff --git a/iphone/Maps/Bridging-Header.h b/iphone/Maps/Bridging-Header.h
index 8edbc6b8b8..2b1551db79 100644
--- a/iphone/Maps/Bridging-Header.h
+++ b/iphone/Maps/Bridging-Header.h
@@ -39,7 +39,6 @@
 #import "MWMFrameworkHelper.h"
 #import "MWMKeyboard.h"
 #import "MWMLocationManager.h"
-#import "MWMMailViewController.h"
 #import "MWMMapWidgetsHelper.h"
 #import "MWMNavigationDashboardEntity.h"
 #import "MWMNavigationDashboardManager.h"