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

Merge branch 'develop' into compose-rewrite

This commit is contained in:
Shadowfacts 2024-10-14 18:26:55 -04:00
parent 02fd724b0b 12bab71b17
commit 5be80d8e68
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Tusker/Screens/Main/NewMainTabBarViewController.swift
View File

@ -454,6 +454,7 @@ extension NewMainTabBarViewController {
extension NewMainTabBarViewController: UITabBarControllerDelegate { extension NewMainTabBarViewController: UITabBarControllerDelegate {
func tabBarController(_ tabBarController: UITabBarController, shouldSelectTab tab: UITab) -> Bool { func tabBarController(_ tabBarController: UITabBarController, shouldSelectTab tab: UITab) -> Bool {
if tab.identifier == Tab.compose.rawValue { if tab.identifier == Tab.compose.rawValue {
if #unavailable(iOS 18.1) {
let currentTab = selectedTab let currentTab = selectedTab
// returning false for shouldSelectTab doesn't prevent the UITabBar from being updated (FB14857254) // returning false for shouldSelectTab doesn't prevent the UITabBar from being updated (FB14857254)
// returning false and then setting selectedTab=tab and selectedTab=currentTab seems to leave things in a bad state (currentTab's VC is on screen but in the disappeared state) // returning false and then setting selectedTab=tab and selectedTab=currentTab seems to leave things in a bad state (currentTab's VC is on screen but in the disappeared state)
@ -463,6 +464,10 @@ extension NewMainTabBarViewController: UITabBarControllerDelegate {
} }
compose(editing: nil) compose(editing: nil)
return true return true
} else {
compose(editing: nil)
return false
}
} else if let selectedTab, } else if let selectedTab,
selectedTab == tab, selectedTab == tab,
let nav = selectedViewController as? any NavigationControllerProtocol { let nav = selectedViewController as? any NavigationControllerProtocol {