Packages/Duckable/Sources/Duckable/API.swift

@@ -8,6 +8,8 @@
 import UIKit
 
 public protocol DuckableViewController: UIViewController {
+    var duckableDelegate: DuckableViewControllerDelegate? { get set }
+    
     func duckableViewControllerShouldDuck() -> DuckAttemptAction
     
     func duckableViewControllerMayAttemptToDuck()
@@ -24,6 +26,10 @@ extension DuckableViewController {
     public func duckableViewControllerDidFinishAnimatingDuck() {}
 }
 
+public protocol DuckableViewControllerDelegate: AnyObject {
+    func duckableViewControllerWillDismiss(animated: Bool)
+}
+
 public enum DuckAttemptAction {
     case duck
     case dismiss

Packages/Duckable/Sources/Duckable/DuckableContainerViewController.swift

@@ -11,7 +11,7 @@ let duckedCornerRadius: CGFloat = 10
 let detentHeight: CGFloat = 44
 
 @available(iOS 16.0, *)
-public class DuckableContainerViewController: UIViewController {
+public class DuckableContainerViewController: UIViewController, DuckableViewControllerDelegate {
     
     public let child: UIViewController
     private var bottomConstraint: NSLayoutConstraint!
@@ -87,6 +87,7 @@ public class DuckableContainerViewController: UIViewController {
     }
     
     private func doPresentDuckable(_ viewController: DuckableViewController, animated: Bool, completion: (() -> Void)?) {
+        viewController.duckableDelegate = self
         viewController.modalPresentationStyle = .custom
         viewController.transitioningDelegate = self
         present(viewController, animated: animated) {
@@ -95,10 +96,7 @@ public class DuckableContainerViewController: UIViewController {
         }
     }
     
-    func dismissalTransitionWillBegin() {
-        guard case .presentingDucked(_, _) = state else {
-            return
-        }
+    public func duckableViewControllerWillDismiss(animated: Bool) {
         state = .idle
         bottomConstraint.isActive = false
         bottomConstraint = child.view.bottomAnchor.constraint(equalTo: view.bottomAnchor)
@@ -146,7 +144,7 @@ public class DuckableContainerViewController: UIViewController {
         case .block:
             viewController.sheetPresentationController!.selectedDetentIdentifier = .large
         case .dismiss:
-//            duckableViewControllerWillDismiss()
+            duckableViewControllerWillDismiss(animated: true)
             dismiss(animated: true)
         }
     }
@@ -191,7 +189,7 @@ public class DuckableContainerViewController: UIViewController {
 @available(iOS 16.0, *)
 extension DuckableContainerViewController: UIViewControllerTransitioningDelegate {
     public func presentationController(forPresented presented: UIViewController, presenting: UIViewController?, source: UIViewController) -> UIPresentationController? {
-        let controller = DuckableSheetPresentationController(presentedViewController: presented, presenting: presenting)
+        let controller = UISheetPresentationController(presentedViewController: presented, presenting: presenting)
         controller.delegate = self
         controller.prefersGrabberVisible = true
         controller.selectedDetentIdentifier = .large
@@ -217,14 +215,6 @@ extension DuckableContainerViewController: UIViewControllerTransitioningDelegate
     }
 }
 
-@available(iOS 16.0, *)
-class DuckableSheetPresentationController: UISheetPresentationController {
-    override func dismissalTransitionWillBegin() {
-        super.dismissalTransitionWillBegin()
-        (self.delegate as! DuckableContainerViewController).dismissalTransitionWillBegin()
-    }
-}
-
 @available(iOS 16.0, *)
 extension DuckableContainerViewController: UISheetPresentationControllerDelegate {
     public func presentationController(_ presentationController: UIPresentationController, willPresentWithAdaptiveStyle style: UIModalPresentationStyle, transitionCoordinator: UIViewControllerTransitionCoordinator?) {

Tusker/Screens/Compose/ComposeHostingController.swift

@@ -23,6 +23,7 @@ protocol ComposeHostingControllerDelegate: AnyObject {
 class ComposeHostingController: UIHostingController<ComposeHostingController.View>, DuckableViewController {
     
     weak var delegate: ComposeHostingControllerDelegate?
+    weak var duckableDelegate: DuckableViewControllerDelegate?
     
     let controller: ComposeController
     let mastodonController: MastodonController
@@ -106,6 +107,7 @@ class ComposeHostingController: UIHostingController<ComposeHostingController.Vie
             return
         } else {
             dismiss(animated: true)
+            duckableDelegate?.duckableViewControllerWillDismiss(animated: true)
         }
     }
     

Tusker/Screens/Main/MainSplitViewController.swift

@@ -225,7 +225,7 @@ extension MainSplitViewController: UISplitViewControllerDelegate {
             
         case let .tab(tab):
             // sidebar items that map 1 <-> 1 can be transferred directly
-            tabBarViewController.select(tab: tab, dismissPresented: false)
+            tabBarViewController.select(tab: tab)
             
         case .explore:
             // Search sidebar item maps to the Explore tab with the search controller/results visible
@@ -268,10 +268,10 @@ extension MainSplitViewController: UISplitViewControllerDelegate {
             // Transfer the navigation stack, dropping the search VC, to keep anything the user has opened
             transferNavigationStack(from: .explore, to: exploreNav, dropFirst: true, append: true)
             
-            tabBarViewController.select(tab: .explore, dismissPresented: false)
+            tabBarViewController.select(tab: .explore)
             
         case .bookmarks, .favorites, .list(_), .savedHashtag(_), .savedInstance(_):
-            tabBarViewController.select(tab: .explore, dismissPresented: false)
+            tabBarViewController.select(tab: .explore)
             // Make sure the Explore VC doesn't show its search bar when it appears, in case the user was previously
             // in compact mode and performing a search.
             let exploreNav = tabBarViewController.viewController(for: .explore) as! UINavigationController

Tusker/Screens/Main/MainTabBarViewController.swift

@@ -111,13 +111,13 @@ class MainTabBarViewController: UITabBarController, UITabBarControllerDelegate {
         repositionFastSwitcherIndicator()
     }
     
-    func select(tab: Tab, dismissPresented: Bool) {
+    func select(tab: Tab) {
         if tab == .compose {
             compose(editing: nil)
         } else {
             // when switching tabs, dismiss the currently presented VC
             // otherwise the selected tab changes behind the presented VC
-            if presentedViewController != nil && dismissPresented {
+            if presentedViewController != nil {
                 dismiss(animated: true) {
                     self.selectedIndex = tab.rawValue
                 }
@@ -141,8 +141,8 @@ class MainTabBarViewController: UITabBarController, UITabBarControllerDelegate {
             return
         }
         NSLayoutConstraint.deactivate(fastSwitcherConstraints)
-        let isPortrait = view.bounds.width < view.bounds.height
-        if traitCollection.horizontalSizeClass == .compact && isPortrait {
+        // using interfaceOrientation isn't ideal, but UITabBar buttons may lay out horizontally even in the compact size class
+        if traitCollection.horizontalSizeClass == .compact && interfaceOrientation.isPortrait {
             fastSwitcherConstraints = [
                 fastSwitcherIndicator.centerYAnchor.constraint(equalTo: myProfileButton.centerYAnchor, constant: -4),
                 // tab bar button image width is 30
@@ -291,18 +291,18 @@ extension MainTabBarViewController: TuskerRootViewController {
     func select(route: TuskerRoute, animated: Bool) {
         switch route {
         case .timelines:
-            select(tab: .timelines, dismissPresented: true)
+            select(tab: .timelines)
         case .notifications:
-            select(tab: .notifications, dismissPresented: true)
+            select(tab: .notifications)
         case .myProfile:
-            select(tab: .myProfile, dismissPresented: true)
+            select(tab: .myProfile)
         case .explore:
-            select(tab: .explore, dismissPresented: true)
+            select(tab: .explore)
         case .bookmarks:
-            select(tab: .explore, dismissPresented: true)
+            select(tab: .explore)
             getNavigationController().pushViewController(BookmarksViewController(mastodonController: mastodonController), animated: animated)
         case .list(id: let id):
-            select(tab: .explore, dismissPresented: true)
+            select(tab: .explore)
             if let list = mastodonController.getCachedList(id: id) {
                 let nav = getNavigationController()
                 _ = nav.popToRootViewController(animated: animated)
@@ -325,7 +325,7 @@ extension MainTabBarViewController: TuskerRootViewController {
             return
         }
         
-        select(tab: .explore, dismissPresented: true)
+        select(tab: .explore)
         exploreNavController.popToRootViewController(animated: false)
         
         // setting searchController.isActive directly doesn't work until the view has loaded/appeared for the first time