renun/NetNewsWire
1
0
Fork 0
mirror of https://github.com/Ranchero-Software/NetNewsWire synced 2025-08-12 06:26:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make animations individually selectable and no longer animate navigation selections. Issue #1439

Browse Source
This commit is contained in:
Maurice Parker
2020-01-27 21:57:52 -07:00
parent 118ecd01b0
commit 6ac6136612
7 changed files with 126 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
iOS/MasterTimeline/MasterTimelineViewController.swift
View File

@@ -172,7 +172,7 @@ class MasterTimelineViewController: UITableViewController, UndoableCommandRunner
func restoreSelectionIfNecessary(adjustScroll: Bool) {
if let article = coordinator.currentArticle, let indexPath = dataSource.indexPath(for: article) {
if adjustScroll {
tableView.selectRowAndScrollIfNotVisible(at: indexPath, animated: false)
tableView.selectRowAndScrollIfNotVisible(at: indexPath, animations: [])
} else {
tableView.selectRow(at: indexPath, animated: false, scrollPosition: .none)
}
@@ -187,13 +187,13 @@ class MasterTimelineViewController: UITableViewController, UndoableCommandRunner
applyChanges(animated: animated)
}
func updateArticleSelection(animated: Bool) {
func updateArticleSelection(animations: Animations) {
if let article = coordinator.currentArticle, let indexPath = dataSource.indexPath(for: article) {
if tableView.indexPathForSelectedRow != indexPath {
tableView.selectRowAndScrollIfNotVisible(at: indexPath, animated: true)
tableView.selectRowAndScrollIfNotVisible(at: indexPath, animations: animations)
}
} else {
tableView.selectRow(at: nil, animated: animated, scrollPosition: .none)
tableView.selectRow(at: nil, animated: animations.contains(.select), scrollPosition: .none)
}
updateUI()
@@ -359,7 +359,7 @@ class MasterTimelineViewController: UITableViewController, UndoableCommandRunner
override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
becomeFirstResponder()
let article = dataSource.itemIdentifier(for: indexPath)
coordinator.selectArticle(article, animated: true)
coordinator.selectArticle(article, animations: [.scroll, .select, .navigation])
}
override func scrollViewDidScroll(_ scrollView: UIScrollView) {
@@ -773,7 +773,7 @@ private extension MasterTimelineViewController {
let title = NSLocalizedString("Go to Feed", comment: "Go to Feed")
let action = UIAction(title: title, image: AppAssets.openInSidebarImage) { [weak self] action in
self?.coordinator.discloseFeed(webFeed, animated: true)
self?.coordinator.discloseFeed(webFeed, animations: [.scroll, .navigation])
}
return action
}
@@ -783,7 +783,7 @@ private extension MasterTimelineViewController {
let title = NSLocalizedString("Go to Feed", comment: "Go to Feed")
let action = UIAlertAction(title: title, style: .default) { [weak self] action in
self?.coordinator.discloseFeed(webFeed, animated: true)
self?.coordinator.discloseFeed(webFeed, animations: [.scroll, .navigation])
completion(true)
}
return action