marinofaggiana 4 years ago
parent
commit
29b7c18245

+ 1 - 1
iOSClient/Main/Collection Common/NCCollectionViewCommon.swift

@@ -1289,7 +1289,7 @@ extension NCCollectionViewCommon: UICollectionViewDelegate {
         
         return UIContextMenuConfiguration(identifier: identifier, previewProvider: {
             
-            return NCViewerProviderContextMenu(metadata: metadata)
+            return NCViewerProviderContextMenu(metadata: metadata, image: image)
             
         }, actionProvider: { suggestedActions in
             

+ 3 - 4
iOSClient/Media/NCMedia.swift

@@ -343,16 +343,15 @@ extension NCMedia: UICollectionViewDelegate {
         
         let metadata = metadatas[indexPath.row]
         let identifier = indexPath as NSCopying
+        let cell = collectionView.cellForItem(at: indexPath) as! NCGridMediaCell
+        let image = cell.imageItem.image
 
         return UIContextMenuConfiguration(identifier: identifier, previewProvider: {
             
-            return NCViewerProviderContextMenu(metadata: metadata)
+            return NCViewerProviderContextMenu(metadata: metadata, image: image)
             
         }, actionProvider: { suggestedActions in
             
-            let cell = collectionView.cellForItem(at: indexPath) as! NCGridMediaCell
-            let image = cell.imageItem.image
-            
             return NCFunctionCenter.shared.contextMenuConfiguration(ocId: metadata.ocId, viewController: self, enableDeleteLocal: false, enableViewInFolder: true, image: image)
         })
     }

+ 12 - 5
iOSClient/Viewer/NCViewerProviderContextMenu.swift

@@ -32,6 +32,7 @@ class NCViewerProviderContextMenu: UIViewController  {
     private var audioPlayer: AVAudioPlayer?
     private var metadata: tableMetadata?
     private var metadataLivePhoto: tableMetadata?
+    private var image: UIImage?
         
     // MARK: - View Life Cycle
 
@@ -39,17 +40,23 @@ class NCViewerProviderContextMenu: UIViewController  {
         fatalError("init(coder:) has not been implemented")
     }
     
-    init(metadata: tableMetadata) {
+    init(metadata: tableMetadata, image: UIImage?) {
         super.init(nibName: nil, bundle: nil)
         
         self.metadata = metadata
         self.metadataLivePhoto = NCManageDatabase.shared.getMetadataLivePhoto(metadata: metadata)
+        self.image = image
         
         if metadata.directory {
-
-            let image = UIImage(named: "folder")!.image(color: NCBrandColor.shared.brandElement, size: UIScreen.main.bounds.width / 2)
-            imageView.image = image
-            imageView.frame = resize(image.size)
+            
+            var imageFolder = UIImage(named: "folder")!.image(color: NCBrandColor.shared.brandElement, size: UIScreen.main.bounds.width / 2)
+            
+            if let image = self.image {
+                imageFolder =  image.image(color: NCBrandColor.shared.brandElement, size: UIScreen.main.bounds.width / 2)
+            }
+            
+            imageView.image = imageFolder
+            imageView.frame = resize(imageFolder.size)
 
         } else {