diff --git a/iOS/Base.lproj/Main.storyboard b/iOS/Base.lproj/Main.storyboard
index 7a89c6297..82dc391e2 100644
--- a/iOS/Base.lproj/Main.storyboard
+++ b/iOS/Base.lproj/Main.storyboard
@@ -18,7 +18,7 @@
-
+
@@ -138,6 +138,9 @@
+
+
+
diff --git a/iOS/MasterTimeline/MasterTimelineViewController.swift b/iOS/MasterTimeline/MasterTimelineViewController.swift
index 27462c202..00caab70a 100644
--- a/iOS/MasterTimeline/MasterTimelineViewController.swift
+++ b/iOS/MasterTimeline/MasterTimelineViewController.swift
@@ -19,15 +19,7 @@ class MasterTimelineViewController: UITableViewController, UndoableCommandRunner
private var refreshProgressView: RefreshProgressView?
- @IBOutlet weak var markAllAsReadButton: UIBarButtonItem! {
- didSet {
- if #available(iOS 14, *) {
- markAllAsReadButton.primaryAction = nil
- } else {
- markAllAsReadButton.action = #selector(MasterTimelineViewController.markAllAsRead(_:))
- }
- }
- }
+ @IBOutlet weak var markAllAsReadButton: UIBarButtonItem!
private var filterButton: UIBarButtonItem!
private var firstUnreadButton: UIBarButtonItem!
@@ -666,25 +658,6 @@ private extension MasterTimelineViewController {
setToolbarItems(items, animated: false)
}
}
-
- if #available(iOS 14, *) {
- let title = NSLocalizedString("Mark All as Read", comment: "Mark All as Read")
- var markAsReadAction: UIAction!
-
- if AppDefaults.shared.confirmMarkAllAsRead {
- markAsReadAction = UIAction(title: title, image: AppAssets.markAllAsReadImage, discoverabilityTitle: "in \(self.title!)") { [weak self] action in
- self?.coordinator.markAllAsReadInTimeline()
- }
- let settingsAction = UIAction(title: NSLocalizedString("Settings", comment: "Settings"), image: UIImage(systemName: "gear")!, discoverabilityTitle: NSLocalizedString("You can turn this confirmation off in Settings.", comment: "You can turn this confirmation off in Settings.")) { [weak self] action in
- self?.coordinator.showSettings(scrollToArticlesSection: true)
- }
- markAllAsReadButton.menu = UIMenu(title: NSLocalizedString(title, comment: title), image: nil, identifier: nil, children: [settingsAction, markAsReadAction])
- markAllAsReadButton.action = nil
- } else {
- markAllAsReadButton.action = #selector(MasterTimelineViewController.markAllAsRead(_:))
- }
- }
-
}
func updateTitleUnreadCount() {