new view image

iOSClient/Viewer/NCViewerImage/NCViewerImage.storyboard

@@ -70,13 +70,22 @@
                                     <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="1" translatesAutoresizingMaskIntoConstraints="NO" id="kPV-JM-UnM">
                                         <rect key="frame" x="0.0" y="0.0" width="320" height="206"/>
                                     </imageView>
+                                    <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="2AU-85-K8y">
+                                        <rect key="frame" x="10" y="10" width="30" height="30"/>
+                                        <constraints>
+                                            <constraint firstAttribute="height" constant="30" id="l1v-vA-4gG"/>
+                                            <constraint firstAttribute="width" constant="30" id="mSt-o6-S1g"/>
+                                        </constraints>
+                                    </imageView>
                                 </subviews>
                                 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                 <constraints>
+                                    <constraint firstItem="2AU-85-K8y" firstAttribute="leading" secondItem="CdQ-LC-Trx" secondAttribute="leading" constant="10" id="GvY-JZ-Fca"/>
                                     <constraint firstItem="kPV-JM-UnM" firstAttribute="leading" secondItem="CdQ-LC-Trx" secondAttribute="leading" id="asL-Ft-Lmc"/>
                                     <constraint firstAttribute="trailing" secondItem="kPV-JM-UnM" secondAttribute="trailing" id="fBN-70-6ry"/>
                                     <constraint firstItem="kPV-JM-UnM" firstAttribute="top" secondItem="CdQ-LC-Trx" secondAttribute="top" id="tdo-XY-uqv"/>
                                     <constraint firstAttribute="bottom" secondItem="kPV-JM-UnM" secondAttribute="bottom" id="xTI-ae-JfJ"/>
+                                    <constraint firstItem="2AU-85-K8y" firstAttribute="top" secondItem="CdQ-LC-Trx" secondAttribute="top" constant="10" id="zRS-KK-qAv"/>
                                 </constraints>
                             </scrollView>
                         </subviews>
@@ -96,6 +105,7 @@
                         <outlet property="imageViewTopConstraint" destination="tdo-XY-uqv" id="9Ty-3b-gkL"/>
                         <outlet property="imageViewTrailingConstraint" destination="fBN-70-6ry" id="dZZ-2L-0VJ"/>
                         <outlet property="scrollView" destination="CdQ-LC-Trx" id="3np-FR-s39"/>
+                        <outlet property="statusViewImage" destination="2AU-85-K8y" id="22h-Ec-bj0"/>
                     </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="fbE-Jv-mLH" userLabel="First Responder" sceneMemberID="firstResponder"/>

iOSClient/Viewer/NCViewerImage/NCViewerImagePageContainer.swift

@@ -18,6 +18,7 @@ class NCViewerImagePageContainer: UIViewController, UIGestureRecognizerDelegate
     }
     
     var metadatas: [tableMetadata] = []
+    var metadata: tableMetadata = tableMetadata()
     var currentIndex = 0
     var nextIndex: Int?
    
@@ -44,12 +45,22 @@ class NCViewerImagePageContainer: UIViewController, UIGestureRecognizerDelegate
         let viewerImageZoom = UIStoryboard(name: "NCViewerImage", bundle: nil).instantiateViewController(withIdentifier: "NCViewerImageZoom") as! NCViewerImageZoom
         viewerImageZoom.delegate = self
         viewerImageZoom.index = currentIndex
-        viewerImageZoom.image = getImageFromMetadata(metadatas[currentIndex])
+        viewerImageZoom.image = getImageMetadata(metadatas[currentIndex])
         singleTapGestureRecognizer.require(toFail: viewerImageZoom.doubleTapGestureRecognizer)
         
         pageViewController.setViewControllers([viewerImageZoom], direction: .forward, animated: true, completion: nil)
     }
     
+    override func viewWillAppear(_ animated: Bool) {
+        super.viewWillAppear(animated)
+
+        let buttonMore = UIBarButtonItem.init(image: CCGraphics.changeThemingColorImage(UIImage(named: "more"), width: 50, height: 50, color: NCBrandColor.sharedInstance.textView), style: .plain, target: self, action: #selector(self.openMenuMore))
+        navigationItem.rightBarButtonItem = buttonMore
+        
+        navigationController?.navigationBar.prefersLargeTitles = true
+        navigationItem.title = metadata.fileNameView
+    }
+    
     func gestureRecognizerShouldBegin(_ gestureRecognizer: UIGestureRecognizer) -> Bool {
         
         if let gestureRecognizer = gestureRecognizer as? UIPanGestureRecognizer {
@@ -128,13 +139,33 @@ class NCViewerImagePageContainer: UIViewController, UIGestureRecognizerDelegate
         }
     }
     
-    func getImageFromMetadata(_ metadata: tableMetadata) -> UIImage {
+    func getImageMetadata(_ metadata: tableMetadata) -> UIImage {
+        
+        setMetadata(metadata)
+        
         if FileManager().fileExists(atPath: CCUtility.getDirectoryProviderStorageIconOcId(metadata.ocId, etag: metadata.etag)) {
             return UIImage(contentsOfFile: CCUtility.getDirectoryProviderStorageIconOcId(metadata.ocId, etag: metadata.etag))!
         } else {
             return NCCollectionCommon.images.cellFileImage
         }
     }
+    
+    func setMetadata(_ metadata: tableMetadata) {
+        self.metadata = metadata
+        
+        navigationItem.title = metadata.fileNameView
+    }
+    
+    @objc func viewUnload() {
+        
+        navigationController?.popViewController(animated: true)
+    }
+    
+    //MARK: - Action
+    
+    @objc func openMenuMore() {
+        NCViewer.shared.toggleMoreMenu(viewController: self, metadata: metadata)
+    }
 }
 
 extension NCViewerImagePageContainer: UIPageViewControllerDelegate, UIPageViewControllerDataSource {
@@ -147,7 +178,7 @@ extension NCViewerImagePageContainer: UIPageViewControllerDelegate, UIPageViewCo
         
         let viewerImageZoom = UIStoryboard(name: "NCViewerImage", bundle: nil).instantiateViewController(withIdentifier: "NCViewerImageZoom") as! NCViewerImageZoom
         viewerImageZoom.delegate = self
-        viewerImageZoom.image = getImageFromMetadata(metadatas[currentIndex - 1])
+        viewerImageZoom.image = getImageMetadata(metadatas[currentIndex - 1])
         viewerImageZoom.index = currentIndex - 1
         self.singleTapGestureRecognizer.require(toFail: viewerImageZoom.doubleTapGestureRecognizer)
         return viewerImageZoom
@@ -163,7 +194,7 @@ extension NCViewerImagePageContainer: UIPageViewControllerDelegate, UIPageViewCo
         let viewerImageZoom = UIStoryboard(name: "NCViewerImage", bundle: nil).instantiateViewController(withIdentifier: "NCViewerImageZoom") as! NCViewerImageZoom
         viewerImageZoom.delegate = self
         singleTapGestureRecognizer.require(toFail: viewerImageZoom.doubleTapGestureRecognizer)
-        viewerImageZoom.image = getImageFromMetadata(metadatas[currentIndex + 1])
+        viewerImageZoom.image = getImageMetadata(metadatas[currentIndex + 1])
         viewerImageZoom.index = currentIndex + 1
         return viewerImageZoom
         
@@ -187,6 +218,7 @@ extension NCViewerImagePageContainer: UIPageViewControllerDelegate, UIPageViewCo
             }
 
             currentIndex = nextIndex!
+            setMetadata(metadatas[currentIndex])
         }
         
         self.nextIndex = nil

iOSClient/Viewer/NCViewerImage/NCViewerImageZoom.swift

@@ -13,6 +13,7 @@ class NCViewerImageZoom: UIViewController {
     @IBOutlet weak var imageViewTrailingConstraint: NSLayoutConstraint!
     @IBOutlet weak var scrollView: UIScrollView!
     @IBOutlet weak var imageView: UIImageView!
+    @IBOutlet weak var statusViewImage: UIImageView!
     
     weak var delegate: NCViewerImageZoomDelegate?