From 3cd0e418137e29862f3e836d47cc13b7fcc962e0 Mon Sep 17 00:00:00 2001 From: Andrew Bulhak Date: Wed, 19 Feb 2025 16:32:33 +0100 Subject: [PATCH] Make prefersNotificationBarHidden default to true --- .../Containers/Root/RootContainerViewController.swift | 2 +- .../Completed/SetupAccountCompletedController.swift | 4 ---- .../CreationAccount/Welcome/WelcomeViewController.swift | 4 ---- .../DeviceList/DeviceManagementViewController.swift | 4 ---- .../View controllers/Login/LoginViewController.swift | 4 ---- .../View controllers/OutOfTime/OutOfTimeViewController.swift | 4 ---- .../RedeemVoucher/AddCreditSucceededViewController.swift | 4 ---- .../RedeemVoucher/RedeemVoucherViewController.swift | 4 ---- .../View controllers/Tunnel/TunnelViewController.swift | 4 ++++ 9 files changed, 5 insertions(+), 29 deletions(-) diff --git a/ios/MullvadVPN/Containers/Root/RootContainerViewController.swift b/ios/MullvadVPN/Containers/Root/RootContainerViewController.swift index 54dc9b4e758b..61975b01b81e 100644 --- a/ios/MullvadVPN/Containers/Root/RootContainerViewController.swift +++ b/ios/MullvadVPN/Containers/Root/RootContainerViewController.swift @@ -53,7 +53,7 @@ protocol RootContainment: Sendable { extension RootContainment { var prefersNotificationBarHidden: Bool { - false + true } var prefersDeviceInfoBarHidden: Bool { diff --git a/ios/MullvadVPN/View controllers/CreationAccount/Completed/SetupAccountCompletedController.swift b/ios/MullvadVPN/View controllers/CreationAccount/Completed/SetupAccountCompletedController.swift index 7ce0eec9caef..1bcb0c8c6742 100644 --- a/ios/MullvadVPN/View controllers/CreationAccount/Completed/SetupAccountCompletedController.swift +++ b/ios/MullvadVPN/View controllers/CreationAccount/Completed/SetupAccountCompletedController.swift @@ -32,10 +32,6 @@ class SetupAccountCompletedController: UIViewController, RootContainment { true } - var prefersNotificationBarHidden: Bool { - true - } - weak var delegate: SetupAccountCompletedControllerDelegate? override func viewDidLoad() { diff --git a/ios/MullvadVPN/View controllers/CreationAccount/Welcome/WelcomeViewController.swift b/ios/MullvadVPN/View controllers/CreationAccount/Welcome/WelcomeViewController.swift index 271c33048fb9..e112d7cb2966 100644 --- a/ios/MullvadVPN/View controllers/CreationAccount/Welcome/WelcomeViewController.swift +++ b/ios/MullvadVPN/View controllers/CreationAccount/Welcome/WelcomeViewController.swift @@ -35,10 +35,6 @@ class WelcomeViewController: UIViewController, RootContainment { false } - var prefersNotificationBarHidden: Bool { - true - } - var prefersDeviceInfoBarHidden: Bool { true } diff --git a/ios/MullvadVPN/View controllers/DeviceList/DeviceManagementViewController.swift b/ios/MullvadVPN/View controllers/DeviceList/DeviceManagementViewController.swift index f33e14621e54..64f8c45b6bc4 100644 --- a/ios/MullvadVPN/View controllers/DeviceList/DeviceManagementViewController.swift +++ b/ios/MullvadVPN/View controllers/DeviceList/DeviceManagementViewController.swift @@ -28,10 +28,6 @@ class DeviceManagementViewController: UIViewController, RootContainment { false } - var prefersNotificationBarHidden: Bool { - true - } - override var preferredStatusBarStyle: UIStatusBarStyle { .lightContent } diff --git a/ios/MullvadVPN/View controllers/Login/LoginViewController.swift b/ios/MullvadVPN/View controllers/Login/LoginViewController.swift index 149d374e3a75..533c34ae7488 100644 --- a/ios/MullvadVPN/View controllers/Login/LoginViewController.swift +++ b/ios/MullvadVPN/View controllers/Login/LoginViewController.swift @@ -87,10 +87,6 @@ class LoginViewController: UIViewController, RootContainment { contentView.accountInputGroup.satisfiesMinimumTokenLengthRequirement } - var prefersNotificationBarHidden: Bool { - true - } - var prefersDeviceInfoBarHidden: Bool { true } diff --git a/ios/MullvadVPN/View controllers/OutOfTime/OutOfTimeViewController.swift b/ios/MullvadVPN/View controllers/OutOfTime/OutOfTimeViewController.swift index 99218c3069a6..40e42914456a 100644 --- a/ios/MullvadVPN/View controllers/OutOfTime/OutOfTimeViewController.swift +++ b/ios/MullvadVPN/View controllers/OutOfTime/OutOfTimeViewController.swift @@ -44,10 +44,6 @@ class OutOfTimeViewController: UIViewController, RootContainment { false } - var prefersNotificationBarHidden: Bool { - true - } - init(interactor: OutOfTimeInteractor, errorPresenter: PaymentAlertPresenter) { self.interactor = interactor diff --git a/ios/MullvadVPN/View controllers/RedeemVoucher/AddCreditSucceededViewController.swift b/ios/MullvadVPN/View controllers/RedeemVoucher/AddCreditSucceededViewController.swift index 4fc623a306e1..06c7f1ef08ad 100644 --- a/ios/MullvadVPN/View controllers/RedeemVoucher/AddCreditSucceededViewController.swift +++ b/ios/MullvadVPN/View controllers/RedeemVoucher/AddCreditSucceededViewController.swift @@ -63,10 +63,6 @@ class AddCreditSucceededViewController: UIViewController, RootContainment { true } - var prefersNotificationBarHidden: Bool { - true - } - weak var delegate: AddCreditSucceededViewControllerDelegate? { didSet { dismissButton.setTitle(delegate?.titleForAction(in: self), for: .normal) diff --git a/ios/MullvadVPN/View controllers/RedeemVoucher/RedeemVoucherViewController.swift b/ios/MullvadVPN/View controllers/RedeemVoucher/RedeemVoucherViewController.swift index 67eba10582a1..433ecb75624e 100644 --- a/ios/MullvadVPN/View controllers/RedeemVoucher/RedeemVoucherViewController.swift +++ b/ios/MullvadVPN/View controllers/RedeemVoucher/RedeemVoucherViewController.swift @@ -56,10 +56,6 @@ class RedeemVoucherViewController: UIViewController, UINavigationControllerDeleg true } - var prefersNotificationBarHidden: Bool { - true - } - // MARK: - Life Cycle override func viewDidLoad() { diff --git a/ios/MullvadVPN/View controllers/Tunnel/TunnelViewController.swift b/ios/MullvadVPN/View controllers/Tunnel/TunnelViewController.swift index 02eb82a4b48f..bb6cebdc3ce3 100644 --- a/ios/MullvadVPN/View controllers/Tunnel/TunnelViewController.swift +++ b/ios/MullvadVPN/View controllers/Tunnel/TunnelViewController.swift @@ -57,6 +57,10 @@ class TunnelViewController: UIViewController, RootContainment { false } + var prefersNotificationBarHidden: Bool { + false + } + init(interactor: TunnelViewControllerInteractor) { self.interactor = interactor