coding

iOSClient/CCGlobal.h

@@ -278,6 +278,7 @@
 #define k_layout_view_favorite                          @"LayoutFavorite"
 #define k_layout_view_files                             @"LayoutFiles"
 #define k_layout_view_transfers                         @"LayoutTransfers"
+#define k_layout_view_media                             @"LayoutMedia"
 
 // Rich Workspace
 #define k_fileNameRichWorkspace                         @"Readme.md"

iOSClient/Main/Collection/NCCollectionViewCommon.swift

@@ -890,6 +890,7 @@ class NCCollectionViewCommon: UIViewController, UIGestureRecognizerDelegate, UIS
         if let segueNavigationController = segue.destination as? UINavigationController {
             if let segueViewController = segueNavigationController.topViewController as? NCDetailViewController {
                 segueViewController.metadata = metadataTouch
+                segueViewController.layoutKey = layoutKey
             }
         }
     }

iOSClient/Main/NCDetailViewController.swift

@@ -35,7 +35,8 @@ class NCDetailViewController: UIViewController {
     @objc var metadata: tableMetadata?
     @objc var selector: String?
     @objc var mediaFilterImage: Bool = false
-    
+    @objc var layoutKey = ""
+
     @objc var viewerImageViewController: NCViewerImageViewController?
     @objc var metadatas: [tableMetadata] = []
     
@@ -553,7 +554,7 @@ extension NCDetailViewController: NCViewerImageViewControllerDelegate, NCViewerI
         
         closeAllSubView()
         
-        NCViewerImageCommon.shared.getMetadatasDatasource(metadata: self.metadata, mediaDatasorce: mediaFilterImage) { (metadatas) in
+        NCViewerImageCommon.shared.getMetadatasDatasource(metadata: self.metadata, mediaDatasorce: mediaFilterImage, layoutKey: layoutKey) { (metadatas) in
             
             guard let metadatas = metadatas else {
                 self.viewUnload()

iOSClient/Media/NCMedia.swift

@@ -459,6 +459,7 @@ class NCMedia: UIViewController, DZNEmptyDataSetSource, DZNEmptyDataSetDelegate,
                 segueViewController.metadata = metadataTouch
                 segueViewController.metadatas = metadatas
                 segueViewController.mediaFilterImage = true
+                segueViewController.layoutKey = k_layout_view_media
             }
         }
     }

iOSClient/Viewer/NCViewerImage/NCViewerImageCommon.swift

@@ -42,7 +42,7 @@ class NCViewerImageCommon: NSObject {
         NCViewerImageCommon.offOutlineImage = CCGraphics.changeThemingColorImage(UIImage.init(named: "offOutlineImage"), width: UIScreen.main.bounds.size.width, height: UIScreen.main.bounds.size.width, color: NCBrandColor.sharedInstance.brandElement)
     }
     
-    func getMetadatasDatasource(metadata: tableMetadata?, mediaDatasorce: Bool, completion: @escaping (_ metadatas: [tableMetadata]?) -> Void) {
+    func getMetadatasDatasource(metadata: tableMetadata?, mediaDatasorce: Bool, layoutKey: String, completion: @escaping (_ metadatas: [tableMetadata]?) -> Void) {
         guard let metadata = metadata else {
             completion(nil)
             return
@@ -52,7 +52,7 @@ class NCViewerImageCommon: NSObject {
                 completion(metadatas)
             }
         } else {
-            let metadatas = NCManageDatabase.sharedInstance.getMetadatasViewer(predicate: NSPredicate(format: "account == %@ AND serverUrl == %@ AND (typeFile == %@ || typeFile == %@ || typeFile == %@)", metadata.account, metadata.serverUrl, k_metadataTypeFile_image, k_metadataTypeFile_video, k_metadataTypeFile_audio), sorted: NCUtility.shared.getSortedForView(key: k_layout_view_files, serverUrl: metadata.serverUrl), ascending: NCUtility.shared.getAscendingForView(key: k_layout_view_files, serverUrl: metadata.serverUrl))
+            let metadatas = NCManageDatabase.sharedInstance.getMetadatasViewer(predicate: NSPredicate(format: "account == %@ AND serverUrl == %@ AND (typeFile == %@ || typeFile == %@ || typeFile == %@)", metadata.account, metadata.serverUrl, k_metadataTypeFile_image, k_metadataTypeFile_video, k_metadataTypeFile_audio), sorted: NCUtility.shared.getSortedForView(key: layoutKey, serverUrl: metadata.serverUrl), ascending: NCUtility.shared.getAscendingForView(key: layoutKey, serverUrl: metadata.serverUrl))
             completion(metadatas)
         }
     }