diff --git a/submodules/Display/Source/StatusBarHost.swift b/submodules/Display/Source/StatusBarHost.swift index e00dc926ee..9a5cca61f2 100644 --- a/submodules/Display/Source/StatusBarHost.swift +++ b/submodules/Display/Source/StatusBarHost.swift @@ -8,6 +8,4 @@ public protocol StatusBarHost { var keyboardView: UIView? { get } var isApplicationInForeground: Bool { get } - - var shouldChangeStatusBarStyle: ((UIStatusBarStyle) -> Bool)? { get set } } diff --git a/submodules/TelegramUI/Sources/AppDelegate.swift b/submodules/TelegramUI/Sources/AppDelegate.swift index bab31cd422..b9f65b0406 100644 --- a/submodules/TelegramUI/Sources/AppDelegate.swift +++ b/submodules/TelegramUI/Sources/AppDelegate.swift @@ -84,14 +84,17 @@ private func isKeyboardViewContainer(view: NSObject) -> Bool { } private class ApplicationStatusBarHost: StatusBarHost { - private let scene: UIWindowScene + private weak var scene: UIWindowScene? - init(scene: UIWindowScene) { + init(scene: UIWindowScene?) { self.scene = scene } var isApplicationInForeground: Bool { - switch self.scene.activationState { + guard let scene = self.scene else { + return false + } + switch scene.activationState { case .unattached: return false case .foregroundActive: @@ -106,26 +109,10 @@ private class ApplicationStatusBarHost: StatusBarHost { } var statusBarFrame: CGRect { - return self.scene.statusBarManager?.statusBarFrame ?? CGRect() - } - var statusBarStyle: UIStatusBarStyle { - get { - return self.scene.statusBarManager?.statusBarStyle ?? .default - } set(value) { - self.setStatusBarStyle(value, animated: false) + guard let scene = self.scene else { + return CGRect() } - } - - func setStatusBarStyle(_ style: UIStatusBarStyle, animated: Bool) { - /*if self.shouldChangeStatusBarStyle?(style) ?? true { - self.application.internalSetStatusBarStyle(style, animated: animated) - }*/ - } - - var shouldChangeStatusBarStyle: ((UIStatusBarStyle) -> Bool)? - - func setStatusBarHidden(_ value: Bool, animated: Bool) { - //self.application.internalSetStatusBarHidden(value, animation: animated ? .fade : .none) + return scene.statusBarManager?.statusBarFrame ?? CGRect() } var keyboardWindow: UIWindow? { @@ -345,7 +332,7 @@ private func extractAccountManagerState(records: AccountRecordsView