CHANGELOG.md

@@ -1,6 +1,6 @@
 # Changelog
 
-## 2024.4 (135)
+## 2024.4 (134)
 Features/Improvements:
 - iOS 18: New floating sidebar/tab bar
 

Tusker/Screens/Main/NewMainTabBarViewController.swift

@@ -246,13 +246,9 @@ final class NewMainTabBarViewController: BaseMainTabBarViewController {
     }
     
     private func embedInNavigationController(_ vc: UIViewController) -> UIViewController {
-        if UIDevice.current.userInterfaceIdiom == .phone {
-            return UINavigationController(rootViewController: vc)
-        } else {
-            let nav = AdaptableNavigationController()
-            nav.viewControllers = [vc]
-            return nav
-        }
+        let nav = AdaptableNavigationController()
+        nav.viewControllers = [vc]
+        return nav
     }
     
     override func viewDidAppear(_ animated: Bool) {
@@ -432,13 +428,12 @@ extension NewMainTabBarViewController: UITabBarControllerDelegate {
         if tab.identifier == Tab.compose.rawValue {
             let currentTab = selectedTab
             // 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)
-            // so return true, and then after the tab bar VC has finished updating, go back to currentTab
-            DispatchQueue.main.async {
-                self.selectedTab = currentTab
-            }
+            // but we need it to change to _something_ so that we can change back to the current tab
+            self.selectedTab = tab
+            self.selectedTab = currentTab
+            
             compose(editing: nil)
-            return true
+            return false
         } else if let selectedTab,
                   selectedTab == tab,
                   let nav = selectedViewController as? any NavigationControllerProtocol,

Version.xcconfig

@@ -10,7 +10,7 @@
 // https://help.apple.com/xcode/#/dev745c5c974
 
 MARKETING_VERSION = 2024.4
-CURRENT_PROJECT_VERSION = 135
+CURRENT_PROJECT_VERSION = 134
 CURRENT_PROJECT_VERSION = $(inherited)$(CURRENT_PROJECT_VERSION_BUILD_SUFFIX_$(CONFIGURATION))
 
 CURRENT_PROJECT_VERSION_BUILD_SUFFIX_Debug=-dev