dev

iOSClient/Main/NCDetailViewController.swift

@@ -542,7 +542,7 @@ extension NCDetailViewController: NCViewerImageViewControllerDelegate, NCViewerI
                 completion(index, NCViewerImageCommon.shared.getImageOffOutline(frame: self.view.frame, type: metadata.typeFile), metadata, ZoomScale.default, nil)
             }
     
-        } else {
+        } else if metadata.hasPreview {
                 
             let fileNamePath = CCUtility.returnFileNamePath(fromFileName: metadata.fileName, serverUrl: metadata.serverUrl, activeUrl: appDelegate.activeUrl)!
             let fileNameLocalPath = CCUtility.getDirectoryProviderStorageIconOcId(metadata.ocId, fileNameView: metadata.fileNameView)!
@@ -560,6 +560,8 @@ extension NCDetailViewController: NCViewerImageViewControllerDelegate, NCViewerI
                     completion(index, NCViewerImageCommon.shared.getImageOffOutline(frame: self.view.frame, type: metadata.typeFile), metadata, ZoomScale.default, nil)
                 }
             }
+        } else {
+            completion(index, NCViewerImageCommon.shared.getImageOffOutline(frame: self.view.frame, type: metadata.typeFile), metadata, ZoomScale.default, nil)
         }
     }
     
@@ -568,10 +570,12 @@ extension NCDetailViewController: NCViewerImageViewControllerDelegate, NCViewerI
         if index >= metadatas.count { return }
         let metadata = metadatas[index]
         
-        DispatchQueue.global().async {
-            if let image = NCViewerImageCommon.shared.getImage(metadata: metadata) {
-                DispatchQueue.main.asyncAfter(deadline: .now() + .milliseconds(400)) {
-                    view.image = image
+        if metadata.typeFile == k_metadataTypeFile_image {
+            DispatchQueue.global().async {
+                if let image = NCViewerImageCommon.shared.getImage(metadata: metadata) {
+                    DispatchQueue.main.asyncAfter(deadline: .now() + .milliseconds(400)) {
+                        view.image = image
+                    }
                 }
             }
         }

iOSClient/Viewer/NCViewerImage/NCViewerImageVideo.storyboard

@@ -17,11 +17,11 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="U2u-Ng-quR">
-                                <rect key="frame" x="0.0" y="64" width="414" height="778"/>
+                                <rect key="frame" x="0.0" y="69" width="414" height="773"/>
                                 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                             </view>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="oHy-h6-oBZ">
-                                <rect key="frame" x="8" y="18" width="45" height="26"/>
+                                <rect key="frame" x="5" y="44" width="45" height="26"/>
                                 <subviews>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="QdX-GD-p2D">
                                         <rect key="frame" x="11.5" y="2" width="22" height="22"/>
@@ -45,11 +45,11 @@
                         </subviews>
                         <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
                         <constraints>
-                            <constraint firstItem="U2u-Ng-quR" firstAttribute="top" secondItem="I8r-2q-gEp" secondAttribute="top" constant="20" id="JMx-LP-euj"/>
+                            <constraint firstItem="U2u-Ng-quR" firstAttribute="top" secondItem="I8r-2q-gEp" secondAttribute="top" constant="25" id="JMx-LP-euj"/>
                             <constraint firstItem="I8r-2q-gEp" firstAttribute="bottom" secondItem="U2u-Ng-quR" secondAttribute="bottom" constant="20" id="OB5-oL-uWd"/>
-                            <constraint firstItem="oHy-h6-oBZ" firstAttribute="leading" secondItem="I8r-2q-gEp" secondAttribute="leading" constant="8" id="V0z-bW-qho"/>
+                            <constraint firstItem="oHy-h6-oBZ" firstAttribute="leading" secondItem="I8r-2q-gEp" secondAttribute="leading" constant="5" id="V0z-bW-qho"/>
+                            <constraint firstItem="oHy-h6-oBZ" firstAttribute="top" secondItem="I8r-2q-gEp" secondAttribute="top" id="WU4-yL-oxZ"/>
                             <constraint firstAttribute="trailing" secondItem="U2u-Ng-quR" secondAttribute="trailing" id="fK9-2n-mIB"/>
-                            <constraint firstAttribute="top" secondItem="oHy-h6-oBZ" secondAttribute="top" constant="-18" id="lE8-hz-8Tq"/>
                             <constraint firstItem="U2u-Ng-quR" firstAttribute="leading" secondItem="ZUd-xF-jbc" secondAttribute="leading" id="zBR-Jl-ZtK"/>
                         </constraints>
                         <viewLayoutGuide key="safeArea" id="I8r-2q-gEp"/>