Add context menu for Fullscreen mode actions. Issue #1344

2025-08-12 06:26:36 +00:00 · 2019-11-25 19:43:43 -06:00
parent b1471d4d20
commit 323b160b7f
8 changed files with 344 additions and 21 deletions
--- a/iOS/Article/ArticleViewController.swift
+++ b/iOS/Article/ArticleViewController.swift
@@ -47,6 +47,10 @@ class ArticleViewController: UIViewController {
 	}()
 	
 	private var webView: WKWebView!
+	private lazy var contextMenuInteraction = UIContextMenuInteraction(delegate: self)
+	private var isFullScreenAvailable: Bool {
+		return traitCollection.userInterfaceIdiom == .phone && coordinator.isRootSplitCollapsed
+	}
 	private lazy var transition = ImageTransition(controller: self)
 	private var clickedImageCompletion: (() -> Void)?

@@ -93,6 +97,7 @@ class ArticleViewController: UIViewController {
 			webView?.evaluateJavaScript("cancelImageLoad();")
 			webView.configuration.userContentController.removeScriptMessageHandler(forName: MessageName.imageWasClicked)
 			webView.configuration.userContentController.removeScriptMessageHandler(forName: MessageName.imageWasShown)
+			webView.removeInteraction(contextMenuInteraction)
 			webView.removeFromSuperview()
 			ArticleViewControllerWebViewProvider.shared.enqueueWebView(webView)
 			webView = nil
@@ -122,6 +127,7 @@ class ArticleViewController: UIViewController {
 			self.webViewContainer.addChildAndPin(webView)
 			webView.navigationDelegate = self
 			webView.uiDelegate = self
+			self.configureContextMenuInteraction()

 			webView.configuration.userContentController.add(WrapperScriptMessageHandler(self), name: MessageName.imageWasClicked)
 			webView.configuration.userContentController.add(WrapperScriptMessageHandler(self), name: MessageName.imageWasShown)
@@ -285,19 +291,8 @@ class ArticleViewController: UIViewController {
 		coordinator.toggleStarredForCurrentArticle()
 	}
 	
-	@IBAction func openBrowser(_ sender: Any) {
-		coordinator.showBrowserForCurrentArticle()
-	}
-	
 	@IBAction func showActivityDialog(_ sender: Any) {
-		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 = actionBarButtonItem
-		present(activityViewController, animated: true)
+		showActivityDialog()
 	}
 	
 	// MARK: Keyboard Shortcuts
@@ -357,6 +352,39 @@ extension ArticleViewController: InteractiveNavigationControllerTappable {
 	}
 }

+// MARK: UIContextMenuInteractionDelegate
+
+extension ArticleViewController: UIContextMenuInteractionDelegate {
+    func contextMenuInteraction(_ interaction: UIContextMenuInteraction, configurationForMenuAtLocation location: CGPoint) -> UIContextMenuConfiguration? {
+	
+		return UIContextMenuConfiguration(identifier: nil, previewProvider: contextMenuPreviewProvider) { [weak self] suggestedActions in
+			guard let self = self else { return nil }
+			var actions = [UIAction]()
+			
+			if let action = self.prevArticleAction() {
+				actions.append(action)
+			}
+			if let action = self.nextArticleAction() {
+				actions.append(action)
+			}
+			actions.append(self.toggleReadAction())
+			actions.append(self.toggleStarredAction())
+			if let action = self.nextUnreadArticleAction() {
+				actions.append(action)
+			}
+			actions.append(self.toggleArticleExtractorAction())
+			actions.append(self.shareAction())
+			
+			return UIMenu(title: "", children: actions)
+        }
+    }
+	
+	func contextMenuInteraction(_ interaction: UIContextMenuInteraction, willPerformPreviewActionForMenuWith configuration: UIContextMenuConfiguration, animator: UIContextMenuInteractionCommitAnimating) {
+		coordinator.showBrowserForCurrentArticle()
+	}
+	
+}
+
 // MARK: WKNavigationDelegate

 extension ArticleViewController: WKNavigationDelegate {
@@ -492,25 +520,113 @@ private extension ArticleViewController {
 		}
 	}
 	
+	func showActivityDialog() {
+		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 = actionBarButtonItem
+		present(activityViewController, animated: true)
+	}
+	
 	func showBars() {
-		if traitCollection.userInterfaceIdiom == .phone && coordinator.isRootSplitCollapsed {
+		if isFullScreenAvailable {
 			AppDefaults.articleFullscreenEnabled = false
 			coordinator.showStatusBar()
 			showNavigationViewConstraint.constant = 0
 			showToolbarViewConstraint.constant = 0
 			navigationController?.setNavigationBarHidden(false, animated: true)
 			navigationController?.setToolbarHidden(false, animated: true)
+			configureContextMenuInteraction()
 		}
 	}
 	
 	func hideBars() {
-		if traitCollection.userInterfaceIdiom == .phone && coordinator.isRootSplitCollapsed {
+		if isFullScreenAvailable {
 			AppDefaults.articleFullscreenEnabled = true
 			coordinator.hideStatusBar()
 			showNavigationViewConstraint.constant = 44.0
 			showToolbarViewConstraint.constant = 44.0
 			navigationController?.setNavigationBarHidden(true, animated: true)
 			navigationController?.setToolbarHidden(true, animated: true)
+			configureContextMenuInteraction()
+		}
+	}
+	
+	func configureContextMenuInteraction() {
+		if isFullScreenAvailable {
+			if navigationController?.isNavigationBarHidden ?? false {
+				webView?.addInteraction(contextMenuInteraction)
+			} else {
+				webView?.removeInteraction(contextMenuInteraction)
+			}
+		}
+		
+	}
+	
+	func contextMenuPreviewProvider() -> UIViewController {
+		let previewProvider = UIStoryboard.main.instantiateController(ofType: ContextMenuPreviewViewController.self)
+		previewProvider.article = currentArticle
+		return previewProvider
+	}
+	
+	func prevArticleAction() -> UIAction? {
+		guard coordinator.isPrevArticleAvailable else { return nil }
+		let title = NSLocalizedString("Previous Article", comment: "Previous Article")
+		return UIAction(title: title, image: AppAssets.prevArticleImage) { [weak self] action in
+			self?.coordinator.selectPrevArticle()
+		}
+	}
+	
+	func nextArticleAction() -> UIAction? {
+		guard coordinator.isNextArticleAvailable else { return nil }
+		let title = NSLocalizedString("Next Article", comment: "Next Article")
+		return UIAction(title: title, image: AppAssets.nextArticleImage) { [weak self] action in
+			self?.coordinator.selectNextArticle()
+		}
+	}
+	
+	func toggleReadAction() -> UIAction {
+		let read = currentArticle?.status.read ?? false
+		let title = read ? NSLocalizedString("Mark as Unread", comment: "Mark as Unread") : NSLocalizedString("Mark as Read", comment: "Mark as Read")
+		let readImage = read ? AppAssets.circleClosedImage : AppAssets.circleOpenImage
+		return UIAction(title: title, image: readImage) { [weak self] action in
+			self?.coordinator.toggleReadForCurrentArticle()
+		}
+	}
+
+	func toggleStarredAction() -> UIAction {
+		let starred = currentArticle?.status.starred ?? false
+		let title = starred ? NSLocalizedString("Mark as Unstarred", comment: "Mark as Unstarred") : NSLocalizedString("Mark as Starred", comment: "Mark as Starred")
+		let starredImage = starred ? AppAssets.starOpenImage : AppAssets.starClosedImage
+		return UIAction(title: title, image: starredImage) { [weak self] action in
+			self?.coordinator.toggleStarredForCurrentArticle()
+		}
+	}
+
+	func nextUnreadArticleAction() -> UIAction? {
+		guard coordinator.isAnyUnreadAvailable else { return nil }
+		let title = NSLocalizedString("Next Unread Article", comment: "Next Unread Article")
+		return UIAction(title: title, image: AppAssets.nextUnreadArticleImage) { [weak self] action in
+			self?.coordinator.selectNextArticle()
+		}
+	}
+	
+	func toggleArticleExtractorAction() -> UIAction {
+		let extracted = articleExtractorButton.buttonState == .on
+		let title = extracted ? NSLocalizedString("Show Feed Article", comment: "Show Feed Article") : NSLocalizedString("Show Reader View", comment: "Show Reader View")
+		let extractorImage = extracted ? AppAssets.articleExtractorOffSmall : AppAssets.articleExtractorOnSmall
+		return UIAction(title: title, image: extractorImage) { [weak self] action in
+			self?.coordinator.toggleArticleExtractor()
+		}
+	}
+
+	func shareAction() -> UIAction {
+		let title = NSLocalizedString("Share", comment: "Share")
+		return UIAction(title: title, image: AppAssets.shareImage) { [weak self] action in
+			self?.showActivityDialog()
 		}
 	}
 	
--- a/iOS/Article/ContextMenuPreviewViewController.swift
+++ b/iOS/Article/ContextMenuPreviewViewController.swift
@@ -0,0 +1,50 @@
+//
+//  ContextMenuPreviewViewController.swift
+//  NetNewsWire-iOS
+//
+//  Created by Maurice Parker on 11/25/19.
+//  Copyright © 2019 Ranchero Software. All rights reserved.
+//
+
+import UIKit
+import Articles
+
+class ContextMenuPreviewViewController: UIViewController {
+
+	@IBOutlet weak var blogNameLabel: UILabel!
+	@IBOutlet weak var blogAuthorLabel: UILabel!
+	@IBOutlet weak var articleTitleLabel: UILabel!
+	@IBOutlet weak var dateTimeLabel: UILabel!
+	
+	var article: Article!
+	
+	override func viewDidLoad() {
+        super.viewDidLoad()
+		
+		blogNameLabel.text = article.webFeed?.nameForDisplay ?? ""
+		blogAuthorLabel.text = article.byline()
+		articleTitleLabel.text = article.title ?? ""
+		
+		let icon = IconView()
+		icon.iconImage = article.iconImage()
+		icon.translatesAutoresizingMaskIntoConstraints = false
+		view.addSubview(icon)
+		
+		NSLayoutConstraint.activate([
+			icon.widthAnchor.constraint(equalToConstant: 48),
+			icon.heightAnchor.constraint(equalToConstant: 48),
+			icon.topAnchor.constraint(equalTo: view.safeAreaLayoutGuide.topAnchor, constant: 8),
+			icon.trailingAnchor.constraint(equalTo: view.safeAreaLayoutGuide.trailingAnchor, constant: -20)
+		])
+		
+		let dateFormatter = DateFormatter()
+		dateFormatter.dateStyle = .long
+		dateFormatter.timeStyle = .medium
+		dateTimeLabel.text = dateFormatter.string(from: article.logicalDatePublished)
+		
+		view.setNeedsLayout()
+		view.layoutIfNeeded()
+		preferredContentSize = CGSize(width: view.bounds.width, height: dateTimeLabel.frame.maxY + 8)
+    }
+
+}