marinofaggiana 4 years ago
parent
commit
3c5cbc74a4

+ 11 - 0
iOSClient/Main/Colleaction Common/NCCollectionViewCommon.swift

@@ -1220,6 +1220,17 @@ extension NCCollectionViewCommon: UICollectionViewDelegate {
                 return
             }
             
+            if metadata.typeFile == k_metadataTypeFile_image {
+                var mediaMetadatas: [tableMetadata] = []
+                for metadata in dataSource.metadatas {
+                    if metadata.typeFile == k_metadataTypeFile_image || metadata.typeFile == k_metadataTypeFile_video {
+                        mediaMetadatas.append(metadata)
+                    }
+                }
+                NCViewer.shared.view(viewController: self, metadata: metadataTouch, mediaMetadatas: mediaMetadatas)
+                return
+            }
+            
             if CCUtility.fileProviderStorageExists(metadataTouch.ocId, fileNameView: metadataTouch.fileNameView) {
                 NCViewer.shared.view(viewController: self, metadata: metadataTouch)
             } else {

+ 3 - 3
iOSClient/Media/NCMedia.swift

@@ -518,10 +518,10 @@ extension NCMedia: UICollectionViewDelegate {
                 collectionView.reloadItems(at: [indexPath])
             }
             
-            return
+        } else {
+            
+            NCViewer.shared.view(viewController: self, metadata: metadataTouch!, mediaMetadatas: metadatas)
         }
-        
-        performSegue(withIdentifier: "segueDetail", sender: self)
     }
 }
 

+ 1 - 1
iOSClient/Viewer/NCViewer.swift

@@ -34,7 +34,7 @@ class NCViewer: NSObject {
     private var viewerQuickLook: NCViewerQuickLook?
     private var metadata = tableMetadata()
     
-    func view(viewController: UIViewController, metadata: tableMetadata) {
+    func view(viewController: UIViewController, metadata: tableMetadata, mediaMetadatas: [tableMetadata]? = nil) {
 
         self.metadata = metadata