shadowfacts
/
Tusker
2
10
Fork 2
Code Issues 77 Pull Requests Releases Wiki Activity

Fix being able to scroll to top while fast account switcher is active

This commit is contained in:
Shadowfacts 2023-05-10 11:41:59 -04:00
parent 3394c2126c
commit dcd1b4ad94
5 changed files with 40 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Tusker/Scenes/MainSceneDelegate.swift
View File

@ -238,7 +238,7 @@ class MainSceneDelegate: UIResponder, UIWindowSceneDelegate, TuskerSceneDelegate
}
}
func createAppUI() -> TuskerRootViewController {
func createAppUI() -> AccountSwitchableViewController {
let mastodonController = window!.windowScene!.session.mastodonController!
mastodonController.initialize()

17
Tusker/Screens/Main/AccountSwitchingContainerViewController.swift
View File

@ -11,14 +11,18 @@ import ScreenCorners
import UserAccounts
import ComposeUI
protocol AccountSwitchableViewController: TuskerRootViewController {
var isFastAccountSwitcherActive: Bool { get }
}
class AccountSwitchingContainerViewController: UIViewController {
private var currentAccountID: String
private(set) var root: TuskerRootViewController
private(set) var root: AccountSwitchableViewController
private var userActivities: [String: NSUserActivity] = [:]
init(root: TuskerRootViewController, for account: UserAccountInfo) {
init(root: AccountSwitchableViewController, for account: UserAccountInfo) {
self.currentAccountID = account.id
self.root = root
@ -35,7 +39,7 @@ class AccountSwitchingContainerViewController: UIViewController {
embedChild(root)
}
func setRoot(_ newRoot: TuskerRootViewController, for account: UserAccountInfo, animating direction: AnimationDirection) {
func setRoot(_ newRoot: AccountSwitchableViewController, for account: UserAccountInfo, animating direction: AnimationDirection) {
let oldRoot = self.root
if direction == .none {
oldRoot.removeViewAndController()
@ -148,8 +152,11 @@ extension AccountSwitchingContainerViewController: TuskerRootViewController {
func handleStatusBarTapped(xPosition: CGFloat) -> StatusBarTapActionResult {
loadViewIfNeeded()
// TODO: check if fast account switcher is being presented?
return root.handleStatusBarTapped(xPosition: xPosition)
if root.isFastAccountSwitcherActive {
return .stop
} else {
return root.handleStatusBarTapped(xPosition: xPosition)
}
}
}

6
Tusker/Screens/Main/Duckable+Root.swift
View File

@ -11,7 +11,7 @@ import Duckable
import ComposeUI
@available(iOS 16.0, *)
extension DuckableContainerViewController: TuskerRootViewController {
extension DuckableContainerViewController: AccountSwitchableViewController {
func stateRestorationActivity() -> NSUserActivity? {
var activity = (child as? TuskerRootViewController)?.stateRestorationActivity()
if let compose = duckedViewController as? ComposeHostingController,
@ -52,4 +52,8 @@ extension DuckableContainerViewController: TuskerRootViewController {
func handleStatusBarTapped(xPosition: CGFloat) -> StatusBarTapActionResult {
(child as? TuskerRootViewController)?.handleStatusBarTapped(xPosition: xPosition) ?? .continue
}
var isFastAccountSwitcherActive: Bool {
(child as? AccountSwitchableViewController)?.isFastAccountSwitcherActive ?? false
}
}

12
Tusker/Screens/Main/MainSplitViewController.swift
View File

@ -610,3 +610,15 @@ extension MainSplitViewController: FastAccountSwitcherViewControllerDelegate {
return cellRect.contains(point)
}
}
extension MainSplitViewController: AccountSwitchableViewController {
var isFastAccountSwitcherActive: Bool {
if isCollapsed {
return tabBarViewController.isFastAccountSwitcherActive
} else if let fastAccountSwitcher {
return !fastAccountSwitcher.view.isHidden
} else {
return false
}
}
}

10
Tusker/Screens/Main/MainTabBarViewController.swift
View File

@ -363,3 +363,13 @@ extension MainTabBarViewController: BackgroundableViewController {
}
}
}
extension MainTabBarViewController: AccountSwitchableViewController {
var isFastAccountSwitcherActive: Bool {
if let fastAccountSwitcher {
return !fastAccountSwitcher.view.isHidden
} else {
return false
}
}
}