Use a Single Global Hide-Read State

Mac/AppDefaults.swift

@@ -30,6 +30,7 @@ final class AppDefaults: Sendable {
 		static let timelineFontSize = "timelineFontSize"
 		static let timelineSortDirection = "timelineSortDirection"
 		static let timelineGroupByFeed = "timelineGroupByFeed"
+		static let timelineReadFilterEnabled = "timelineReadFilterEnabled"
 		static let detailFontSize = "detailFontSize"
 		static let openInBrowserInBackground = "openInBrowserInBackground"
 		static let subscribeToFeedsInDefaultBrowser = "subscribeToFeedsInDefaultBrowser"
@@ -149,6 +150,15 @@ final class AppDefaults: Sendable {
 		}
 	}
 
+	var timelineReadFilterEnabled: Bool {
+		get {
+			return UserDefaults.standard.bool(forKey: Key.timelineReadFilterEnabled)
+		}
+		set {
+			UserDefaults.standard.set(newValue, forKey: Key.timelineReadFilterEnabled)
+		}
+	}
+
 	var detailFontSize: FontSize {
 		get {
 			return fontSize(for: Key.detailFontSize)

Mac/MainWindow/AddFolder/AddFolderWindowController.swift

@@ -40,24 +40,16 @@ final class AddFolderWindowController: NSWindowController {
 	// MARK: - NSViewController
 
 	override func windowDidLoad() {
-		let preferredAccountID = AppDefaults.shared.addFolderAccountID
 		accountPopupButton.removeAllItems()
 
 		let menu = NSMenu()
 		accountPopupButton.menu = menu
 
-		let sortedAccounts = AccountManager.shared.sortedActiveAccounts
-		let accounts: [Account] = sortedAccounts.filter { !$0.behaviors.contains(.disallowFolderManagement) }
-
-		for oneAccount in accounts {
-
-			let oneMenuItem = NSMenuItem()
-			oneMenuItem.title = oneAccount.nameForDisplay
-			oneMenuItem.representedObject = oneAccount
-			menu.addItem(oneMenuItem)
-
-			if oneAccount.accountID == preferredAccountID {
-				accountPopupButton.select(oneMenuItem)
+		let preferredAccountID = AppDefaults.shared.addFolderAccountID
+		for account in allowedAccountsForFolderCreation() {
+			let menuItem = addMenuItem(to: menu, for: account)
+			if account.accountID == preferredAccountID {
+				accountPopupButton.select(menuItem)
 			}
 		}
 	}
@@ -98,6 +90,21 @@ extension AddFolderWindowController: NSTextFieldDelegate {
 
 private extension AddFolderWindowController {
 
+	func allowedAccountsForFolderCreation() -> [Account] {
+		AccountManager.shared.sortedActiveAccounts.filter { account in
+			!account.behaviors.contains(.disallowFolderManagement)
+		}
+	}
+
+	@discardableResult
+	func addMenuItem(to menu: NSMenu, for account: Account) -> NSMenuItem {
+		let menuItem = NSMenuItem()
+		menuItem.title = account.nameForDisplay
+		menuItem.representedObject = account
+		menu.addItem(menuItem)
+		return menuItem
+	}
+
 	private func addFolderIfNeeded() {
 		guard let menuItem = accountPopupButton.selectedItem else {
 			return

Mac/MainWindow/MainWindowController.swift

@@ -555,11 +555,11 @@ final class MainWindowController: NSWindowController, NSUserInterfaceValidations
 	}
 
 	@IBAction func toggleReadFeedsFilter(_ sender: Any?) {
-		sidebarViewController?.toggleReadFilter()
+		toggleGlobalReadFilter()
 	}
 
 	@IBAction func toggleReadArticlesFilter(_ sender: Any?) {
-		timelineContainerViewController?.toggleReadFilter()
+		toggleGlobalReadFilter()
 	}
 
 	@objc func selectArticleTheme(_ menuItem: NSMenuItem) {
@@ -1045,6 +1045,7 @@ private extension MainWindowController {
 		sidebarViewController?.restoreState(from: state.sidebarWindowState)
 
 		timelineContainerViewController?.restoreState(from: state.timelineWindowState)
+		syncSidebarReadFilter()
 		restoreArticleWindowScrollY = state.detailWindowState?.windowScrollY
 
 		let isShowingExtractedArticle = state.detailWindowState?.isShowingExtractedArticle ?? false
@@ -1071,6 +1072,7 @@ private extension MainWindowController {
 		let articleWindowScrollY = state[UserInfoKey.articleWindowScrollY] as? CGFloat
 		restoreArticleWindowScrollY = articleWindowScrollY
 		timelineContainerViewController?.restoreLegacyState(from: state)
+		syncSidebarReadFilter()
 
 		let isShowingExtractedArticle = state[UserInfoKey.isShowingExtractedArticle] as? Bool ?? false
 		if isShowingExtractedArticle {
@@ -1081,6 +1083,20 @@ private extension MainWindowController {
 
 	// MARK: - Command Validation
 
+	func syncSidebarReadFilter() {
+		let isReadFiltered = AppDefaults.shared.timelineReadFilterEnabled
+		sidebarViewController?.setReadFilterEnabled(isReadFiltered)
+		timelineContainerViewController?.setReadFilterEnabled(isReadFiltered)
+	}
+
+	func toggleGlobalReadFilter() {
+		let newValue = !AppDefaults.shared.timelineReadFilterEnabled
+		AppDefaults.shared.timelineReadFilterEnabled = newValue
+		syncSidebarReadFilter()
+		makeToolbarValidate()
+		invalidateRestorableState()
+	}
+
 	func canCopyArticleURL() -> Bool {
 		guard let selectedArticles else {
 			return false
@@ -1249,22 +1265,14 @@ private extension MainWindowController {
 
 		let showCommand = NSLocalizedString("Show Read Feeds", comment: "Command")
 		let hideCommand = NSLocalizedString("Hide Read Feeds", comment: "Command")
-		menuItem.title = sidebarViewController?.isReadFiltered ?? false ? showCommand : hideCommand
+		menuItem.title = AppDefaults.shared.timelineReadFilterEnabled ? showCommand : hideCommand
 		return true
 	}
 
 	func validateToggleReadArticles(_ item: NSValidatedUserInterfaceItem) -> Bool {
 		let showCommand = NSLocalizedString("Show Read Articles", comment: "Command")
 		let hideCommand = NSLocalizedString("Hide Read Articles", comment: "Command")
-
-		guard let isReadFiltered = timelineContainerViewController?.isReadFiltered else {
-			(item as? NSMenuItem)?.title = hideCommand
-			if let toolbarItem = item as? NSToolbarItem, let button = toolbarItem.view as? NSButton {
-				toolbarItem.toolTip = hideCommand
-				button.image = Assets.Images.filterInactive
-			}
-			return false
-		}
+		let isReadFiltered = AppDefaults.shared.timelineReadFilterEnabled
 
 		if isReadFiltered {
 			(item as? NSMenuItem)?.title = showCommand

Mac/MainWindow/OPML/ImportOPMLWindowController.swift

@@ -32,19 +32,20 @@ final class ImportOPMLWindowController: NSWindowController {
 			if oneAccount.behaviors.contains(.disallowOPMLImports) {
 				continue
 			}
-			addMenuItem(to: menu, for: oneAccount, savedAccountID: savedAccountID)
+			let menuItem = addMenuItem(to: menu, for: oneAccount)
+			if oneAccount.accountID == savedAccountID {
+				accountPopUpButton.select(menuItem)
+			}
 		}
 	}
 
-	private func addMenuItem(to menu: NSMenu, for account: Account, savedAccountID: String?) {
+	@discardableResult
+	private func addMenuItem(to menu: NSMenu, for account: Account) -> NSMenuItem {
 		let menuItem = NSMenuItem()
 		menuItem.title = account.nameForDisplay
 		menuItem.representedObject = account
 		menu.addItem(menuItem)
-
-		if account.accountID == savedAccountID {
-			accountPopUpButton.select(menuItem)
-		}
+		return menuItem
 	}
 
 	// MARK: API

Mac/MainWindow/Sidebar/SidebarViewController.swift

@@ -47,9 +47,10 @@ extension Notification.Name {
 
 	var isReadFiltered: Bool {
 		get {
-			return treeControllerDelegate.isReadFiltered
+			return AppDefaults.shared.timelineReadFilterEnabled
 		}
 		set {
+			AppDefaults.shared.timelineReadFilterEnabled = newValue
 			treeControllerDelegate.isReadFiltered = newValue
 		}
 	}
@@ -69,6 +70,7 @@ extension Notification.Name {
 	// MARK: - NSViewController
 
 	override func viewDidLoad() {
+		treeControllerDelegate.isReadFiltered = isReadFiltered
 		outlineView.dataSource = dataSource
 		outlineView.doubleAction = #selector(doubleClickedSidebar(_:))
 		outlineView.setDraggingSourceOperationMask([.move, .copy], forLocal: true)
@@ -518,15 +520,19 @@ extension Notification.Name {
 	}
 
 	func toggleReadFilter() {
-		if treeControllerDelegate.isReadFiltered {
-			isReadFiltered = false
-		} else {
-			isReadFiltered = true
-		}
+		isReadFiltered.toggle()
 		delegate?.sidebarInvalidatedRestorationState(self)
 		rebuildTreeAndRestoreSelection()
 	}
 
+	func setReadFilterEnabled(_ isEnabled: Bool) {
+		guard treeControllerDelegate.isReadFiltered != isEnabled else {
+			return
+		}
+		isReadFiltered = isEnabled
+		rebuildTreeAndRestoreSelection()
+	}
+
 }
 
 // MARK: - NSUserInterfaceValidations
@@ -629,6 +635,7 @@ private extension SidebarViewController {
 
 	func rebuildTreeAndReloadDataIfNeeded() {
 		if !animatingChanges && !BatchUpdate.shared.isPerforming {
+			treeControllerDelegate.isReadFiltered = isReadFiltered
 			addAllSelectedToFilterExceptions()
 			treeController.rebuild()
 			treeControllerDelegate.resetFilterExceptions()

Mac/MainWindow/Timeline/TimelineContainerViewController.swift

@@ -130,6 +130,11 @@ final class TimelineContainerViewController: NSViewController {
 		updateReadFilterButton()
 	}
 
+	func setReadFilterEnabled(_ isEnabled: Bool) {
+		regularTimelineViewController.setReadFilterEnabled(isEnabled)
+		updateReadFilterButton()
+	}
+
 	// MARK: State Restoration
 
 	func restoreState(from state: TimelineWindowState?) {