浏览代码

update image view

marinofaggiana 4 年之前
父节点
当前提交
4ef2b82aea

+ 1 - 1
iOSClient/Viewer/NCViewerImage/NCViewerImagePageContainer.swift

@@ -227,7 +227,7 @@ class NCViewerImagePageContainer: UIViewController, UIGestureRecognizerDelegate
     
     //MARK: - Delegate Image Zoom
 
-    func viewWillAppearImageZoom(viewerImageZoom: NCViewerImageZoom, metadata: tableMetadata) {
+    func viewDidAppearImageZoom(viewerImageZoom: NCViewerImageZoom, metadata: tableMetadata) {
         
         currentMetadata = metadata
         currentViewerImageZoom = viewerImageZoom

+ 11 - 4
iOSClient/Viewer/NCViewerImage/NCViewerImageZoom.swift

@@ -74,10 +74,10 @@ class NCViewerImageZoom: UIViewController {
         view.addGestureRecognizer(doubleTapGestureRecognizer)
     }
     
-    override func viewWillAppear(_ animated: Bool) {
-        super.viewWillAppear(animated)
+    override func viewDidAppear(_ animated: Bool) {
+        super.viewDidAppear(animated)
         
-        delegate?.viewWillAppearImageZoom(viewerImageZoom: self, metadata: metadata)
+        delegate?.viewDidAppearImageZoom(viewerImageZoom: self, metadata: metadata)
     }
     
     override func viewDidLayoutSubviews() {
@@ -143,7 +143,14 @@ class NCViewerImageZoom: UIViewController {
         
         self.image = image
         imageView.image = image
-        imageView.frame = CGRect(x: imageView.frame.origin.x, y: imageView.frame.origin.y, width: image.size.width, height: image.size.height)
+        
+        if delegate?.navigationController?.navigationBar.isHidden ?? false {
+            delegate?.navigationController?.setNavigationBarHidden(false, animated: false)
+            delegate?.navigationController?.setNavigationBarHidden(true, animated: false)
+        } else {
+            delegate?.navigationController?.setNavigationBarHidden(true, animated: false)
+            delegate?.navigationController?.setNavigationBarHidden(false, animated: false)
+        }
     }
 }