From b475f52871ce92a1b7342cbaa63f97ed50267b63 Mon Sep 17 00:00:00 2001 From: Maurice Parker Date: Mon, 19 Aug 2019 18:13:21 -0500 Subject: [PATCH] Move show share dialog back to detail controller from coordinator --- iOS/AppCoordinator.swift | 15 --------------- iOS/Detail/DetailViewController.swift | 10 ++++++++-- 2 files changed, 8 insertions(+), 17 deletions(-) diff --git a/iOS/AppCoordinator.swift b/iOS/AppCoordinator.swift index 5ecc5c90b..f999afa8d 100644 --- a/iOS/AppCoordinator.swift +++ b/iOS/AppCoordinator.swift @@ -629,21 +629,6 @@ class AppCoordinator: NSObject, UndoableCommandRunner { UIApplication.shared.open(url, options: [:]) } - func showActivityDialogForCurrentArticle() { - guard let detailViewController = detailViewController else { - return - } - guard let preferredLink = currentArticle?.preferredLink, let url = URL(string: preferredLink) else { - return - } - - let itemSource = ArticleActivityItemSource(url: url, subject: currentArticle?.title) - let activityViewController = UIActivityViewController(activityItems: [itemSource], applicationActivities: nil) - - activityViewController.popoverPresentationController?.barButtonItem = detailViewController.actionBarButtonItem - detailViewController.present(activityViewController, animated: true) - } - } // MARK: UISplitViewControllerDelegate diff --git a/iOS/Detail/DetailViewController.swift b/iOS/Detail/DetailViewController.swift index 3261a397e..6816e6093 100644 --- a/iOS/Detail/DetailViewController.swift +++ b/iOS/Detail/DetailViewController.swift @@ -149,9 +149,15 @@ class DetailViewController: UIViewController { } @IBAction func showActivityDialog(_ sender: Any) { - coordinator.showActivityDialogForCurrentArticle() + guard let currentArticle = coordinator.currentArticle, let preferredLink = currentArticle.preferredLink, let url = URL(string: preferredLink) else { + return + } + + let itemSource = ArticleActivityItemSource(url: url, subject: currentArticle.title) + let activityViewController = UIActivityViewController(activityItems: [itemSource], applicationActivities: nil) + activityViewController.popoverPresentationController?.barButtonItem = actionBarButtonItem + present(activityViewController, animated: true) } - } class ArticleActivityItemSource: NSObject, UIActivityItemSource {