coding

iOSClient/Favorites/NCFavorite.swift

@@ -104,6 +104,7 @@ class NCFavorite: UIViewController, UIGestureRecognizerDelegate, NCListCellDeleg
         autoUploadDirectory = NCManageDatabase.sharedInstance.getAccountAutoUploadDirectory(urlBase: appDelegate.urlBase, account: appDelegate.account)
         
         (layout, _, _, groupBy, _, titleButton, itemForLine) = NCUtility.shared.getLayoutForView(key: k_layout_view_favorite)
+        gridLayout.itemForLine = CGFloat(itemForLine)
         
         if layout == k_layout_list {
             collectionView.collectionViewLayout = listLayout

iOSClient/Main/Layout/NCLayout.swift

@@ -68,8 +68,8 @@ class NCGridLayout: UICollectionViewFlowLayout {
     var heightLabelPlusButton: CGFloat = 45
     var preferenceWidth: CGFloat = 110
     var marginLeftRight: CGFloat = 1
-    var numItems: Int = 0
-    
+    var itemForLine: CGFloat = 3
+
     override init() {
         super.init()
         
@@ -90,9 +90,9 @@ class NCGridLayout: UICollectionViewFlowLayout {
         get {
             if let collectionView = collectionView {
                 
-                self.numItems = Int(collectionView.frame.width / preferenceWidth)
-                let itemWidth: CGFloat = (collectionView.frame.width - (marginLeftRight * 2) - CGFloat(numItems)) / CGFloat(numItems)
+                let itemWidth: CGFloat = (collectionView.frame.width - marginLeftRight * 2 - marginLeftRight * (itemForLine - 1)) / itemForLine
                 let itemHeight: CGFloat = itemWidth + heightLabelPlusButton
+                
                 return CGSize(width: itemWidth, height: itemHeight)
             }
             
@@ -112,9 +112,8 @@ class NCGridLayout: UICollectionViewFlowLayout {
 class NCGridMediaLayout: UICollectionViewFlowLayout {
     
     var increasing = true
-    var itemPerLine: CGFloat = 3
+    var itemForLine: CGFloat = 3
     var marginLeftRight: CGFloat = 6
-    var numItems: Int = 0
     
     override init() {
         super.init()
@@ -136,7 +135,7 @@ class NCGridMediaLayout: UICollectionViewFlowLayout {
         get {
             if let collectionView = collectionView {
                 
-                let itemWidth: CGFloat = (collectionView.frame.width - marginLeftRight * 2 - marginLeftRight * (itemPerLine - 1)) / itemPerLine
+                let itemWidth: CGFloat = (collectionView.frame.width - marginLeftRight * 2 - marginLeftRight * (itemForLine - 1)) / itemForLine
                 let itemHeight: CGFloat = itemWidth
                 
                 return CGSize(width: itemWidth, height: itemHeight)

iOSClient/Media/NCMedia.swift

@@ -85,7 +85,7 @@ class NCMedia: UIViewController, DZNEmptyDataSetSource, DZNEmptyDataSetDelegate,
         collectionView.contentInset = UIEdgeInsets(top: 75, left: 0, bottom: 50, right: 0);
                 
         gridLayout = NCGridMediaLayout()
-        gridLayout.itemPerLine = CGFloat(min(CCUtility.getMediaWidthImage(), 5))
+        gridLayout.itemForLine = CGFloat(min(CCUtility.getMediaWidthImage(), 5))
         gridLayout.sectionHeadersPinToVisibleBounds = true
 
         collectionView.collectionViewLayout = gridLayout
@@ -108,8 +108,8 @@ class NCMedia: UIViewController, DZNEmptyDataSetSource, DZNEmptyDataSetDelegate,
         mediaCommandView = Bundle.main.loadNibNamed("NCMediaCommandView", owner: self, options: nil)?.first as? NCMediaCommandView
         self.view.addSubview(mediaCommandView!)
         mediaCommandView?.mediaView = self
-        mediaCommandView?.zoomInButton.isEnabled = !(self.gridLayout.itemPerLine == 1)
-        mediaCommandView?.zoomOutButton.isEnabled = !(self.gridLayout.itemPerLine == self.kMaxImageGrid - 1)
+        mediaCommandView?.zoomInButton.isEnabled = !(self.gridLayout.itemForLine == 1)
+        mediaCommandView?.zoomOutButton.isEnabled = !(self.gridLayout.itemForLine == self.kMaxImageGrid - 1)
         mediaCommandView?.collapseControlButtonView(true)
         mediaCommandView?.translatesAutoresizingMaskIntoConstraints = false
         mediaCommandView?.topAnchor.constraint(equalTo: view.topAnchor, constant: 0).isActive = true
@@ -172,31 +172,31 @@ class NCMedia: UIViewController, DZNEmptyDataSetSource, DZNEmptyDataSetDelegate,
     
     @objc func zoomOutGrid() {
         UIView.animate(withDuration: 0.0, animations: {
-            if(self.gridLayout.itemPerLine + 1 < self.kMaxImageGrid) {
-                self.gridLayout.itemPerLine += 1
+            if(self.gridLayout.itemForLine + 1 < self.kMaxImageGrid) {
+                self.gridLayout.itemForLine += 1
                 self.mediaCommandView?.zoomInButton.isEnabled = true
             }
-            if(self.gridLayout.itemPerLine == self.kMaxImageGrid - 1) {
+            if(self.gridLayout.itemForLine == self.kMaxImageGrid - 1) {
                 self.mediaCommandView?.zoomOutButton.isEnabled = false
             }
 
             self.collectionView.collectionViewLayout.invalidateLayout()
-            CCUtility.setMediaWidthImage(Int(self.gridLayout.itemPerLine))
+            CCUtility.setMediaWidthImage(Int(self.gridLayout.itemForLine))
         })
     }
 
     @objc func zoomInGrid() {
         UIView.animate(withDuration: 0.0, animations: {
-            if(self.gridLayout.itemPerLine - 1 > 0) {
-                self.gridLayout.itemPerLine -= 1
+            if(self.gridLayout.itemForLine - 1 > 0) {
+                self.gridLayout.itemForLine -= 1
                 self.mediaCommandView?.zoomOutButton.isEnabled = true
             }
-            if(self.gridLayout.itemPerLine == 1) {
+            if(self.gridLayout.itemForLine == 1) {
                 self.mediaCommandView?.zoomInButton.isEnabled = false
             }
 
             self.collectionView.collectionViewLayout.invalidateLayout()
-            CCUtility.setMediaWidthImage(Int(self.gridLayout.itemPerLine))
+            CCUtility.setMediaWidthImage(Int(self.gridLayout.itemForLine))
         })
     }
     

iOSClient/Offline/NCOffline.swift

@@ -114,7 +114,8 @@ class NCOffline: UIViewController, UIGestureRecognizerDelegate, NCListCellDelega
         autoUploadDirectory = NCManageDatabase.sharedInstance.getAccountAutoUploadDirectory(urlBase: appDelegate.urlBase, account: appDelegate.account)
         
         (layout, _, _, groupBy, _, titleButton, itemForLine) = NCUtility.shared.getLayoutForView(key: k_layout_view_offline)
-
+        gridLayout.itemForLine = CGFloat(itemForLine)
+        
         if layout == k_layout_list {
             collectionView.collectionViewLayout = listLayout
         } else {

iOSClient/Select/NCSelect.swift

@@ -179,6 +179,7 @@ class NCSelect: UIViewController, UIGestureRecognizerDelegate, NCListCellDelegat
         autoUploadDirectory = NCManageDatabase.sharedInstance.getAccountAutoUploadDirectory(urlBase: appDelegate.urlBase, account: appDelegate.account)
         
         (layout, _, _, groupBy, _, titleButton, itemForLine) = NCUtility.shared.getLayoutForView(key: keyLayout)
+        gridLayout.itemForLine = CGFloat(itemForLine)
         
         if layout == k_layout_list {
             collectionView.collectionViewLayout = listLayout

iOSClient/Trash/NCTrash.swift

@@ -89,7 +89,8 @@ class NCTrash: UIViewController, UIGestureRecognizerDelegate, NCTrashListCellDel
         self.navigationItem.title = titleCurrentFolder
 
         (layout, _, _, groupBy, _, titleButton, itemForLine) = NCUtility.shared.getLayoutForView(key: k_layout_view_trash)
-
+        gridLayout.itemForLine = CGFloat(itemForLine)
+        
         if layout == k_layout_list {
             collectionView.collectionViewLayout = listLayout
         } else {