FreshRSS/NetNewsWire
1
0
Fork 0
mirror of https://github.com/Ranchero-Software/NetNewsWire.git synced 2025-02-02 20:16:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

Removes need for dispatchAsync delay

Browse Source
This commit is contained in:
Stuart Breckenridge 2020-11-19 12:17:29 +08:00
parent 0b4640db04
commit 361ca85762
2 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
iOS/SceneCoordinator.swift
View File

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

18
iOS/SceneDelegate.swift
View File

@ -105,10 +105,8 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
if AccountManager.shared.isSuspended {
AccountManager.shared.resumeAll()
}
self.coordinator.selectAllUnreadFeed(completion: {
DispatchQueue.main.asyncAfter(deadline: .now() + 0.5, execute: {
self.coordinator.selectArticleInCurrentFeed(id!)
})
self.coordinator.selectFeed(SmartFeedsController.shared.unreadFeed, completion: {
self.coordinator.selectArticleInCurrentFeed(id!)
})
} else {
self.coordinator.selectAllUnreadFeed()
@ -123,10 +121,8 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
if AccountManager.shared.isSuspended {
AccountManager.shared.resumeAll()
}
self.coordinator.selectTodayFeed(completion: {
DispatchQueue.main.asyncAfter(deadline: .now() + 0.5, execute: {
self.coordinator.selectArticleInCurrentFeed(id!)
})
self.coordinator.selectFeed(SmartFeedsController.shared.todayFeed, completion: {
self.coordinator.selectArticleInCurrentFeed(id!)
})
} else {
self.coordinator.selectTodayFeed()
@ -141,10 +137,8 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
if AccountManager.shared.isSuspended {
AccountManager.shared.resumeAll()
}
self.coordinator.selectStarredFeed(completion: {
DispatchQueue.main.asyncAfter(deadline: .now() + 0.5, execute: {
self.coordinator.selectArticleInCurrentFeed(id!)
})
self.coordinator.selectFeed(SmartFeedsController.shared.starredFeed, completion: {
self.coordinator.selectArticleInCurrentFeed(id!)
})
} else {
self.coordinator.selectStarredFeed()