marinofaggiana 5 年之前
父節點
當前提交
b006ae4e42
共有 2 個文件被更改,包括 25 次插入12 次删除
  1. 23 7
      iOSClient/Main/NCDetailViewController.swift
  2. 2 5
      iOSClient/Viewer/NCViewerPDF.swift

+ 23 - 7
iOSClient/Main/NCDetailViewController.swift

@@ -29,14 +29,15 @@ class NCDetailViewController: UIViewController {
     
     @IBOutlet weak var backgroundView: UIImageView!
     
+    private let appDelegate = UIApplication.shared.delegate as! AppDelegate
+   
+    @objc var isNavigationBarHidden = false
     @objc var metadata: tableMetadata?
     @objc var selector: String?
-    
     @objc var favoriteFilterImage: Bool = false
     @objc var mediaFilterImage: Bool = false
     @objc var offlineFilterImage: Bool = false
-
-    private let appDelegate = UIApplication.shared.delegate as! AppDelegate
+    
     private var viewerImageViewController: NCViewerImageViewController?
     private var metadatas = [tableMetadata]()
     private var viewerImageViewControllerIndexStart = 0
@@ -67,6 +68,12 @@ class NCDetailViewController: UIViewController {
         }
     }
     
+    override func viewWillAppear(_ animated: Bool) {
+        super.viewWillAppear(animated)
+        
+        navigateControllerBarHidden(isNavigationBarHidden)
+    }
+    
     override func viewDidDisappear(_ animated: Bool) {
         super.viewDidDisappear(animated)
         
@@ -118,6 +125,17 @@ class NCDetailViewController: UIViewController {
         backgroundView.image = CCGraphics.changeThemingColorImage(UIImage.init(named: "logo"), multiplier: 2, color: NCBrandColor.sharedInstance.brand.withAlphaComponent(0.4))
     }
     
+    @objc func navigateControllerBarHidden(_ state: Bool) {
+        if state  {
+            view.backgroundColor = .black
+        } else {
+            view.backgroundColor = NCBrandColor.sharedInstance.backgroundView
+        }
+        
+        navigationController?.isNavigationBarHidden = state
+        isNavigationBarHidden = state
+    }
+    
     //MARK: - NotificationCenter
 
     @objc func changeTheming() {
@@ -492,11 +510,9 @@ extension NCDetailViewController: NCViewerImageViewControllerDelegate, NCViewerI
         guard let navigationController = self.navigationController else { return }
         
         if navigationController.isNavigationBarHidden {
-            navigationController.isNavigationBarHidden = false
-            view.backgroundColor = NCBrandColor.sharedInstance.backgroundView
+            navigateControllerBarHidden(false)
         } else {
-            navigationController.isNavigationBarHidden = true
-            view.backgroundColor = .black
+            navigateControllerBarHidden(true)
         }
         
         NCViewerImageCommon.shared.imageChangeSizeView(viewerImageViewController: viewerImageViewController, size: self.backgroundView.frame.size, metadata: metadata)

+ 2 - 5
iOSClient/Viewer/NCViewerPDF.swift

@@ -88,23 +88,20 @@ import PDFKit
     @objc func didTap(_ recognizer: UITapGestureRecognizer) {
         guard let navigationController = appDelegate.activeDetail.navigationController else { return }
         
-        
         if navigationController.isNavigationBarHidden {
             
-            navigationController.isNavigationBarHidden = false
+            appDelegate.activeDetail.navigateControllerBarHidden(false)
             pdfThumbnailView!.isHidden = false
             backgroundColor = NCBrandColor.sharedInstance.backgroundView
-            appDelegate.activeDetail.view.backgroundColor = backgroundColor
             
         } else {
             
             let point = recognizer.location(in: self)
             if point.y > self.frame.height - thumbnailViewHeight { return }
             
-            navigationController.isNavigationBarHidden = true
+            appDelegate.activeDetail.navigateControllerBarHidden(true)
             pdfThumbnailView!.isHidden = true
             backgroundColor = .black
-            appDelegate.activeDetail.view.backgroundColor = backgroundColor
         }
 
         let size = self.appDelegate.activeDetail.backgroundView!.bounds