UI/UX

iOSClient/Offline/NCOffline.swift

@@ -72,12 +72,6 @@ class NCOffline: UIViewController ,UICollectionViewDataSource, UICollectionViewD
         listLayout = NCListLayoutOffline()
         gridLayout = NCGridLayoutOffline()
         
-        if CCUtility.getLayoutOffline() == "list" {
-            collectionView.collectionViewLayout = listLayout
-        } else {
-            collectionView.collectionViewLayout = gridLayout
-        }
-        
         // Add Refresh Control
         if #available(iOS 10.0, *) {
             collectionView.refreshControl = refreshControl
@@ -105,6 +99,12 @@ class NCOffline: UIViewController ,UICollectionViewDataSource, UICollectionViewD
         datasourceGroupBy = CCUtility.getGroupBySettings()
         datasourceDirectoryOnTop = CCUtility.getDirectoryOnTop()
         
+        if CCUtility.getLayoutOffline() == "list" {
+            collectionView.collectionViewLayout = listLayout
+        } else {
+            collectionView.collectionViewLayout = gridLayout
+        }
+        
         loadDatasource()
     }
     

iOSClient/Trash/NCTrash.swift

@@ -65,12 +65,6 @@ class NCTrash: UIViewController ,UICollectionViewDataSource, UICollectionViewDel
         listLayout = NCListLayoutTrash()
         gridLayout = NCGridLayoutTrash()
         
-        if CCUtility.getLayoutTrash() == "list" {
-            collectionView.collectionViewLayout = listLayout
-        } else {
-            collectionView.collectionViewLayout = gridLayout
-        }
-        
         // Add Refresh Control
         if #available(iOS 10.0, *) {
             collectionView.refreshControl = refreshControl
@@ -96,6 +90,12 @@ class NCTrash: UIViewController ,UICollectionViewDataSource, UICollectionViewDel
         datasourceSorted = CCUtility.getOrderSettings()
         datasourceAscending = CCUtility.getAscendingSettings()
         
+        if CCUtility.getLayoutTrash() == "list" {
+            collectionView.collectionViewLayout = listLayout
+        } else {
+            collectionView.collectionViewLayout = gridLayout
+        }
+        
         loadDatasource()
         loadListingTrash()
     }