Cleanup and proper include for portrait switch

brave · Nov 27, 2023 · 7756f6f · 7756f6f
1 parent 665bc45
commit 7756f6f
Show file tree

Hide file tree

Showing 11 changed files with 28 additions and 64 deletions.
diff --git a/Sources/Brave/Frontend/Browser/BrowserViewController.swift b/Sources/Brave/Frontend/Browser/BrowserViewController.swift
@@ -1497,16 +1497,15 @@ public class BrowserViewController: UIViewController {
     }
 
     guard let vc = BraveVPN.vpnState.enableVPNDestinationVC else { return }
-    let nav = SettingsNavigationController(rootViewController: vc)
-    nav.navigationBar.topItem?.leftBarButtonItem =
-      .init(barButtonSystemItem: .cancel, target: nav, action: #selector(nav.done))
+    let navigationController = SettingsNavigationController(rootViewController: vc)
+    navigationController.navigationBar.topItem?.leftBarButtonItem =
+      .init(barButtonSystemItem: .cancel, target: navigationController, action: #selector(navigationController.done))
     let idiom = UIDevice.current.userInterfaceIdiom
 
-//    DeviceOrientation.shared.allowOnlyPortrait = UIDevice.current.userInterfaceIdiom != .pad
     DeviceOrientation.shared.changeOrientationToPortraitOnPhone()
-
-    nav.modalPresentationStyle = idiom == .phone ? .pageSheet : .formSheet
-    present(nav, animated: true)
+ 
+    navigationController.modalPresentationStyle = idiom == .phone ? .pageSheet : .formSheet
+    present(navigationController, animated: true)
   }
 
   func updateInContentHomePanel(_ url: URL?) {
@@ -2086,7 +2085,6 @@ 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.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
@@ -202,10 +202,6 @@ extension BrowserViewController {
     walletStore.origin = nil
     let vc = WalletHostingViewController(walletStore: walletStore, webImageDownloader: braveCore.webImageDownloader)
     vc.delegate = self
-
-//    DeviceOrientation.shared.allowOnlyPortrait = UIDevice.current.userInterfaceIdiom != .pad
-    DeviceOrientation.shared.changeOrientationToPortraitOnPhone()
-
     self.dismiss(animated: true) {
       self.present(vc, animated: true)
     }

diff --git a/.../Brave/Frontend/Browser/BrowserViewController/BrowserViewController+ToolbarDelegate.swift b/.../Brave/Frontend/Browser/BrowserViewController/BrowserViewController+ToolbarDelegate.swift
@@ -1011,7 +1011,7 @@ extension BrowserViewController: UIContextMenuInteractionDelegate {
   }
 }
 
-// MARK: - UINavigationControllerDelegate
+// MARK: UINavigationControllerDelegate
 
 extension BrowserViewController: UINavigationControllerDelegate {
   public func navigationControllerSupportedInterfaceOrientations(_ navigationController: UINavigationController) -> UIInterfaceOrientationMask {

diff --git a/Sources/Brave/Frontend/Browser/BrowserViewController/BrowserViewController+Wallet.swift b/Sources/Brave/Frontend/Browser/BrowserViewController/BrowserViewController+Wallet.swift
@@ -152,9 +152,6 @@ extension BrowserViewController: BraveWalletDelegate {
     )
     walletHostingController.delegate = self
 
-//    DeviceOrientation.shared.allowOnlyPortrait = UIDevice.current.userInterfaceIdiom != .pad
-    DeviceOrientation.shared.changeOrientationToPortraitOnPhone()
-
     switch presentWalletWithContext {
     case .default, .settings:
       // Dismiss Wallet Panel first, then present Wallet

diff --git a/Sources/Brave/Frontend/Browser/Tabs/TabTray/TabTrayController.swift b/Sources/Brave/Frontend/Browser/Tabs/TabTray/TabTrayController.swift
@@ -752,9 +752,9 @@ class TabTrayController: AuthenticationController {
           syncProfileService: braveCore.syncProfileService,
           tabManager: tabManager,
           windowProtection: windowProtection)
-        
+
         syncSettingsScreen.syncStatusDelegate = self
-        
+
         openInsideSettingsNavigation(with: syncSettingsScreen)
       default:
         return
@@ -772,7 +772,6 @@ 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.changeOrientationToPortraitOnPhone()
 
     present(settingsNavigationController, animated: true)
@@ -794,7 +793,7 @@ class TabTrayController: AuthenticationController {
   }
 }
 
-// MARK: - InterfaceOrientation
+// MARK: InterfaceOrientation
 
 extension TabTrayController {
 

diff --git a/Sources/Brave/Frontend/Browser/Toolbars/BottomToolbar/Menu/MenuViewController.swift b/Sources/Brave/Frontend/Browser/Toolbars/BottomToolbar/Menu/MenuViewController.swift
@@ -214,7 +214,7 @@ class MenuViewController: UINavigationController, UIPopoverPresentationControlle
   }
 }
 
-// MARK: - PanModalPresentable
+// MARK: PanModalPresentable
 
 extension MenuViewController: PanModalPresentable {
   var panScrollable: UIScrollView? {
@@ -339,6 +339,8 @@ private class MenuHostingController<MenuContent: View>: UIHostingController<Menu
   }
 }
 
+// MARK: MenuNavigationControllerDelegate
+
 private class MenuNavigationControllerDelegate: NSObject, UINavigationControllerDelegate {
   weak var panModal: (UIViewController & PanModalPresentable)?
   init(panModal: UIViewController & PanModalPresentable) {

diff --git a/Sources/Brave/Frontend/Settings/SettingsNavigationController.swift b/Sources/Brave/Frontend/Settings/SettingsNavigationController.swift
@@ -3,27 +3,17 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 import UIKit
-import Shared
 
 class SettingsNavigationController: UINavigationController {
   var popoverDelegate: PresentingModalViewControllerDelegate?
 
-  override func viewWillAppear(_ animated: Bool) {
-    super.viewWillAppear(animated)
+  override func viewDidAppear(_ animated: Bool) {
+    super.viewDidAppear(animated)
 
     if #available(iOS 16.0, *) {
       self.setNeedsUpdateOfSupportedInterfaceOrientations()
     }
   }
-
-  override func viewWillDisappear(_ animated: Bool) {
-    super.viewWillDisappear(animated)
-
-//    DeviceOrientation.shared.allowOnlyPortrait = false
-    if #available(iOS 16.0, *) {
-      self.setNeedsUpdateOfSupportedInterfaceOrientations()
-    }
-  }
 
   @objc func done() {
     if let delegate = popoverDelegate {
@@ -41,11 +31,11 @@ class SettingsNavigationController: UINavigationController {
   }
 
   override var supportedInterfaceOrientations: UIInterfaceOrientationMask {
-    return self.topViewController?.supportedInterfaceOrientations ?? .portrait
+    return .portrait
   }
-  
+
   override var preferredInterfaceOrientationForPresentation: UIInterfaceOrientation {
-    return self.topViewController?.preferredInterfaceOrientationForPresentation ?? .portrait
+    return .portrait
   }
 }
 

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

diff --git a/Sources/BraveWallet/WalletHostingViewController.swift b/Sources/BraveWallet/WalletHostingViewController.swift
@@ -121,36 +121,27 @@ public class WalletHostingViewController: UIHostingController<CryptoView> {
   public override func viewDidAppear(_ animated: Bool) {
     super.viewDidAppear(animated)
     view.window?.addGestureRecognizer(gesture)
+
+    DeviceOrientation.shared.changeOrientationToPortraitOnPhone()
+    if #available(iOS 16.0, *) {
+      self.setNeedsUpdateOfSupportedInterfaceOrientations()
+    }
   }
 
   public override func viewDidLoad() {
     super.viewDidLoad()
     walletStore?.isPresentingFullWallet = true
   }
 
-  public override func viewWillAppear(_ animated: Bool) {
-    super.viewWillAppear(animated)
-
-    if #available(iOS 16.0, *) {
-      self.setNeedsUpdateOfSupportedInterfaceOrientations()
-    }
-  }
-
-  public override func viewWillDisappear(_ animated: Bool) {
-    super.viewWillDisappear(animated)
-
-//    DeviceOrientation.shared.allowOnlyPortrait = false
-
-    if #available(iOS 16.0, *) {
-      self.setNeedsUpdateOfSupportedInterfaceOrientations()
-    }
-  }
-
   // MARK: -
 
   public override var supportedInterfaceOrientations: UIInterfaceOrientationMask {
     [.portrait, .portraitUpsideDown]
   }
+
+  public override var shouldAutorotate: Bool {
+    true
+  }
 }
 
 class WalletInteractionGestureRecognizer: UIGestureRecognizer {

diff --git a/Sources/BraveWallet/WalletPanelHostingController.swift b/Sources/BraveWallet/WalletPanelHostingController.swift
@@ -54,10 +54,6 @@ public class WalletPanelHostingController: UIHostingController<WalletPanelContai
               completion: {
                 let walletHostingController = WalletHostingViewController(walletStore: walletStore, webImageDownloader: webImageDownloader, presentingContext: .buySendSwap(destination))
                 walletHostingController.delegate = self.delegate
-
-//                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,8 +13,6 @@ public final class DeviceOrientation {
 
   public static let shared: DeviceOrientation = DeviceOrientation()
 
-//  public var allowOnlyPortrait = false
-
   public func changeOrientation(_ orientationMask: UIInterfaceOrientationMask) {
     if #available(iOS 16.0, *) {
       windowScene?.requestGeometryUpdate(.iOS(interfaceOrientations: orientationMask))