forked from shadowfacts/Tusker
Support tapping selected sidebar item to scroll to top
This commit is contained in:
parent
d6faf3a37b
commit
f5704e561b
|
@ -15,6 +15,7 @@ protocol MainSidebarViewControllerDelegate: AnyObject {
|
|||
func sidebarRequestPresentCompose(_ sidebarViewController: MainSidebarViewController)
|
||||
func sidebar(_ sidebarViewController: MainSidebarViewController, didSelectItem item: MainSidebarViewController.Item)
|
||||
func sidebar(_ sidebarViewController: MainSidebarViewController, showViewController viewController: UIViewController)
|
||||
func sidebar(_ sidebarViewController: MainSidebarViewController, scrollToTopFor item: MainSidebarViewController.Item)
|
||||
}
|
||||
|
||||
class MainSidebarViewController: UIViewController {
|
||||
|
@ -451,7 +452,9 @@ extension MainSidebarViewController: UICollectionViewDelegate {
|
|||
return
|
||||
}
|
||||
itemLastSelectedTimestamps[item] = Date()
|
||||
if [MainSidebarViewController.Item.tab(.compose), .addList, .addSavedHashtag, .addSavedInstance].contains(item) {
|
||||
if previouslySelectedItem == item {
|
||||
sidebarDelegate?.sidebar(self, scrollToTopFor: item)
|
||||
} else if [MainSidebarViewController.Item.tab(.compose), .addList, .addSavedHashtag, .addSavedInstance].contains(item) {
|
||||
if let previous = previouslySelectedItem, let indexPath = dataSource.indexPath(for: previous) {
|
||||
collectionView.selectItem(at: indexPath, animated: false, scrollPosition: .centeredVertically)
|
||||
}
|
||||
|
|
|
@ -478,6 +478,10 @@ extension MainSplitViewController: MainSidebarViewControllerDelegate {
|
|||
}
|
||||
secondaryNavController.viewControllers = [viewController]
|
||||
}
|
||||
|
||||
func sidebar(_ sidebarViewController: MainSidebarViewController, scrollToTopFor item: MainSidebarViewController.Item) {
|
||||
(secondaryNavController as? TabBarScrollableViewController)?.tabBarScrollToTop()
|
||||
}
|
||||
}
|
||||
|
||||
fileprivate extension MainSidebarViewController.Item {
|
||||
|
|
|
@ -258,6 +258,12 @@ class SplitNavigationController: UIViewController {
|
|||
}
|
||||
}
|
||||
|
||||
extension SplitNavigationController: TabBarScrollableViewController {
|
||||
func tabBarScrollToTop() {
|
||||
(viewControllers.last as? TabBarScrollableViewController)?.tabBarScrollToTop()
|
||||
}
|
||||
}
|
||||
|
||||
extension SplitNavigationController: StatusBarTappableViewController {
|
||||
func handleStatusBarTapped(xPosition: CGFloat) -> StatusBarTapActionResult {
|
||||
let vcs = viewControllers
|
||||
|
|
Loading…
Reference in New Issue