new view image

iOSClient/Viewer/NCViewerImage/NCViewerImage.storyboard

@@ -71,7 +71,7 @@
                                         <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"/>
+                                        <rect key="frame" x="10" y="54" width="30" height="30"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="30" id="l1v-vA-4gG"/>
                                             <constraint firstAttribute="width" constant="30" id="mSt-o6-S1g"/>
@@ -80,12 +80,10 @@
                                 </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>
@@ -94,6 +92,8 @@
                         <constraints>
                             <constraint firstAttribute="bottom" secondItem="CdQ-LC-Trx" secondAttribute="bottom" id="4qB-8y-OcG"/>
                             <constraint firstAttribute="trailing" secondItem="CdQ-LC-Trx" secondAttribute="trailing" id="IwE-oE-d3Y"/>
+                            <constraint firstItem="2AU-85-K8y" firstAttribute="leading" secondItem="Yo6-7W-moG" secondAttribute="leading" constant="10" id="X10-OG-EKg"/>
+                            <constraint firstItem="Yo6-7W-moG" firstAttribute="top" secondItem="2AU-85-K8y" secondAttribute="top" constant="-10" id="avO-83-uMQ"/>
                             <constraint firstItem="CdQ-LC-Trx" firstAttribute="leading" secondItem="fIE-H6-KKc" secondAttribute="leading" id="g8C-2m-KkX"/>
                             <constraint firstItem="CdQ-LC-Trx" firstAttribute="top" secondItem="fIE-H6-KKc" secondAttribute="top" id="hcQ-lB-JwU"/>
                         </constraints>

iOSClient/Viewer/NCViewerImage/NCViewerImageZoom.swift

@@ -51,10 +51,19 @@ class NCViewerImageZoom: UIViewController {
         
         scrollView.delegate = self
         scrollView.contentInsetAdjustmentBehavior = .never
-        imageView.image = self.image
-        imageView.frame = CGRect(x: self.imageView.frame.origin.x, y: self.imageView.frame.origin.y, width: self.image.size.width, height: self.image.size.height)
         
-        view.addGestureRecognizer(self.doubleTapGestureRecognizer)
+        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 NCManageDatabase.sharedInstance.isLivePhoto(metadata: metadata) != nil {
+            statusViewImage.image = CCGraphics.changeThemingColorImage(UIImage.init(named: "livePhoto"), width: 100, height: 100, color: .gray)
+        } else if metadata.typeFile == k_metadataTypeFile_video || metadata.typeFile == k_metadataTypeFile_audio {
+            statusViewImage.image = CCGraphics.changeThemingColorImage(UIImage.init(named: "play"), width: 100, height: 100, color: .gray)
+        } else {
+            statusViewImage.image = nil
+        }
+        
+        view.addGestureRecognizer(doubleTapGestureRecognizer)
     }
     
     override func viewWillAppear(_ animated: Bool) {
@@ -81,8 +90,8 @@ class NCViewerImageZoom: UIViewController {
 
     @objc func didDoubleTapWith(gestureRecognizer: UITapGestureRecognizer) {
         
-        let pointInView = gestureRecognizer.location(in: self.imageView)
-        var newZoomScale = self.scrollView.maximumZoomScale
+        let pointInView = gestureRecognizer.location(in: imageView)
+        var newZoomScale = scrollView.maximumZoomScale
         
         if scrollView.zoomScale >= newZoomScale || abs(scrollView.zoomScale - newZoomScale) <= 0.01 {
             newZoomScale = scrollView.minimumZoomScale
@@ -94,7 +103,7 @@ class NCViewerImageZoom: UIViewController {
         let originY = pointInView.y - (height / 2.0)
         
         let rectToZoomTo = CGRect(x: originX, y: originY, width: width, height: height)
-        self.scrollView.zoom(to: rectToZoomTo, animated: true)
+        scrollView.zoom(to: rectToZoomTo, animated: true)
     }
     
     //MARK: - Function
@@ -120,7 +129,7 @@ class NCViewerImageZoom: UIViewController {
         imageViewLeadingConstraint.constant = xOffset
         imageViewTrailingConstraint.constant = xOffset
 
-        let contentHeight = yOffset * 2 + self.imageView.frame.height
+        let contentHeight = yOffset * 2 + imageView.frame.height
         view.layoutIfNeeded()
         scrollView.contentSize = CGSize(width: scrollView.contentSize.width, height: contentHeight)
     }
@@ -133,7 +142,7 @@ extension NCViewerImageZoom: UIScrollViewDelegate {
     }
     
     func scrollViewDidZoom(_ scrollView: UIScrollView) {
-        updateConstraintsForSize(self.view.bounds.size)
+        updateConstraintsForSize(view.bounds.size)
     }
     
     func scrollViewDidScroll(_ scrollView: UIScrollView) {