Add double tap top focus search bar for iPad
This commit is contained in:
parent
cfcf20d899
commit
450edb0574
|
@ -12,6 +12,7 @@ import MastodonCore
|
||||||
|
|
||||||
protocol ContentSplitViewControllerDelegate: AnyObject {
|
protocol ContentSplitViewControllerDelegate: AnyObject {
|
||||||
func contentSplitViewController(_ contentSplitViewController: ContentSplitViewController, sidebarViewController: SidebarViewController, didSelectTab tab: MainTabBarController.Tab)
|
func contentSplitViewController(_ contentSplitViewController: ContentSplitViewController, sidebarViewController: SidebarViewController, didSelectTab tab: MainTabBarController.Tab)
|
||||||
|
func contentSplitViewController(_ contentSplitViewController: ContentSplitViewController, sidebarViewController: SidebarViewController, didDoubleTapTab tab: MainTabBarController.Tab)
|
||||||
}
|
}
|
||||||
|
|
||||||
final class ContentSplitViewController: UIViewController, NeedsDependency {
|
final class ContentSplitViewController: UIViewController, NeedsDependency {
|
||||||
|
@ -121,16 +122,7 @@ extension ContentSplitViewController: SidebarViewControllerDelegate {
|
||||||
}
|
}
|
||||||
|
|
||||||
func sidebarViewController(_ sidebarViewController: SidebarViewController, didDoubleTapItem item: SidebarViewModel.Item, sourceView: UIView) {
|
func sidebarViewController(_ sidebarViewController: SidebarViewController, didDoubleTapItem item: SidebarViewModel.Item, sourceView: UIView) {
|
||||||
guard case let .tab(tab) = item, tab == .me else { return }
|
guard case let .tab(tab) = item else { return }
|
||||||
guard let authContext = authContext else { return }
|
delegate?.contentSplitViewController(self, sidebarViewController: sidebarViewController, didDoubleTapTab: tab)
|
||||||
assert(Thread.isMainThread)
|
|
||||||
|
|
||||||
guard let nextAccount = context.nextAccount(in: authContext) else { return }
|
|
||||||
|
|
||||||
Task { @MainActor in
|
|
||||||
let isActive = try await context.authenticationService.activeMastodonUser(domain: nextAccount.domain, userID: nextAccount.userID)
|
|
||||||
guard isActive else { return }
|
|
||||||
self.coordinator.setup()
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -157,6 +157,24 @@ extension RootSplitViewController: ContentSplitViewControllerDelegate {
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func contentSplitViewController(_ contentSplitViewController: ContentSplitViewController, sidebarViewController: SidebarViewController, didDoubleTapTab tab: MainTabBarController.Tab) {
|
||||||
|
guard let _ = MainTabBarController.Tab.allCases.firstIndex(of: tab) else {
|
||||||
|
assertionFailure()
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
switch tab {
|
||||||
|
case .search:
|
||||||
|
// allow double tap to focus search bar only when is not primary display (iPad potrait)
|
||||||
|
guard !isPrimaryDisplay else {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
contentSplitViewController.mainTabBarController.searchViewController?.searchBar.becomeFirstResponder()
|
||||||
|
default:
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// MARK: - UISplitViewControllerDelegate
|
// MARK: - UISplitViewControllerDelegate
|
||||||
|
|
|
@ -128,13 +128,12 @@ extension SidebarViewController {
|
||||||
sidebarLongPressGestureRecognizer.addTarget(self, action: #selector(SidebarViewController.sidebarLongPressGestureRecognizerHandler(_:)))
|
sidebarLongPressGestureRecognizer.addTarget(self, action: #selector(SidebarViewController.sidebarLongPressGestureRecognizerHandler(_:)))
|
||||||
collectionView.addGestureRecognizer(sidebarLongPressGestureRecognizer)
|
collectionView.addGestureRecognizer(sidebarLongPressGestureRecognizer)
|
||||||
|
|
||||||
// todo: reconsider the "double tap to change account" feature -> https://github.com/mastodon/mastodon-ios/issues/628
|
let sidebarDoubleTapGestureRecognizer = UITapGestureRecognizer()
|
||||||
// let sidebarDoubleTapGestureRecognizer = UITapGestureRecognizer()
|
sidebarDoubleTapGestureRecognizer.numberOfTapsRequired = 2
|
||||||
// sidebarDoubleTapGestureRecognizer.numberOfTapsRequired = 2
|
sidebarDoubleTapGestureRecognizer.addTarget(self, action: #selector(SidebarViewController.sidebarDoubleTapGestureRecognizerHandler(_:)))
|
||||||
// sidebarDoubleTapGestureRecognizer.addTarget(self, action: #selector(SidebarViewController.sidebarDoubleTapGestureRecognizerHandler(_:)))
|
sidebarDoubleTapGestureRecognizer.delaysTouchesEnded = false
|
||||||
// sidebarDoubleTapGestureRecognizer.delaysTouchesEnded = false
|
sidebarDoubleTapGestureRecognizer.cancelsTouchesInView = true
|
||||||
// sidebarDoubleTapGestureRecognizer.cancelsTouchesInView = true
|
collectionView.addGestureRecognizer(sidebarDoubleTapGestureRecognizer)
|
||||||
// collectionView.addGestureRecognizer(sidebarDoubleTapGestureRecognizer)
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue