Merge branch 'master' of gitlab.com:peter-iakovlev/telegram-ios

This commit is contained in:
Ilya Laktyushin
2021-07-09 03:13:24 +03:00
21 changed files with 4031 additions and 4297 deletions

View File

@@ -58,7 +58,7 @@ public final class PasscodeEntryController: ViewController {
private var inBackground: Bool = false
private var inBackgroundDisposable: Disposable?
private let statusBarHost: StatusBarHost?
private var statusBarHost: StatusBarHost?
private var previousStatusBarStyle: UIStatusBarStyle?
public init(applicationBindings: TelegramApplicationBindings, accountManager: AccountManager, appLockContext: AppLockContext, presentationData: PresentationData, presentationDataSignal: Signal<PresentationData, NoError>, statusBarHost: StatusBarHost?, challengeData: PostboxAccessChallengeData, biometrics: PasscodeEntryControllerBiometricsMode, arguments: PasscodeEntryControllerPresentationArguments) {
@@ -76,7 +76,14 @@ public final class PasscodeEntryController: ViewController {
super.init(navigationBarPresentationData: nil)
self.supportedOrientations = ViewControllerSupportedOrientations(regularSize: .all, compactSize: .portrait)
statusBarHost?.setStatusBarStyle(.lightContent, animated: true)
self.statusBarHost?.setStatusBarStyle(.lightContent, animated: true)
self.statusBarHost?.shouldChangeStatusBarStyle = { [weak self] style in
if let strongSelf = self {
strongSelf.previousStatusBarStyle = style
return false
}
return true
}
self.presentationDataDisposable = (presentationDataSignal
|> deliverOnMainQueue).start(next: { [weak self] presentationData in
@@ -276,6 +283,7 @@ public final class PasscodeEntryController: ViewController {
}
public override func dismiss(completion: (() -> Void)? = nil) {
self.statusBarHost?.shouldChangeStatusBarStyle = nil
if let statusBarHost = self.statusBarHost, let previousStatusBarStyle = self.previousStatusBarStyle {
statusBarHost.setStatusBarStyle(previousStatusBarStyle, animated: true)
}