Merge pull request #1558 from Ranchero-Software/revert-1540-previewing-articles

Revert "Previewing articles"

iOS/MasterTimeline/MasterTimelineViewController.swift

@@ -18,7 +18,6 @@ class MasterTimelineViewController: UITableViewController, UndoableCommandRunner
 	private lazy var feedTapGestureRecognizer = UITapGestureRecognizer(target: self, action:#selector(showFeedInspector(_:)))
 	
 	private var refreshProgressView: RefreshProgressView?
-	private var currentlyPreviewedArticle: Article?
 
 	@IBOutlet weak var filterButton: UIBarButtonItem!
 	@IBOutlet weak var markAllAsReadButton: UIBarButtonItem!
@@ -307,36 +306,41 @@ class MasterTimelineViewController: UITableViewController, UndoableCommandRunner
 
 		guard let article = dataSource.itemIdentifier(for: indexPath) else { return nil }
 		
-		currentlyPreviewedArticle = article
+		return UIContextMenuConfiguration(identifier: indexPath.row as NSCopying, previewProvider: nil, actionProvider: { [weak self] suggestedActions in
 
-		return UIContextMenuConfiguration(
+			guard let self = self else { return nil }
-			identifier: indexPath.row as NSCopying,
-			previewProvider: { [weak self] in
 			
-				guard let self = self else { return nil }
+			var actions = [UIAction]()
-				
+			actions.append(self.toggleArticleReadStatusAction(article))
-				let articleViewController = UIStoryboard.main.instantiateController(ofType: ArticleViewController.self)
+			actions.append(self.toggleArticleStarStatusAction(article))
-				articleViewController.coordinator = self.coordinator
-				articleViewController.article = article
-				return articleViewController
-				
-			}, actionProvider: { [weak self] suggestedActions in
-				
-				guard let self = self else { return nil }
-				
-				return UIMenu(title: "", children: [
-					self.toggleArticleReadStatusAction(article),
-					self.toggleArticleStarStatusAction(article),
-					self.markAboveAsReadAction(article),
-					self.markBelowAsReadAction(article),
-					self.discloseFeedAction(article),
-					self.markAllInFeedAsReadAction(article),
-					self.openInBrowserAction(article),
-					self.shareAction(article, indexPath: indexPath)
-				].compactMap { $0 })
 
+			if let action = self.markAboveAsReadAction(article) {
+				actions.append(action)
 			}
-		)
+
+			if let action = self.markBelowAsReadAction(article) {
+				actions.append(action)
+			}
+			
+			if let action = self.discloseFeedAction(article) {
+				actions.append(action)
+			}
+			
+			if let action = self.markAllInFeedAsReadAction(article) {
+				actions.append(action)
+			}
+			
+			if let action = self.openInBrowserAction(article) {
+				actions.append(action)
+			}
+			
+			if let action = self.shareAction(article, indexPath: indexPath) {
+				actions.append(action)
+			}
+			
+			return UIMenu(title: "", children: actions)
+
+		})
 		
 	}
 
@@ -349,13 +353,6 @@ class MasterTimelineViewController: UITableViewController, UndoableCommandRunner
 		return UITargetedPreview(view: cell, parameters: CroppingPreviewParameters(view: cell))
 	}
 
-	override func tableView(_ tableView: UITableView, willPerformPreviewActionForMenuWith configuration: UIContextMenuConfiguration, animator: UIContextMenuInteractionCommitAnimating) {
-		if let article = currentlyPreviewedArticle	{
-			coordinator.selectArticle(article)
-			currentlyPreviewedArticle = nil
-		}
-	}
-
 	override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
 		becomeFirstResponder()
 		let article = dataSource.itemIdentifier(for: indexPath)