From 3020f28ef42d204bf184f5426e6d0f1649d67388 Mon Sep 17 00:00:00 2001 From: Marcus Kida Date: Fri, 18 Nov 2022 09:40:45 +0100 Subject: [PATCH 1/2] chore: Disable double-tap-to-switch-account --- .../Scene/Root/MainTab/MainTabBarController.swift | 11 ++++++----- .../Scene/Root/Sidebar/SidebarViewController.swift | 13 +++++++------ 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/Mastodon/Scene/Root/MainTab/MainTabBarController.swift b/Mastodon/Scene/Root/MainTab/MainTabBarController.swift index d31cc5c84..7f7918732 100644 --- a/Mastodon/Scene/Root/MainTab/MainTabBarController.swift +++ b/Mastodon/Scene/Root/MainTab/MainTabBarController.swift @@ -326,11 +326,12 @@ extension MainTabBarController { tabBarLongPressGestureRecognizer.addTarget(self, action: #selector(MainTabBarController.tabBarLongPressGestureRecognizerHandler(_:))) tabBar.addGestureRecognizer(tabBarLongPressGestureRecognizer) - let tabBarDoubleTapGestureRecognizer = UITapGestureRecognizer() - tabBarDoubleTapGestureRecognizer.numberOfTapsRequired = 2 - tabBarDoubleTapGestureRecognizer.addTarget(self, action: #selector(MainTabBarController.tabBarDoubleTapGestureRecognizerHandler(_:))) - tabBarDoubleTapGestureRecognizer.delaysTouchesEnded = false - tabBar.addGestureRecognizer(tabBarDoubleTapGestureRecognizer) + // todo: reconsider the "double tap to change account" feature +// let tabBarDoubleTapGestureRecognizer = UITapGestureRecognizer() +// tabBarDoubleTapGestureRecognizer.numberOfTapsRequired = 2 +// tabBarDoubleTapGestureRecognizer.addTarget(self, action: #selector(MainTabBarController.tabBarDoubleTapGestureRecognizerHandler(_:))) +// tabBarDoubleTapGestureRecognizer.delaysTouchesEnded = false +// tabBar.addGestureRecognizer(tabBarDoubleTapGestureRecognizer) self.isReadyForWizardAvatarButton = authContext != nil diff --git a/Mastodon/Scene/Root/Sidebar/SidebarViewController.swift b/Mastodon/Scene/Root/Sidebar/SidebarViewController.swift index 8a0ed763a..0bb88c7c6 100644 --- a/Mastodon/Scene/Root/Sidebar/SidebarViewController.swift +++ b/Mastodon/Scene/Root/Sidebar/SidebarViewController.swift @@ -145,12 +145,13 @@ extension SidebarViewController { sidebarLongPressGestureRecognizer.addTarget(self, action: #selector(SidebarViewController.sidebarLongPressGestureRecognizerHandler(_:))) collectionView.addGestureRecognizer(sidebarLongPressGestureRecognizer) - let sidebarDoubleTapGestureRecognizer = UITapGestureRecognizer() - sidebarDoubleTapGestureRecognizer.numberOfTapsRequired = 2 - sidebarDoubleTapGestureRecognizer.addTarget(self, action: #selector(SidebarViewController.sidebarDoubleTapGestureRecognizerHandler(_:))) - sidebarDoubleTapGestureRecognizer.delaysTouchesEnded = false - sidebarDoubleTapGestureRecognizer.cancelsTouchesInView = true - collectionView.addGestureRecognizer(sidebarDoubleTapGestureRecognizer) + // todo: reconsider the "double tap to change account" feature +// let sidebarDoubleTapGestureRecognizer = UITapGestureRecognizer() +// sidebarDoubleTapGestureRecognizer.numberOfTapsRequired = 2 +// sidebarDoubleTapGestureRecognizer.addTarget(self, action: #selector(SidebarViewController.sidebarDoubleTapGestureRecognizerHandler(_:))) +// sidebarDoubleTapGestureRecognizer.delaysTouchesEnded = false +// sidebarDoubleTapGestureRecognizer.cancelsTouchesInView = true +// collectionView.addGestureRecognizer(sidebarDoubleTapGestureRecognizer) } From 4cc734fac9b3790a08d1e643a3cfd43ababd8ac7 Mon Sep 17 00:00:00 2001 From: Marcus Kida Date: Fri, 18 Nov 2022 09:56:02 +0100 Subject: [PATCH 2/2] chore: Link related GitHub issue to commented-out code --- Mastodon/Scene/Root/MainTab/MainTabBarController.swift | 2 +- Mastodon/Scene/Root/Sidebar/SidebarViewController.swift | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Mastodon/Scene/Root/MainTab/MainTabBarController.swift b/Mastodon/Scene/Root/MainTab/MainTabBarController.swift index 7f7918732..9728c551a 100644 --- a/Mastodon/Scene/Root/MainTab/MainTabBarController.swift +++ b/Mastodon/Scene/Root/MainTab/MainTabBarController.swift @@ -326,7 +326,7 @@ extension MainTabBarController { tabBarLongPressGestureRecognizer.addTarget(self, action: #selector(MainTabBarController.tabBarLongPressGestureRecognizerHandler(_:))) tabBar.addGestureRecognizer(tabBarLongPressGestureRecognizer) - // todo: reconsider the "double tap to change account" feature + // todo: reconsider the "double tap to change account" feature -> https://github.com/mastodon/mastodon-ios/issues/628 // let tabBarDoubleTapGestureRecognizer = UITapGestureRecognizer() // tabBarDoubleTapGestureRecognizer.numberOfTapsRequired = 2 // tabBarDoubleTapGestureRecognizer.addTarget(self, action: #selector(MainTabBarController.tabBarDoubleTapGestureRecognizerHandler(_:))) diff --git a/Mastodon/Scene/Root/Sidebar/SidebarViewController.swift b/Mastodon/Scene/Root/Sidebar/SidebarViewController.swift index 0bb88c7c6..65d7d5520 100644 --- a/Mastodon/Scene/Root/Sidebar/SidebarViewController.swift +++ b/Mastodon/Scene/Root/Sidebar/SidebarViewController.swift @@ -145,7 +145,7 @@ extension SidebarViewController { sidebarLongPressGestureRecognizer.addTarget(self, action: #selector(SidebarViewController.sidebarLongPressGestureRecognizerHandler(_:))) collectionView.addGestureRecognizer(sidebarLongPressGestureRecognizer) - // todo: reconsider the "double tap to change account" feature + // todo: reconsider the "double tap to change account" feature -> https://github.com/mastodon/mastodon-ios/issues/628 // let sidebarDoubleTapGestureRecognizer = UITapGestureRecognizer() // sidebarDoubleTapGestureRecognizer.numberOfTapsRequired = 2 // sidebarDoubleTapGestureRecognizer.addTarget(self, action: #selector(SidebarViewController.sidebarDoubleTapGestureRecognizerHandler(_:)))