From c487167bb67da659c07e5d7614a0dcf76963d3f3 Mon Sep 17 00:00:00 2001 From: Kaiser Date: Tue, 10 Dec 2024 16:33:27 -0500 Subject: [PATCH 1/4] correct method signature --- iOS/SceneCoordinator.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/iOS/SceneCoordinator.swift b/iOS/SceneCoordinator.swift index 7983070c9..24135733a 100644 --- a/iOS/SceneCoordinator.swift +++ b/iOS/SceneCoordinator.swift @@ -1468,7 +1468,7 @@ private extension SceneCoordinator { }) } - func addToFilterExeptionsIfNecessary(_ feed: SidebarItem?) { + func addToFilterExceptionsIfNecessary(_ feed: SidebarItem?) { if isReadFeedsFiltered, let feedID = feed?.sidebarItemID { if feed is SmartFeed { treeControllerDelegate.addFilterException(feedID) From 2eccc391765b2acf8411a59b0425881e94ee4529 Mon Sep 17 00:00:00 2001 From: Kaiser Date: Tue, 10 Dec 2024 19:28:27 -0500 Subject: [PATCH 2/4] correct view controller identifier that's set on add storyboard --- iOS/SceneCoordinator.swift | 3 +-- iOS/Settings/SettingsViewController.swift | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/iOS/SceneCoordinator.swift b/iOS/SceneCoordinator.swift index 7983070c9..a162d1d98 100644 --- a/iOS/SceneCoordinator.swift +++ b/iOS/SceneCoordinator.swift @@ -1219,8 +1219,7 @@ class SceneCoordinator: NSObject, UndoableCommandRunner { // Since Add Feed can be opened from anywhere with a keyboard shortcut, we have to deselect any currently selected feeds selectFeed(nil) - let addNavViewController = UIStoryboard.add.instantiateViewController(withIdentifier: "AddFeedViewControllerNav") as! UINavigationController - + let addNavViewController = UIStoryboard.add.instantiateViewController(withIdentifier: "AddWebFeedViewControllerNav") as! UINavigationController let addViewController = addNavViewController.topViewController as! AddFeedViewController addViewController.initialFeed = initialFeed addViewController.initialFeedName = initialFeedName diff --git a/iOS/Settings/SettingsViewController.swift b/iOS/Settings/SettingsViewController.swift index b40381773..568137360 100644 --- a/iOS/Settings/SettingsViewController.swift +++ b/iOS/Settings/SettingsViewController.swift @@ -372,7 +372,7 @@ private extension SettingsViewController { func addFeed() { self.dismiss(animated: true) - let addNavViewController = UIStoryboard.add.instantiateViewController(withIdentifier: "AddFeedViewControllerNav") as! UINavigationController + let addNavViewController = UIStoryboard.add.instantiateViewController(withIdentifier: "AddWebFeedViewControllerNav") as! UINavigationController let addViewController = addNavViewController.topViewController as! AddFeedViewController addViewController.initialFeed = AccountManager.netNewsWireNewsURL addViewController.initialFeedName = NSLocalizedString("NetNewsWire News", comment: "NetNewsWire News") From 651bda70a75e2527ed99b6444266f274eeefd8f7 Mon Sep 17 00:00:00 2001 From: Kaiser Date: Tue, 10 Dec 2024 19:42:36 -0500 Subject: [PATCH 3/4] update add storyboard for identifier reference in code: SettingsViewController.swift L:375 --- iOS/Add/Add.storyboard | 4 ++-- iOS/SceneCoordinator.swift | 2 +- iOS/Settings/SettingsViewController.swift | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/iOS/Add/Add.storyboard b/iOS/Add/Add.storyboard index d59b587df..6426ac674 100644 --- a/iOS/Add/Add.storyboard +++ b/iOS/Add/Add.storyboard @@ -142,7 +142,7 @@ - + @@ -254,7 +254,7 @@ - + diff --git a/iOS/SceneCoordinator.swift b/iOS/SceneCoordinator.swift index a162d1d98..8b4050dc9 100644 --- a/iOS/SceneCoordinator.swift +++ b/iOS/SceneCoordinator.swift @@ -1219,7 +1219,7 @@ class SceneCoordinator: NSObject, UndoableCommandRunner { // Since Add Feed can be opened from anywhere with a keyboard shortcut, we have to deselect any currently selected feeds selectFeed(nil) - let addNavViewController = UIStoryboard.add.instantiateViewController(withIdentifier: "AddWebFeedViewControllerNav") as! UINavigationController + let addNavViewController = UIStoryboard.add.instantiateViewController(withIdentifier: "AddFeedViewControllerNav") as! UINavigationController let addViewController = addNavViewController.topViewController as! AddFeedViewController addViewController.initialFeed = initialFeed addViewController.initialFeedName = initialFeedName diff --git a/iOS/Settings/SettingsViewController.swift b/iOS/Settings/SettingsViewController.swift index 568137360..b40381773 100644 --- a/iOS/Settings/SettingsViewController.swift +++ b/iOS/Settings/SettingsViewController.swift @@ -372,7 +372,7 @@ private extension SettingsViewController { func addFeed() { self.dismiss(animated: true) - let addNavViewController = UIStoryboard.add.instantiateViewController(withIdentifier: "AddWebFeedViewControllerNav") as! UINavigationController + let addNavViewController = UIStoryboard.add.instantiateViewController(withIdentifier: "AddFeedViewControllerNav") as! UINavigationController let addViewController = addNavViewController.topViewController as! AddFeedViewController addViewController.initialFeed = AccountManager.netNewsWireNewsURL addViewController.initialFeedName = NSLocalizedString("NetNewsWire News", comment: "NetNewsWire News") From 62137e53f357c9d55c2975d2c855461676f0d6b9 Mon Sep 17 00:00:00 2001 From: Kaiser Date: Tue, 10 Dec 2024 19:46:36 -0500 Subject: [PATCH 4/4] revert unwanted change --- iOS/SceneCoordinator.swift | 1 + 1 file changed, 1 insertion(+) diff --git a/iOS/SceneCoordinator.swift b/iOS/SceneCoordinator.swift index 8b4050dc9..7983070c9 100644 --- a/iOS/SceneCoordinator.swift +++ b/iOS/SceneCoordinator.swift @@ -1220,6 +1220,7 @@ class SceneCoordinator: NSObject, UndoableCommandRunner { selectFeed(nil) let addNavViewController = UIStoryboard.add.instantiateViewController(withIdentifier: "AddFeedViewControllerNav") as! UINavigationController + let addViewController = addNavViewController.topViewController as! AddFeedViewController addViewController.initialFeed = initialFeed addViewController.initialFeedName = initialFeedName