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

Invalidate user activities when collapsed and returning to Feeds scene

Browse Source
This commit is contained in:
Maurice Parker 2019-09-01 15:31:11 -05:00
parent 1a9acdcc50
commit 189af8d816
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Shared/Activity/ActivityManager.swift
View File

@ -29,6 +29,13 @@ class ActivityManager {
NotificationCenter.default.addObserver(self, selector: #selector(feedIconDidBecomeAvailable(_:)), name: .FeedIconDidBecomeAvailable, object: nil) NotificationCenter.default.addObserver(self, selector: #selector(feedIconDidBecomeAvailable(_:)), name: .FeedIconDidBecomeAvailable, object: nil)
} }
func invalidateCurrentActivities() {
readingActivity?.invalidate()
readingActivity = nil
selectingActivity?.invalidate()
selectingActivity = nil
}
func selectingToday() { func selectingToday() {
let title = NSLocalizedString("See articles for Today", comment: "Today") let title = NSLocalizedString("See articles for Today", comment: "Today")
selectingActivity = makeSelectingActivity(type: ActivityType.selectToday, title: title, identifier: "smartfeed.today") selectingActivity = makeSelectingActivity(type: ActivityType.selectToday, title: title, identifier: "smartfeed.today")

11
iOS/SceneCoordinator.swift
View File

@ -253,6 +253,7 @@ class SceneCoordinator: NSObject, UndoableCommandRunner, UnreadCountProvider {
rootSplitViewController.delegate = self rootSplitViewController.delegate = self
masterNavigationController = (rootSplitViewController.viewControllers.first as! UINavigationController) masterNavigationController = (rootSplitViewController.viewControllers.first as! UINavigationController)
masterNavigationController.delegate = self
masterFeedViewController = UIStoryboard.main.instantiateController(ofType: MasterFeedViewController.self) masterFeedViewController = UIStoryboard.main.instantiateController(ofType: MasterFeedViewController.self)
masterFeedViewController.coordinator = self masterFeedViewController.coordinator = self
@ -784,6 +785,16 @@ extension SceneCoordinator: UISplitViewControllerDelegate {
} }
// MARK: UINavigationControllerDelegate
extension SceneCoordinator: UINavigationControllerDelegate {
func navigationController(_ navigationController: UINavigationController, didShow viewController: UIViewController, animated: Bool) {
if rootSplitViewController.isCollapsed && viewController === masterFeedViewController {
activityManager.invalidateCurrentActivities()
}
}
}
// MARK: Private // MARK: Private
private extension SceneCoordinator { private extension SceneCoordinator {