Add confirmation for Mark As Read actions. Issue #1603

iOS/MasterTimeline/MarkAsReadAlertController.swift

@@ -0,0 +1,62 @@
+//
+//  UndoAvailableAlertController.swift
+//  NetNewsWire
+//
+//  Created by Phil Viso on 9/29/19.
+//  Copyright © 2019 Ranchero Software. All rights reserved.
+//
+
+import Foundation
+import UIKit
+
+struct MarkAsReadAlertController {
+	
+	static func confirm(_ controller: UIViewController?,
+						coordinator: SceneCoordinator?,
+						confirmTitle: String,
+						cancelCompletion: (() -> Void)? = nil,
+						completion: @escaping () -> Void) {
+		
+		guard let controller = controller, let coordinator = coordinator else {
+			completion()
+			return
+		}
+		
+		if AppDefaults.confirmMarkAllAsRead {
+			let alertController = MarkAsReadAlertController.alert(coordinator: coordinator, confirmTitle: confirmTitle, cancelCompletion: cancelCompletion) { _ in
+				completion()
+			}
+			controller.present(alertController, animated: true)
+		} else {
+			completion()
+		}
+	}
+	
+	private static func alert(coordinator: SceneCoordinator,
+							  confirmTitle: String,
+							  cancelCompletion: (() -> Void)?,
+							  completion: @escaping (UIAlertAction) -> Void) -> UIAlertController {
+		
+		let title = NSLocalizedString("Mark As Read", comment: "Mark As Read")
+		let message = NSLocalizedString("You can turn this confirmation off in settings.",
+										comment: "You can turn this confirmation off in settings.")
+		let cancelTitle = NSLocalizedString("Cancel", comment: "Cancel")
+		let settingsTitle = NSLocalizedString("Open Settings", comment: "Open Settings")
+		
+		let alertController = UIAlertController(title: title, message: message, preferredStyle: .alert)
+		let cancelAction = UIAlertAction(title: cancelTitle, style: .cancel) { _ in
+			cancelCompletion?()
+		}
+		let settingsAction = UIAlertAction(title: settingsTitle, style: .default) { _ in
+			coordinator.showSettings(scrollToArticlesSection: true)
+		}
+		let markAction = UIAlertAction(title: confirmTitle, style: .default, handler: completion)
+		
+		alertController.addAction(markAction)
+		alertController.addAction(settingsAction)
+		alertController.addAction(cancelAction)
+
+		return alertController
+	}
+	
+}

iOS/MasterTimeline/MasterTimelineViewController.swift

@@ -121,15 +121,9 @@ class MasterTimelineViewController: UITableViewController, UndoableCommandRunner
 	}
 	
 	@IBAction func markAllAsRead(_ sender: Any) {
-		if coordinator.displayUndoAvailableTip {
-			let alertController = UndoAvailableAlertController.alert { [weak self] _ in
-				self?.coordinator.displayUndoAvailableTip = false
-				self?.coordinator.markAllAsReadInTimeline()
-			}
-			
-			present(alertController, animated: true)
-		} else {
-			coordinator.markAllAsReadInTimeline()
+		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()
 		}
 	}
 	
@@ -710,7 +704,9 @@ private extension MasterTimelineViewController {
 		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
-			self?.coordinator.markAboveAsRead(article)
+			MarkAsReadAlertController.confirm(self, coordinator: self?.coordinator, confirmTitle: title) { [weak self] in
+				self?.coordinator.markAboveAsRead(article)
+			}
 		}
 		return action
 	}
@@ -723,7 +719,9 @@ private extension MasterTimelineViewController {
 		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
-			self?.coordinator.markBelowAsRead(article)
+			MarkAsReadAlertController.confirm(self, coordinator: self?.coordinator, confirmTitle: title) { [weak self] in
+				self?.coordinator.markBelowAsRead(article)
+			}
 		}
 		return action
 	}
@@ -734,10 +732,16 @@ private extension MasterTimelineViewController {
 		}
 
 		let title = NSLocalizedString("Mark Above as Read", comment: "Mark Above as Read")
-		let action = UIAlertAction(title: title, style: .default) { [weak self] action in
-			self?.coordinator.markAboveAsRead(article)
+		let cancel = {
 			completion(true)
 		}
+
+		let action = UIAlertAction(title: title, style: .default) { [weak self] action in
+			MarkAsReadAlertController.confirm(self, coordinator: self?.coordinator, confirmTitle: title, cancelCompletion: cancel) { [weak self] in
+				self?.coordinator.markAboveAsRead(article)
+				completion(true)
+			}
+		}
 		return action
 	}
 
@@ -747,10 +751,16 @@ private extension MasterTimelineViewController {
 		}
 
 		let title = NSLocalizedString("Mark Below as Read", comment: "Mark Below as Read")
-		let action = UIAlertAction(title: title, style: .default) { [weak self] action in
-			self?.coordinator.markBelowAsRead(article)
+		let cancel = {
 			completion(true)
 		}
+		
+		let action = UIAlertAction(title: title, style: .default) { [weak self] action in
+			MarkAsReadAlertController.confirm(self, coordinator: self?.coordinator, confirmTitle: title, cancelCompletion: cancel) { [weak self] in
+				self?.coordinator.markBelowAsRead(article)
+				completion(true)
+			}
+		}
 		return action
 	}
 	
@@ -790,7 +800,9 @@ private extension MasterTimelineViewController {
 		let title = NSString.localizedStringWithFormat(localizedMenuText as NSString, webFeed.nameForDisplay) as String
 		
 		let action = UIAction(title: title, image: AppAssets.markAllAsReadImage) { [weak self] action in
-			self?.coordinator.markAllAsRead(articles)
+			MarkAsReadAlertController.confirm(self, coordinator: self?.coordinator, confirmTitle: title) { [weak self] in
+				self?.coordinator.markAllAsRead(articles)
+			}
 		}
 		return action
 	}
@@ -808,10 +820,15 @@ private extension MasterTimelineViewController {
 		
 		let localizedMenuText = NSLocalizedString("Mark All as Read in “%@”", comment: "Mark All as Read in Feed")
 		let title = NSString.localizedStringWithFormat(localizedMenuText as NSString, webFeed.nameForDisplay) as String
+		let cancel = {
+			completion(true)
+		}
 		
 		let action = UIAlertAction(title: title, style: .default) { [weak self] action in
-			self?.coordinator.markAllAsRead(articles)
-			completion(true)
+			MarkAsReadAlertController.confirm(self, coordinator: self?.coordinator, confirmTitle: title, cancelCompletion: cancel) { [weak self] in
+				self?.coordinator.markAllAsRead(articles)
+				completion(true)
+			}
 		}
 		return action
 	}

iOS/MasterTimeline/UndoAvailableAlertController.swift

@@ -1,31 +0,0 @@
-//
-//  UndoAvailableAlertController.swift
-//  NetNewsWire
-//
-//  Created by Phil Viso on 9/29/19.
-//  Copyright © 2019 Ranchero Software. All rights reserved.
-//
-
-import Foundation
-import UIKit
-
-struct UndoAvailableAlertController {
-			
-	static func alert(handler: @escaping (UIAlertAction) -> Void) -> UIAlertController {
-		let title = NSLocalizedString("Undo Available", comment: "Undo Available")
-		let message = NSLocalizedString("You can undo this and other actions with a three finger swipe to the left.",
-										comment: "Mark all articles")
-		let cancelTitle = NSLocalizedString("Cancel", comment: "Cancel")
-		let confirmTitle = NSLocalizedString("Got It", comment: "Got It")
-		
-		let alertController = UIAlertController(title: title, message: message, preferredStyle: .alert)
-		let cancelAction = UIAlertAction(title: cancelTitle, style: .cancel)
-		let markAction = UIAlertAction(title: confirmTitle, style: .default, handler: handler)
-		
-		alertController.addAction(cancelAction)
-		alertController.addAction(markAction)
-		
-		return alertController
-	}
-	
-}