marinofaggiana 3 years ago
parent
commit
848985200c

+ 8 - 3
iOSClient/Viewer/NCViewerImage/NCViewerImage.swift

@@ -85,6 +85,7 @@ class NCViewerImage: UIViewController {
         viewerImageZoom.metadata = metadatas[currentIndex]
         viewerImageZoom.delegate = self
         viewerImageZoom.viewerImage = self
+        viewerImageZoom.isShowDetail = false
 
         singleTapGestureRecognizer.require(toFail: viewerImageZoom.doubleTapGestureRecognizer)
         
@@ -392,7 +393,8 @@ extension NCViewerImage: UIPageViewControllerDelegate, UIPageViewControllerDataS
         viewerImageZoom.metadata = metadatas[currentIndex]
         viewerImageZoom.delegate = self
         viewerImageZoom.viewerImage = self
-        
+        viewerImageZoom.isShowDetail = false
+
         singleTapGestureRecognizer.require(toFail: viewerImageZoom.doubleTapGestureRecognizer)
         
         pageViewController.setViewControllers([viewerImageZoom], direction: direction, animated: true, completion: nil)
@@ -412,6 +414,7 @@ extension NCViewerImage: UIPageViewControllerDelegate, UIPageViewControllerDataS
             viewerImageZoom.metadata = metadatas[currentIndex]
             viewerImageZoom.delegate = self
             viewerImageZoom.viewerImage = self
+            viewerImageZoom.isShowDetail = currentViewerImageZoom?.detailView.isShow() ?? false
             
             singleTapGestureRecognizer.require(toFail: viewerImageZoom.doubleTapGestureRecognizer)
             
@@ -430,7 +433,8 @@ extension NCViewerImage: UIPageViewControllerDelegate, UIPageViewControllerDataS
         viewerImageZoom.metadata = metadatas[currentIndex - 1]
         viewerImageZoom.delegate = self
         viewerImageZoom.viewerImage = self
-        
+        viewerImageZoom.isShowDetail = false
+
         self.singleTapGestureRecognizer.require(toFail: viewerImageZoom.doubleTapGestureRecognizer)
         
         return viewerImageZoom
@@ -446,7 +450,8 @@ extension NCViewerImage: UIPageViewControllerDelegate, UIPageViewControllerDataS
         viewerImageZoom.metadata = metadatas[currentIndex + 1]
         viewerImageZoom.delegate = self
         viewerImageZoom.viewerImage = self
-        
+        viewerImageZoom.isShowDetail = false
+
         singleTapGestureRecognizer.require(toFail: viewerImageZoom.doubleTapGestureRecognizer)
 
         return viewerImageZoom

+ 6 - 0
iOSClient/Viewer/NCViewerImage/NCViewerImageZoom.swift

@@ -49,6 +49,7 @@ class NCViewerImageZoom: UIViewController {
     var image: UIImage?
     var metadata: tableMetadata = tableMetadata()
     var index: Int = 0
+    var isShowDetail: Bool = false
     var noPreview: Bool = false
     var doubleTapGestureRecognizer: UITapGestureRecognizer = UITapGestureRecognizer()
     var imageViewConstraint: CGFloat = 0
@@ -106,6 +107,11 @@ class NCViewerImageZoom: UIViewController {
         super.viewWillAppear(animated)
             
         delegate?.willAppearImageZoom(viewerImageZoom: self, metadata: metadata)
+        
+        if isShowDetail {
+            openDetail()
+        } else {
+        }
     }
     
     override func viewDidAppear(_ animated: Bool) {