coding

Signed-off-by: marinofaggiana <ios@nextcloud.com>

Share/NCShareExtension+Files.swift

@@ -27,8 +27,15 @@ extension NCShareExtension {
 
     @objc func reloadDatasource(withLoadFolder: Bool) {
 
+        var groupByField = "name"
+
         layoutForView = NCUtility.shared.getLayoutForView(key: keyLayout, serverUrl: serverUrl)
 
+        // set GroupField for Grid
+        if layoutForView?.layout == NCGlobal.shared.layoutGrid {
+            groupByField = "classFile"
+        }
+
         let metadatasSource = NCManageDatabase.shared.getMetadatas(predicate: NSPredicate(format: "account == %@ AND serverUrl == %@ AND directory == true", activeAccount.account, serverUrl))
         self.dataSource = NCDataSource(
             metadatasSource: metadatasSource,
@@ -37,7 +44,8 @@ extension NCShareExtension {
             ascending: layoutForView?.ascending,
             directoryOnTop: layoutForView?.directoryOnTop,
             favoriteOnTop: true,
-            filterLivePhoto: true)
+            filterLivePhoto: true,
+            groupByField: groupByField)
 
         if withLoadFolder {
             loadFolder()

iOSClient/Data/NCDataSource.swift

@@ -300,6 +300,8 @@ class NCDataSource: NSObject {
         switch self.groupByField {
         case "name":
             return metadata.name
+        case "classFile":
+            return metadata.classFile
         default:
             return metadata.name
         }

iOSClient/Favorites/NCFavorite.swift

@@ -61,7 +61,8 @@ class NCFavorite: NCCollectionViewCommon {
                                        ascending: self.layoutForView?.ascending,
                                        directoryOnTop: self.layoutForView?.directoryOnTop,
                                        favoriteOnTop: true,
-                                       filterLivePhoto: true)
+                                       filterLivePhoto: true,
+                                       groupByField: self.groupByField)
 
         DispatchQueue.main.async {
             self.refreshControl.endRefreshing()

iOSClient/FileViewInFolder/NCFileViewInFolder.swift

@@ -97,7 +97,8 @@ class NCFileViewInFolder: NCCollectionViewCommon {
                                            ascending: self.layoutForView?.ascending,
                                            directoryOnTop: self.layoutForView?.directoryOnTop,
                                            favoriteOnTop: true,
-                                           filterLivePhoto: true)
+                                           filterLivePhoto: true,
+                                           groupByField: self.groupByField)
 
             DispatchQueue.main.async {
 

iOSClient/Files/NCFiles.swift

@@ -87,7 +87,8 @@ class NCFiles: NCCollectionViewCommon {
             ascending: self.layoutForView?.ascending,
             directoryOnTop: self.layoutForView?.directoryOnTop,
             favoriteOnTop: true,
-            filterLivePhoto: true)
+            filterLivePhoto: true,
+            groupByField: self.groupByField)
 
         DispatchQueue.main.async {
             self.refreshControl.endRefreshing()

iOSClient/Main/Collection Common/NCCollectionViewCommon.swift

@@ -51,6 +51,8 @@ class NCCollectionViewCommon: UIViewController, UIGestureRecognizerDelegate, UIS
     private var autoUploadFileName = ""
     private var autoUploadDirectory = ""
 
+    internal var groupByField = "name"
+
     internal var listLayout: NCListLayout!
     internal var gridLayout: NCGridLayout!
 
@@ -995,6 +997,13 @@ class NCCollectionViewCommon: UIViewController, UIGestureRecognizerDelegate, UIS
 
         // get layout for view
         layoutForView = NCUtility.shared.getLayoutForView(key: layoutKey, serverUrl: serverUrl)
+
+        // set GroupField for Grid
+        if !self.isSearching && layoutForView?.layout == NCGlobal.shared.layoutGrid {
+            groupByField = "classFile"
+        } else {
+            groupByField = "name"
+        }
     }
 
     @objc func reloadDataSourceNetwork(forced: Bool = false) { }

iOSClient/Offline/NCOffline.swift

@@ -75,7 +75,8 @@ class NCOffline: NCCollectionViewCommon {
             ascending: self.layoutForView?.ascending,
             directoryOnTop: self.layoutForView?.directoryOnTop,
             favoriteOnTop: true,
-            filterLivePhoto: true)
+            filterLivePhoto: true,
+            groupByField: self.groupByField)
 
         DispatchQueue.main.async {
             self.refreshControl.endRefreshing()

iOSClient/Recent/NCRecent.swift

@@ -53,7 +53,8 @@ class NCRecent: NCCollectionViewCommon {
             self.dataSource = NCDataSource(metadatasSource: self.metadatasSource,
                                            account: self.appDelegate.account,
                                            directoryOnTop: false,
-                                           favoriteOnTop: false)
+                                           favoriteOnTop: false,
+                                           groupByField: self.groupByField)
 
             DispatchQueue.main.async {
                 self.refreshControl.endRefreshing()

iOSClient/Select/NCSelect.swift

@@ -709,9 +709,15 @@ extension NCSelect {
     @objc func loadDatasource(withLoadFolder: Bool) {
 
         var predicate: NSPredicate?
-
+        var groupByField = "name"
+        
         layoutForView = NCUtility.shared.getLayoutForView(key: keyLayout, serverUrl: serverUrl)
 
+        // set GroupField for Grid
+        if layoutForView?.layout == NCGlobal.shared.layoutGrid {
+            groupByField = "classFile"
+        }
+
         if includeDirectoryE2EEncryption {
 
             if includeImages {
@@ -729,6 +735,7 @@ extension NCSelect {
             }
         }
 
+
         let metadatasSource = NCManageDatabase.shared.getMetadatas(predicate: predicate!)
         self.dataSource = NCDataSource(metadatasSource: metadatasSource,
                                        account: activeAccount.account,
@@ -736,7 +743,8 @@ extension NCSelect {
                                        ascending: layoutForView?.ascending,
                                        directoryOnTop: layoutForView?.directoryOnTop,
                                        favoriteOnTop: true,
-                                       filterLivePhoto: true)
+                                       filterLivePhoto: true,
+                                       groupByField: groupByField)
 
         if withLoadFolder {
             loadFolder()

iOSClient/Shares/NCShares.swift

@@ -64,7 +64,8 @@ class NCShares: NCCollectionViewCommon {
                                            ascending: self.layoutForView?.ascending,
                                            directoryOnTop: self.layoutForView?.directoryOnTop,
                                            favoriteOnTop: true,
-                                           filterLivePhoto: true)
+                                           filterLivePhoto: true,
+                                           groupByField: self.groupByField)
 
             DispatchQueue.main.async {
                 self.refreshControl.endRefreshing()