Marino Faggiana 6 years ago
parent
commit
68a06f2c88
2 changed files with 7 additions and 8 deletions
  1. 3 3
      iOSClient/Main/Layout/NCLayout.swift
  2. 4 5
      iOSClient/Media/NCMedia.swift

+ 3 - 3
iOSClient/Main/Layout/NCLayout.swift

@@ -65,9 +65,9 @@ class NCListLayout: UICollectionViewFlowLayout {
 
 
 class NCGridLayout: UICollectionViewFlowLayout {
 class NCGridLayout: UICollectionViewFlowLayout {
     
     
-    let heightLabelPlusButton: CGFloat = 45
-    let preferenceWidth: CGFloat = 110
-    let marginLeftRight: CGFloat = 1
+    var heightLabelPlusButton: CGFloat = 45
+    var preferenceWidth: CGFloat = 110
+    var marginLeftRight: CGFloat = 1
     
     
     override init() {
     override init() {
         super.init()
         super.init()

+ 4 - 5
iOSClient/Media/NCMedia.swift

@@ -72,14 +72,13 @@ class NCMedia: UIViewController ,UICollectionViewDataSource, UICollectionViewDel
         collectionView.alwaysBounceVertical = true
         collectionView.alwaysBounceVertical = true
 
 
         listLayout = NCListLayout()
         listLayout = NCListLayout()
+        
         gridLayout = NCGridLayout()
         gridLayout = NCGridLayout()
+        gridLayout.heightLabelPlusButton = 0
+        gridLayout.preferenceWidth = 80
         
         
         // Add Refresh Control
         // Add Refresh Control
-        if #available(iOS 10.0, *) {
-            collectionView.refreshControl = refreshControl
-        } else {
-            collectionView.addSubview(refreshControl)
-        }
+        collectionView.refreshControl = refreshControl
         
         
         // Configure Refresh Control
         // Configure Refresh Control
         refreshControl.tintColor = NCBrandColor.sharedInstance.brandText
         refreshControl.tintColor = NCBrandColor.sharedInstance.brandText