diff --git a/Shared/Article Rendering/core.css b/Shared/Article Rendering/core.css index 64d5ed46f..5704d97f6 100644 --- a/Shared/Article Rendering/core.css +++ b/Shared/Article Rendering/core.css @@ -114,8 +114,7 @@ img[src*="share-buttons"] { .newsfoot-footnote-popover .reversefootnote, .newsfoot-footnote-popover .footnoteBackLink, -.newsfoot-footnote-popover .footnote-return, -.newsfoot-footnote-popover a[href*='#fn'] { +.newsfoot-footnote-popover .footnote-return { display: none; } diff --git a/iOS/MainTimeline/TimelineViewController.swift b/iOS/MainTimeline/TimelineViewController.swift index c54132bbb..003a68e41 100644 --- a/iOS/MainTimeline/TimelineViewController.swift +++ b/iOS/MainTimeline/TimelineViewController.swift @@ -60,7 +60,7 @@ class TimelineViewController: UITableViewController, UndoableCommandRunner { NotificationCenter.default.addObserver(self, selector: #selector(contentSizeCategoryDidChange), name: UIContentSizeCategory.didChangeNotification, object: nil) NotificationCenter.default.addObserver(self, selector: #selector(displayNameDidChange), name: .DisplayNameDidChange, object: nil) NotificationCenter.default.addObserver(self, selector: #selector(willEnterForeground(_:)), name: UIApplication.willEnterForegroundNotification, object: nil) - + // 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,7 +603,7 @@ extension TimelineViewController: UISearchBarDelegate { private extension TimelineViewController { - func configureToolbar() { + func configureToolbar() { guard !(splitViewController?.isCollapsed ?? true) else { return } diff --git a/iOS/SceneCoordinator.swift b/iOS/SceneCoordinator.swift index c649cf084..b52df0aa4 100644 --- a/iOS/SceneCoordinator.swift +++ b/iOS/SceneCoordinator.swift @@ -1308,6 +1308,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