From 65eb58c199bf77dde3da627f720efbadf3e2f987 Mon Sep 17 00:00:00 2001 From: Brent Simmons Date: Tue, 31 Dec 2024 17:24:36 -0800 Subject: [PATCH] Temporarily disable Go to Feed on compact size classes. --- .../MainTimelineViewController.swift | 23 ++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/iOS/MainTimeline/MainTimelineViewController.swift b/iOS/MainTimeline/MainTimelineViewController.swift index 5bfcbb777..19193cd48 100644 --- a/iOS/MainTimeline/MainTimelineViewController.swift +++ b/iOS/MainTimeline/MainTimelineViewController.swift @@ -839,9 +839,26 @@ private extension MainTimelineViewController { } return action } - + + private func canGoToFeed() -> Bool { + // This is temporary — since we haven’t figured out + // + // on compact size classes, just don’t display this option + // when on compact. + + var viewController: UIViewController? = self + while viewController != nil { + if let splitViewController = viewController?.splitViewController { + return splitViewController.traitCollection.horizontalSizeClass == .regular + } + viewController = parent + } + + return false + } + func discloseFeedAction(_ article: Article) -> UIAction? { - guard let webFeed = article.webFeed, + guard canGoToFeed(), let webFeed = article.webFeed, !coordinator.timelineFeedIsEqualTo(webFeed) else { return nil } let title = NSLocalizedString("Go to Feed", comment: "Go to Feed") @@ -852,7 +869,7 @@ private extension MainTimelineViewController { } func discloseFeedAlertAction(_ article: Article, completion: @escaping (Bool) -> Void) -> UIAlertAction? { - guard let webFeed = article.webFeed, + guard canGoToFeed(), let webFeed = article.webFeed, !coordinator.timelineFeedIsEqualTo(webFeed) else { return nil } let title = NSLocalizedString("Go to Feed", comment: "Go to Feed")