diff --git a/iOS/MainTimeline/MainTimelineViewController.swift b/iOS/MainTimeline/MainTimelineViewController.swift index a425f82a9..6a2ad7bcb 100644 --- a/iOS/MainTimeline/MainTimelineViewController.swift +++ b/iOS/MainTimeline/MainTimelineViewController.swift @@ -60,9 +60,6 @@ class MainTimelineViewController: UITableViewController, UndoableCommandRunner { NotificationCenter.default.addObserver(self, selector: #selector(displayNameDidChange), name: .DisplayNameDidChange, object: nil) NotificationCenter.default.addObserver(self, selector: #selector(willEnterForeground(_:)), name: UIApplication.willEnterForegroundNotification, object: nil) - // Split View Controller Delegate - splitViewController?.delegate = self - // Initialize Programmatic Buttons filterButton = UIBarButtonItem(image: AppAssets.filterInactiveImage, style: .plain, target: self, action: #selector(toggleFilter(_:))) firstUnreadButton = UIBarButtonItem(image: AppAssets.nextUnreadArticleImage, style: .plain, target: self, action: #selector(firstUnread(_:))) @@ -603,39 +600,6 @@ extension MainTimelineViewController: UISearchBarDelegate { } } -extension TimelineViewController: UISplitViewControllerDelegate { - - func splitViewController(_ svc: UISplitViewController, willChangeTo displayMode: UISplitViewController.DisplayMode) { - switch displayMode { - case .automatic: - return - case .secondaryOnly: - return - case .oneBesideSecondary: - // Timeline + Article - show the refresh control on the timeline - self.toolbarItems?[2].customView?.alpha = 1.0 - case .oneOverSecondary: - return - case .twoBesideSecondary: - return - case .twoOverSecondary: - return - case .twoDisplaceSecondary: - // Sidebar + Timeline + Article - hide the refresh control on the timeline - self.toolbarItems?[2].customView?.alpha = 0.0 - case .primaryHidden: - return - case .allVisible: - return - case .primaryOverlay: - return - @unknown default: - return - } - } - -} - // MARK: Private private extension MainTimelineViewController { diff --git a/iOS/SceneCoordinator.swift b/iOS/SceneCoordinator.swift index 156a843ff..55423868b 100644 --- a/iOS/SceneCoordinator.swift +++ b/iOS/SceneCoordinator.swift @@ -1310,6 +1310,35 @@ extension SceneCoordinator: UISplitViewControllerDelegate { } } + func splitViewController(_ svc: UISplitViewController, willChangeTo displayMode: UISplitViewController.DisplayMode) { + switch displayMode { + case .automatic: + return + case .secondaryOnly: + return + case .oneBesideSecondary: + // Timeline + Article - show the refresh control on the timeline + mainTimelineViewController?.toolbarItems?[2].customView?.alpha = 1.0 + case .oneOverSecondary: + return + case .twoBesideSecondary: + return + case .twoOverSecondary: + return + case .twoDisplaceSecondary: + // Sidebar + Timeline + Article - hide the refresh control on the timeline + mainTimelineViewController?.toolbarItems?[2].customView?.alpha = 0.0 + case .primaryHidden: + return + case .allVisible: + return + case .primaryOverlay: + return + @unknown default: + return + } + } + } // MARK: UINavigationControllerDelegate