Improve status bar height initial value (#838)

* Improve PDFReaderViewController code * Improve PDFReaderViewController statusBarHeight initial value
zotero · Feb 2, 2024 · b47f037 · b47f037
1 parent 9edb197
commit b47f037
Showing 1 changed file with 5 additions and 16 deletions.
diff --git a/Zotero/Scenes/Detail/PDF/Views/PDFReaderViewController.swift b/Zotero/Scenes/Detail/PDF/Views/PDFReaderViewController.swift
@@ -75,7 +75,7 @@ class PDFReaderViewController: UIViewController {
     private var previousTraitCollection: UITraitCollection?
     var isSidebarVisible: Bool { return self.sidebarControllerLeft?.constant == 0 }
     var key: String { return self.viewModel.state.key }
-    var statusBarHeight: CGFloat
+    var statusBarHeight: CGFloat = .zero
     var navigationBarHeight: CGFloat {
         return self.navigationController?.navigationBar.frame.height ?? 0.0
     }
@@ -182,18 +182,6 @@ class PDFReaderViewController: UIViewController {
         self.viewModel = viewModel
         self.isCompactWidth = compactSize
         self.disposeBag = DisposeBag()
-        self.statusBarHeight = UIApplication
-            .shared
-            .connectedScenes
-            .filter({ $0.activationState == .foregroundActive })
-            .compactMap({ $0 as? UIWindowScene })
-            .first?
-            .windows
-            .first(where: { $0.isKeyWindow })?
-            .windowScene?
-            .statusBarManager?
-            .statusBarFrame
-            .height ?? 0
         super.init(nibName: nil, bundle: nil)
     }
 
@@ -204,6 +192,8 @@ class PDFReaderViewController: UIViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
 
+        statusBarHeight = (view.scene as? UIWindowScene)?.statusBarManager?.statusBarFrame.height ?? .zero
+
         self.set(userActivity: .pdfActivity(for: self.viewModel.state.key, libraryId: self.viewModel.state.library.identifier, collectionId: Defaults.shared.selectedCollectionId))
 
         self.view.backgroundColor = .systemGray6
@@ -741,7 +731,7 @@ extension PDFReaderViewController: AnnotationToolbarDelegate {
             return self.isCompactWidth ? documentController.view.frame.size.width : (documentController.view.frame.size.width - (2 * AnnotationToolbarHandler.toolbarFullInsetInset))
 
         case .trailing, .leading:
-            let window = (view.scene as? UIWindowScene)?.windows.first(where: \.isKeyWindow)
+            let window = (view.scene as? UIWindowScene)?.keyWindow
             let topInset = window?.safeAreaInsets.top ?? 0
             let bottomInset = window?.safeAreaInsets.bottom ?? 0
             let interfaceIsHidden = self.navigationController?.isNavigationBarHidden ?? false
@@ -816,8 +806,7 @@ extension PDFReaderViewController: PDFDocumentDelegate {
         self.annotationToolbarHandler.interfaceVisibilityDidChange()
 
         UIView.animate(withDuration: 0.15, animations: {
-            self.navigationController?.setNeedsStatusBarAppearanceUpdate()
-            self.setNeedsStatusBarAppearanceUpdate()
+            self.updateStatusBar()
             self.view.layoutIfNeeded()
             if shouldChangeNavigationBarVisibility {
                 self.navigationController?.navigationBar.alpha = isHidden ? 0 : 1