Merge branch 'ios-release'

iOS/MasterTimeline/MasterTimelineViewController.swift

@@ -116,8 +116,21 @@ class MasterTimelineViewController: UITableViewController, UndoableCommandRunner
 	
 	@IBAction func markAllAsRead(_ sender: Any) {
 		let title = NSLocalizedString("Mark All as Read", comment: "Mark All as Read")
-		MarkAsReadAlertController.confirm(self, coordinator: coordinator, confirmTitle: title) { [weak self] in
-			self?.coordinator.markAllAsReadInTimeline()
+		
+		if let source = sender as? UIBarButtonItem {
+			MarkAsReadAlertController.confirm(self, coordinator: coordinator, confirmTitle: title, sourceType: source) { [weak self] in
+				self?.coordinator.markAllAsReadInTimeline()
+			}
+		}
+		
+		if let _ = sender as? UIKeyCommand {
+			guard let indexPath = tableView.indexPathForSelectedRow, let contentView = tableView.cellForRow(at: indexPath)?.contentView else {
+				return
+			}
+			
+			MarkAsReadAlertController.confirm(self, coordinator: coordinator, confirmTitle: title, sourceType: contentView) { [weak self] in
+				self?.coordinator.markAllAsReadInTimeline()
+			}
 		}
 	}
 	
@@ -156,7 +169,7 @@ class MasterTimelineViewController: UITableViewController, UndoableCommandRunner
 	@objc func showFeedInspector(_ sender: UITapGestureRecognizer) {
 		coordinator.showFeedInspector()
 	}
-	
+
 	// MARK: API
 	
 	func restoreSelectionIfNecessary(adjustScroll: Bool) {
@@ -260,11 +273,11 @@ class MasterTimelineViewController: UITableViewController, UndoableCommandRunner
 					popoverController.sourceRect = CGRect(x: view.frame.size.width/2, y: view.frame.size.height/2, width: 1, height: 1)
 				}
 
-				if let action = self.markAboveAsReadAlertAction(article, completion: completion) {
+				if let action = self.markAboveAsReadAlertAction(article, indexPath: indexPath, completion: completion) {
 					alert.addAction(action)
 				}
 
-				if let action = self.markBelowAsReadAlertAction(article, completion: completion) {
+				if let action = self.markBelowAsReadAlertAction(article, indexPath: indexPath, completion: completion) {
 					alert.addAction(action)
 				}
 				
@@ -272,7 +285,7 @@ class MasterTimelineViewController: UITableViewController, UndoableCommandRunner
 					alert.addAction(action)
 				}
 				
-				if let action = self.markAllInFeedAsReadAlertAction(article, completion: completion) {
+				if let action = self.markAllInFeedAsReadAlertAction(article, indexPath: indexPath, completion: completion) {
 					alert.addAction(action)
 				}
 
@@ -317,11 +330,11 @@ class MasterTimelineViewController: UITableViewController, UndoableCommandRunner
 			
 			actions.append(self.toggleArticleStarStatusAction(article))
 
-			if let action = self.markAboveAsReadAction(article) {
+			if let action = self.markAboveAsReadAction(article, indexPath: indexPath) {
 				actions.append(action)
 			}
 
-			if let action = self.markBelowAsReadAction(article) {
+			if let action = self.markBelowAsReadAction(article, indexPath: indexPath) {
 				actions.append(action)
 			}
 			
@@ -329,7 +342,7 @@ class MasterTimelineViewController: UITableViewController, UndoableCommandRunner
 				actions.append(action)
 			}
 			
-			if let action = self.markAllInFeedAsReadAction(article) {
+			if let action = self.markAllInFeedAsReadAction(article, indexPath: indexPath) {
 				actions.append(action)
 			}
 			
@@ -696,38 +709,38 @@ private extension MasterTimelineViewController {
 		return action
 	}
 
-	func markAboveAsReadAction(_ article: Article) -> UIAction? {
-		guard coordinator.canMarkAboveAsRead(for: article) else {
+	func markAboveAsReadAction(_ article: Article, indexPath: IndexPath) -> UIAction? {
+		guard coordinator.canMarkAboveAsRead(for: article), let contentView = self.tableView.cellForRow(at: indexPath)?.contentView else {
 			return nil
 		}
 
 		let title = NSLocalizedString("Mark Above as Read", comment: "Mark Above as Read")
 		let image = AppAssets.markAboveAsReadImage
 		let action = UIAction(title: title, image: image) { [weak self] action in
-			MarkAsReadAlertController.confirm(self, coordinator: self?.coordinator, confirmTitle: title) { [weak self] in
+			MarkAsReadAlertController.confirm(self, coordinator: self?.coordinator, confirmTitle: title, sourceType: contentView) { [weak self] in
 				self?.coordinator.markAboveAsRead(article)
 			}
 		}
 		return action
 	}
 	
-	func markBelowAsReadAction(_ article: Article) -> UIAction? {
-		guard coordinator.canMarkBelowAsRead(for: article) else {
+	func markBelowAsReadAction(_ article: Article, indexPath: IndexPath) -> UIAction? {
+		guard coordinator.canMarkBelowAsRead(for: article), let contentView = self.tableView.cellForRow(at: indexPath)?.contentView else {
 			return nil
 		}
 
 		let title = NSLocalizedString("Mark Below as Read", comment: "Mark Below as Read")
 		let image = AppAssets.markBelowAsReadImage
 		let action = UIAction(title: title, image: image) { [weak self] action in
-			MarkAsReadAlertController.confirm(self, coordinator: self?.coordinator, confirmTitle: title) { [weak self] in
+			MarkAsReadAlertController.confirm(self, coordinator: self?.coordinator, confirmTitle: title, sourceType: contentView) { [weak self] in
 				self?.coordinator.markBelowAsRead(article)
 			}
 		}
 		return action
 	}
 	
-	func markAboveAsReadAlertAction(_ article: Article, completion: @escaping (Bool) -> Void) -> UIAlertAction? {
-		guard coordinator.canMarkAboveAsRead(for: article) else {
+	func markAboveAsReadAlertAction(_ article: Article, indexPath: IndexPath, completion: @escaping (Bool) -> Void) -> UIAlertAction? {
+		guard coordinator.canMarkAboveAsRead(for: article), let contentView = self.tableView.cellForRow(at: indexPath)?.contentView else {
 			return nil
 		}
 
@@ -737,7 +750,7 @@ private extension MasterTimelineViewController {
 		}
 
 		let action = UIAlertAction(title: title, style: .default) { [weak self] action in
-			MarkAsReadAlertController.confirm(self, coordinator: self?.coordinator, confirmTitle: title, cancelCompletion: cancel) { [weak self] in
+			MarkAsReadAlertController.confirm(self, coordinator: self?.coordinator, confirmTitle: title, sourceType: contentView, cancelCompletion: cancel) { [weak self] in
 				self?.coordinator.markAboveAsRead(article)
 				completion(true)
 			}
@@ -745,8 +758,8 @@ private extension MasterTimelineViewController {
 		return action
 	}
 
-	func markBelowAsReadAlertAction(_ article: Article, completion: @escaping (Bool) -> Void) -> UIAlertAction? {
-		guard coordinator.canMarkBelowAsRead(for: article) else {
+	func markBelowAsReadAlertAction(_ article: Article, indexPath: IndexPath, completion: @escaping (Bool) -> Void) -> UIAlertAction? {
+		guard coordinator.canMarkBelowAsRead(for: article), let contentView = self.tableView.cellForRow(at: indexPath)?.contentView else {
 			return nil
 		}
 
@@ -756,7 +769,7 @@ private extension MasterTimelineViewController {
 		}
 		
 		let action = UIAlertAction(title: title, style: .default) { [weak self] action in
-			MarkAsReadAlertController.confirm(self, coordinator: self?.coordinator, confirmTitle: title, cancelCompletion: cancel) { [weak self] in
+			MarkAsReadAlertController.confirm(self, coordinator: self?.coordinator, confirmTitle: title, sourceType: contentView, cancelCompletion: cancel) { [weak self] in
 				self?.coordinator.markBelowAsRead(article)
 				completion(true)
 			}
@@ -787,36 +800,37 @@ private extension MasterTimelineViewController {
 		return action
 	}
 	
-	func markAllInFeedAsReadAction(_ article: Article) -> UIAction? {
+	func markAllInFeedAsReadAction(_ article: Article, indexPath: IndexPath) -> UIAction? {
 		guard let webFeed = article.webFeed else { return nil }
 		guard let fetchedArticles = try? webFeed.fetchArticles() else {
 			return nil
 		}
 
 		let articles = Array(fetchedArticles)
-		guard articles.canMarkAllAsRead() else {
+		guard articles.canMarkAllAsRead(), let contentView = self.tableView.cellForRow(at: indexPath)?.contentView else {
 			return nil
 		}
 		
+		
 		let localizedMenuText = NSLocalizedString("Mark All as Read in “%@”", comment: "Command")
 		let title = NSString.localizedStringWithFormat(localizedMenuText as NSString, webFeed.nameForDisplay) as String
 		
 		let action = UIAction(title: title, image: AppAssets.markAllAsReadImage) { [weak self] action in
-			MarkAsReadAlertController.confirm(self, coordinator: self?.coordinator, confirmTitle: title) { [weak self] in
+			MarkAsReadAlertController.confirm(self, coordinator: self?.coordinator, confirmTitle: title, sourceType: contentView) { [weak self] in
 				self?.coordinator.markAllAsRead(articles)
 			}
 		}
 		return action
 	}
 
-	func markAllInFeedAsReadAlertAction(_ article: Article, completion: @escaping (Bool) -> Void) -> UIAlertAction? {
+	func markAllInFeedAsReadAlertAction(_ article: Article, indexPath: IndexPath, completion: @escaping (Bool) -> Void) -> UIAlertAction? {
 		guard let webFeed = article.webFeed else { return nil }
 		guard let fetchedArticles = try? webFeed.fetchArticles() else {
 			return nil
 		}
 		
 		let articles = Array(fetchedArticles)
-		guard articles.canMarkAllAsRead() else {
+		guard articles.canMarkAllAsRead(), let contentView = self.tableView.cellForRow(at: indexPath)?.contentView else {
 			return nil
 		}
 		
@@ -827,7 +841,7 @@ private extension MasterTimelineViewController {
 		}
 		
 		let action = UIAlertAction(title: title, style: .default) { [weak self] action in
-			MarkAsReadAlertController.confirm(self, coordinator: self?.coordinator, confirmTitle: title, cancelCompletion: cancel) { [weak self] in
+			MarkAsReadAlertController.confirm(self, coordinator: self?.coordinator, confirmTitle: title, sourceType: contentView, cancelCompletion: cancel) { [weak self] in
 				self?.coordinator.markAllAsRead(articles)
 				completion(true)
 			}