FreshRSS/NetNewsWire
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change how smart feeds are shown so that they appear even if they have been filtered

Browse Source
This commit is contained in:
Maurice Parker 2020-11-19 05:23:07 -06:00
parent 63660d7b7d
commit 1a65211f19
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
iOS/SceneCoordinator.swift
View File

@ -807,24 +807,24 @@ class SceneCoordinator: NSObject, UndoableCommandRunner, UnreadCountProvider {
} }
} }
func selectTodayFeed() { func selectTodayFeed(completion: (() -> Void)? = nil) {
markExpanded(SmartFeedsController.shared) markExpanded(SmartFeedsController.shared)
self.ensureFeedIsAvailableToSelect(SmartFeedsController.shared.todayFeed) { self.ensureFeedIsAvailableToSelect(SmartFeedsController.shared.todayFeed) {
self.selectFeed(SmartFeedsController.shared.todayFeed, animations: [.navigation, .scroll]) self.selectFeed(SmartFeedsController.shared.todayFeed, animations: [.navigation, .scroll], completion: completion)
} }
} }
func selectAllUnreadFeed() { func selectAllUnreadFeed(completion: (() -> Void)? = nil) {
markExpanded(SmartFeedsController.shared) markExpanded(SmartFeedsController.shared)
self.ensureFeedIsAvailableToSelect(SmartFeedsController.shared.unreadFeed) { self.ensureFeedIsAvailableToSelect(SmartFeedsController.shared.unreadFeed) {
self.selectFeed(SmartFeedsController.shared.unreadFeed, animations: [.navigation, .scroll]) self.selectFeed(SmartFeedsController.shared.unreadFeed, animations: [.navigation, .scroll], completion: completion)
} }
} }
func selectStarredFeed() { func selectStarredFeed(completion: (() -> Void)? = nil) {
markExpanded(SmartFeedsController.shared) markExpanded(SmartFeedsController.shared)
self.ensureFeedIsAvailableToSelect(SmartFeedsController.shared.starredFeed) { self.ensureFeedIsAvailableToSelect(SmartFeedsController.shared.starredFeed) {
self.selectFeed(SmartFeedsController.shared.starredFeed, animations: [.navigation, .scroll]) self.selectFeed(SmartFeedsController.shared.starredFeed, animations: [.navigation, .scroll], completion: completion)
} }
} }

12
iOS/SceneDelegate.swift
View File

@ -111,9 +111,9 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
if AccountManager.shared.isSuspended { if AccountManager.shared.isSuspended {
AccountManager.shared.resumeAll() AccountManager.shared.resumeAll()
} }
self.coordinator.selectFeed(SmartFeedsController.shared.unreadFeed, completion: { self.coordinator.selectAllUnreadFeed() {
self.coordinator.selectArticleInCurrentFeed(id!) self.coordinator.selectArticleInCurrentFeed(id!)
}) }
} else { } else {
self.coordinator.selectAllUnreadFeed() self.coordinator.selectAllUnreadFeed()
} }
@ -127,9 +127,9 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
if AccountManager.shared.isSuspended { if AccountManager.shared.isSuspended {
AccountManager.shared.resumeAll() AccountManager.shared.resumeAll()
} }
self.coordinator.selectFeed(SmartFeedsController.shared.todayFeed, completion: { self.coordinator.selectTodayFeed() {
self.coordinator.selectArticleInCurrentFeed(id!) self.coordinator.selectArticleInCurrentFeed(id!)
}) }
} else { } else {
self.coordinator.selectTodayFeed() self.coordinator.selectTodayFeed()
} }
@ -143,9 +143,9 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
if AccountManager.shared.isSuspended { if AccountManager.shared.isSuspended {
AccountManager.shared.resumeAll() AccountManager.shared.resumeAll()
} }
self.coordinator.selectFeed(SmartFeedsController.shared.starredFeed, completion: { self.coordinator.selectStarredFeed() {
self.coordinator.selectArticleInCurrentFeed(id!) self.coordinator.selectArticleInCurrentFeed(id!)
}) }
} else { } else {
self.coordinator.selectStarredFeed() self.coordinator.selectStarredFeed()
} }