NavigationController is added for changing orientation

brave · Nov 27, 2023 · 665bc45 · 665bc45
1 parent 5ae13af
commit 665bc45
Show file tree

Hide file tree

Showing 13 changed files with 67 additions and 16 deletions.
diff --git a/App/iOS/Delegates/AppDelegate.swift b/App/iOS/Delegates/AppDelegate.swift
@@ -288,9 +288,6 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 
   func application(_ application: UIApplication, supportedInterfaceOrientationsFor window: UIWindow?) -> UIInterfaceOrientationMask {
     if let presentedViewController = window?.rootViewController?.presentedViewController {
-      if DeviceOrientation.shared.allowOnlyPortrait {
-        return [.portrait, .portraitUpsideDown]
-      }
       return presentedViewController.supportedInterfaceOrientations
     } else {
       return window?.rootViewController?.supportedInterfaceOrientations ?? .portraitUpsideDown

diff --git a/Sources/Brave/Frontend/Browser/BrowserViewController.swift b/Sources/Brave/Frontend/Browser/BrowserViewController.swift
@@ -1502,7 +1502,7 @@ public class BrowserViewController: UIViewController {
       .init(barButtonSystemItem: .cancel, target: nav, action: #selector(nav.done))
     let idiom = UIDevice.current.userInterfaceIdiom
 
-    DeviceOrientation.shared.allowOnlyPortrait = UIDevice.current.userInterfaceIdiom != .pad
+//    DeviceOrientation.shared.allowOnlyPortrait = UIDevice.current.userInterfaceIdiom != .pad
     DeviceOrientation.shared.changeOrientationToPortraitOnPhone()
 
     nav.modalPresentationStyle = idiom == .phone ? .pageSheet : .formSheet
@@ -2086,7 +2086,7 @@ public class BrowserViewController: UIViewController {
       UIBarButtonItem(barButtonSystemItem: .done, target: settingsNavigationController, action: #selector(settingsNavigationController.done))
 
     // All menu views should be opened in portrait on iPhones.
-    DeviceOrientation.shared.allowOnlyPortrait = UIDevice.current.userInterfaceIdiom != .pad
+//    DeviceOrientation.shared.allowOnlyPortrait = UIDevice.current.userInterfaceIdiom != .pad
     DeviceOrientation.shared.changeOrientationToPortraitOnPhone()
 
     present(settingsNavigationController, animated: true)

diff --git a/Sources/Brave/Frontend/Browser/BrowserViewController/BrowserViewController+Menu.swift b/Sources/Brave/Frontend/Browser/BrowserViewController/BrowserViewController+Menu.swift
@@ -203,7 +203,7 @@ extension BrowserViewController {
     let vc = WalletHostingViewController(walletStore: walletStore, webImageDownloader: braveCore.webImageDownloader)
     vc.delegate = self
 
-    DeviceOrientation.shared.allowOnlyPortrait = UIDevice.current.userInterfaceIdiom != .pad
+//    DeviceOrientation.shared.allowOnlyPortrait = UIDevice.current.userInterfaceIdiom != .pad
     DeviceOrientation.shared.changeOrientationToPortraitOnPhone()
 
     self.dismiss(animated: true) {

diff --git a/.../Brave/Frontend/Browser/BrowserViewController/BrowserViewController+ToolbarDelegate.swift b/.../Brave/Frontend/Browser/BrowserViewController/BrowserViewController+ToolbarDelegate.swift
@@ -50,6 +50,7 @@ extension BrowserViewController: TopToolbarDelegate {
         $0.toolbarUrlActionsDelegate = self
     }
     let container = UINavigationController(rootViewController: tabTrayController)
+    container.delegate = self
 
     if !UIAccessibility.isReduceMotionEnabled {
       if !isExternallyPresented {
@@ -1009,3 +1010,15 @@ extension BrowserViewController: UIContextMenuInteractionDelegate {
     return UIMenu(options: .displayInline, children: children)
   }
 }
+
+// MARK: - UINavigationControllerDelegate
+
+extension BrowserViewController: UINavigationControllerDelegate {
+  public func navigationControllerSupportedInterfaceOrientations(_ navigationController: UINavigationController) -> UIInterfaceOrientationMask {
+    return navigationController.visibleViewController?.supportedInterfaceOrientations ?? navigationController.supportedInterfaceOrientations
+  }
+
+  public func navigationControllerPreferredInterfaceOrientationForPresentation(_ navigationController: UINavigationController) -> UIInterfaceOrientation {
+    return navigationController.visibleViewController?.preferredInterfaceOrientationForPresentation ?? navigationController.preferredInterfaceOrientationForPresentation
+  }
+}
diff --git a/Sources/Brave/Frontend/Browser/BrowserViewController/BrowserViewController+Wallet.swift b/Sources/Brave/Frontend/Browser/BrowserViewController/BrowserViewController+Wallet.swift
@@ -152,7 +152,7 @@ extension BrowserViewController: BraveWalletDelegate {
     )
     walletHostingController.delegate = self
 
-    DeviceOrientation.shared.allowOnlyPortrait = UIDevice.current.userInterfaceIdiom != .pad
+//    DeviceOrientation.shared.allowOnlyPortrait = UIDevice.current.userInterfaceIdiom != .pad
     DeviceOrientation.shared.changeOrientationToPortraitOnPhone()
 
     switch presentWalletWithContext {

diff --git a/Sources/Brave/Frontend/Browser/Tabs/TabTray/TabTrayController.swift b/Sources/Brave/Frontend/Browser/Tabs/TabTray/TabTrayController.swift
@@ -772,7 +772,7 @@ class TabTrayController: AuthenticationController {
     settingsNavigationController.navigationBar.topItem?.leftBarButtonItem =
       UIBarButtonItem(barButtonSystemItem: .done, target: settingsNavigationController, action: #selector(settingsNavigationController.done))
 
-    DeviceOrientation.shared.allowOnlyPortrait = UIDevice.current.userInterfaceIdiom != .pad
+//    DeviceOrientation.shared.allowOnlyPortrait = UIDevice.current.userInterfaceIdiom != .pad
     DeviceOrientation.shared.changeOrientationToPortraitOnPhone()
 
     present(settingsNavigationController, animated: true)
@@ -794,6 +794,19 @@ class TabTrayController: AuthenticationController {
   }
 }
 
+// MARK: - InterfaceOrientation
+
+extension TabTrayController {
+
+  override var preferredInterfaceOrientationForPresentation: UIInterfaceOrientation {
+    return self.presentedViewController?.preferredInterfaceOrientationForPresentation ?? super.preferredInterfaceOrientationForPresentation
+  }
+
+  override var supportedInterfaceOrientations: UIInterfaceOrientationMask {
+    return self.presentedViewController?.supportedInterfaceOrientations ?? super.supportedInterfaceOrientations
+  }
+}
+
 // MARK: PresentingModalViewControllerDelegate
 
 extension TabTrayController: PresentingModalViewControllerDelegate {

diff --git a/Sources/Brave/Frontend/Browser/Toolbars/BottomToolbar/Menu/MenuViewController.swift b/Sources/Brave/Frontend/Browser/Toolbars/BottomToolbar/Menu/MenuViewController.swift
@@ -214,6 +214,8 @@ class MenuViewController: UINavigationController, UIPopoverPresentationControlle
   }
 }
 
+// MARK: - PanModalPresentable
+
 extension MenuViewController: PanModalPresentable {
   var panScrollable: UIScrollView? {
     // For SwiftUI:
@@ -350,6 +352,14 @@ private class MenuNavigationControllerDelegate: NSObject, UINavigationController
   ) {
     panModal?.panModalSetNeedsLayoutUpdate()
   }
+
+  public func navigationControllerSupportedInterfaceOrientations(_ navigationController: UINavigationController) -> UIInterfaceOrientationMask {
+    return navigationController.visibleViewController?.supportedInterfaceOrientations ?? navigationController.supportedInterfaceOrientations
+  }
+
+  public func navigationControllerPreferredInterfaceOrientationForPresentation(_ navigationController: UINavigationController) -> UIInterfaceOrientation {
+    return navigationController.visibleViewController?.preferredInterfaceOrientationForPresentation ?? navigationController.preferredInterfaceOrientationForPresentation
+  }
 }
 
 private class InnerMenuNavigationController: UINavigationController {

diff --git a/Sources/Brave/Frontend/Settings/SettingsNavigationController.swift b/Sources/Brave/Frontend/Settings/SettingsNavigationController.swift
@@ -19,7 +19,7 @@ class SettingsNavigationController: UINavigationController {
   override func viewWillDisappear(_ animated: Bool) {
     super.viewWillDisappear(animated)
 
-    DeviceOrientation.shared.allowOnlyPortrait = false
+//    DeviceOrientation.shared.allowOnlyPortrait = false
     if #available(iOS 16.0, *) {
       self.setNeedsUpdateOfSupportedInterfaceOrientations()
     }
@@ -41,11 +41,11 @@ class SettingsNavigationController: UINavigationController {
   }
 
   override var supportedInterfaceOrientations: UIInterfaceOrientationMask {
-    return [.portrait, .portraitUpsideDown]
+    return self.topViewController?.supportedInterfaceOrientations ?? .portrait
   }
-
+  
   override var preferredInterfaceOrientationForPresentation: UIInterfaceOrientation {
-    return .portrait
+    return self.topViewController?.preferredInterfaceOrientationForPresentation ?? .portrait
   }
 }
 

diff --git a/Sources/Brave/Frontend/Settings/SettingsViewController.swift b/Sources/Brave/Frontend/Settings/SettingsViewController.swift
@@ -357,7 +357,7 @@ class SettingsViewController: TableViewController {
                 tabManager: tabManager,
                 windowProtection: windowProtection)
 
-              DeviceOrientation.shared.allowOnlyPortrait = UIDevice.current.userInterfaceIdiom != .pad
+//              DeviceOrientation.shared.allowOnlyPortrait = UIDevice.current.userInterfaceIdiom != .pad
               DeviceOrientation.shared.changeOrientationToPortraitOnPhone()
 
               self.navigationController?

diff --git a/Sources/Brave/Frontend/Sync/SyncViewController.swift b/Sources/Brave/Frontend/Sync/SyncViewController.swift
@@ -83,3 +83,21 @@ class SyncViewController: AuthenticationController {
     }
   }
 }
+
+// MARK: - InterfaceOrientation
+
+extension SyncViewController {
+
+  override var supportedInterfaceOrientations: UIInterfaceOrientationMask {
+    return .portrait
+  }
+
+  override var preferredInterfaceOrientationForPresentation: UIInterfaceOrientation {
+    return .portrait
+  }
+
+  override var shouldAutorotate: Bool {
+    return false
+  }
+}
+
diff --git a/Sources/BraveWallet/WalletHostingViewController.swift b/Sources/BraveWallet/WalletHostingViewController.swift
@@ -139,7 +139,7 @@ public class WalletHostingViewController: UIHostingController<CryptoView> {
   public override func viewWillDisappear(_ animated: Bool) {
     super.viewWillDisappear(animated)
 
-    DeviceOrientation.shared.allowOnlyPortrait = false
+//    DeviceOrientation.shared.allowOnlyPortrait = false
 
     if #available(iOS 16.0, *) {
       self.setNeedsUpdateOfSupportedInterfaceOrientations()

diff --git a/Sources/BraveWallet/WalletPanelHostingController.swift b/Sources/BraveWallet/WalletPanelHostingController.swift
@@ -55,7 +55,7 @@ public class WalletPanelHostingController: UIHostingController<WalletPanelContai
                 let walletHostingController = WalletHostingViewController(walletStore: walletStore, webImageDownloader: webImageDownloader, presentingContext: .buySendSwap(destination))
                 walletHostingController.delegate = self.delegate
 
-                DeviceOrientation.shared.allowOnlyPortrait = UIDevice.current.userInterfaceIdiom != .pad
+//                DeviceOrientation.shared.allowOnlyPortrait = UIDevice.current.userInterfaceIdiom != .pad
                 DeviceOrientation.shared.changeOrientationToPortraitOnPhone()
 
                 self.present(walletHostingController, animated: true)

diff --git a/Sources/Shared/DeviceOrientation.swift b/Sources/Shared/DeviceOrientation.swift
@@ -13,7 +13,7 @@ public final class DeviceOrientation {
 
   public static let shared: DeviceOrientation = DeviceOrientation()
 
-  public var allowOnlyPortrait = false
+//  public var allowOnlyPortrait = false
 
   public func changeOrientation(_ orientationMask: UIInterfaceOrientationMask) {
     if #available(iOS 16.0, *) {