dev

Nextcloud.xcodeproj/project.pbxproj

@@ -2471,9 +2471,9 @@
 			isa = PBXGroup;
 			children = (
 				F7CF2FF6240833EF005DE5F8 /* NCViewerImageView.xib */,
+				F7CF2FF9240833EF005DE5F8 /* NCViewerImageCollectionViewCell.xib */,
 				F7CF2FF7240833EF005DE5F8 /* NCViewerImageAsset.swift */,
 				F7CF2FF8240833EF005DE5F8 /* NCViewerImageView.swift */,
-				F7CF2FF9240833EF005DE5F8 /* NCViewerImageCollectionViewCell.xib */,
 				F7CF2FFA240833EF005DE5F8 /* NCViewerImageCollectionViewCell.swift */,
 				F7CF2FFB240833EF005DE5F8 /* NCViewerImageNibLoadingView.swift */,
 			);

iOSClient/Main/NCDetailViewController.swift

@@ -108,12 +108,14 @@ class NCDetailViewController: UIViewController {
         if metadata.typeFile == k_metadataTypeFile_image {
             if let metadatas = NCManageDatabase.sharedInstance.getMetadatas(predicate: NSPredicate(format: "account == %@ AND serverUrl == %@ AND typeFile == %@", metadata.account, metadata.serverUrl, k_metadataTypeFile_image), sorted: "fileName", ascending: true) {
                 var assets: [NCViewerImageAsset?] = [NCViewerImageAsset]()
+                var index = 0
                 for metadata in metadatas {
-                    let imagePath = CCUtility.getDirectoryProviderStorageOcId(metadata.ocId, fileNameView: metadata.fileNameView)!
-                    if let image = UIImage(contentsOfFile: imagePath) {
-                        let asset = NCViewerImageAsset(image: image)
-                        assets.append(asset)
+                    let asset = NCViewerImageAsset(metadata: metadata)
+                    assets.append(asset)
+                    if metadata.ocId == self.metadata?.ocId {
+                        viewerImageView.preselectItem(at: index)
                     }
+                    index += 1
                 }
                 viewerImageView.assets = assets
             }

iOSClient/Viewer/NCViewerImage/NCViewerImageCollectionViewCell.swift

@@ -25,6 +25,12 @@ class NCViewerImageCollectionViewCell: UICollectionViewCell {
     func withImageAsset(_ asset: NCViewerImageAsset?) {
         guard self.dataTask?.state != URLSessionDataTask.State.running else { return }
         guard let asset = asset else { return }
+        guard let metadata = asset.metadata else { return }
+        let imagePath = CCUtility.getDirectoryProviderStorageOcId(metadata.ocId, fileNameView: metadata.fileNameView)!
+        if let image = UIImage(contentsOfFile: imagePath) {
+            self.apply(image: self.fitIntoFrame(image: image, type: asset.type))
+        }
+        /*
         if asset.image != nil {
             self.apply(image: self.fitIntoFrame(image: asset.image, type: asset.type))
         } else if asset.url != nil {
@@ -33,15 +39,16 @@ class NCViewerImageCollectionViewCell: UICollectionViewCell {
                 self.apply(image: self.fitIntoFrame(image: asset.image, type: asset.type))
             })
         }
+        */
     }
 
     func apply(image: UIImage?) {
         guard let image = image else { return }
-        self.galleryImageView.alpha = 0
+//        self.galleryImageView.alpha = 0
         self.galleryImageView.image = image
-        UIView.animate(withDuration: 0.1) {
-            self.galleryImageView.alpha = 1
-        }
+//        UIView.animate(withDuration: 0.1) {
+//            self.galleryImageView.alpha = 1
+//        }
     }
 
     override func draw(_ rect: CGRect) {

iOSClient/Viewer/NCViewerImage/NCViewerImageCollectionViewCell.xib

@@ -19,7 +19,7 @@
                     <scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="fYl-gF-3Tc">
                         <rect key="frame" x="0.0" y="0.0" width="372" height="458"/>
                         <subviews>
-                            <imageView contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="3" translatesAutoresizingMaskIntoConstraints="NO" id="Y2R-g3-1to">
+                            <imageView contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="logo" translatesAutoresizingMaskIntoConstraints="NO" id="Y2R-g3-1to">
                                 <rect key="frame" x="0.0" y="0.0" width="372" height="375"/>
                                 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                 <constraints>
@@ -63,6 +63,6 @@
         </collectionViewCell>
     </objects>
     <resources>
-        <image name="3" width="592.5" height="1555.5"/>
+        <image name="logo" width="223" height="157.5"/>
     </resources>
 </document>