Marino Faggiana %!s(int64=6) %!d(string=hai) anos
pai
achega
576ddfe8a5
Modificáronse 2 ficheiros con 27 adicións e 10 borrados
  1. 24 7
      iOSClient/Trash/NCTrash.swift
  2. 3 3
      iOSClient/Trash/NCTrashGridCell.xib

+ 24 - 7
iOSClient/Trash/NCTrash.swift

@@ -641,12 +641,7 @@ class NCTrash: UIViewController ,UICollectionViewDataSource, UICollectionViewDel
                 
                 if selectFileID.contains(tableTrash.fileID) {
                     cell.imageSelect.image = CCGraphics.changeThemingColorImage(UIImage.init(named: "checkedYes"), multiplier: 2, color: NCBrandColor.sharedInstance.brand)
-                    
-                    let blurEffect = UIBlurEffect(style: .extraLight)
-                    let blurEffectView = UIVisualEffectView(effect: blurEffect)
-                    blurEffectView.frame = cell.bounds
-                    blurEffectView.autoresizingMask = [.flexibleWidth, .flexibleHeight]
-                    cell.backgroundView = blurEffectView
+                    cell.backgroundView = cellBlurEffect(with: cell.bounds)
                 } else {
                     cell.imageSelect.image = CCGraphics.changeThemingColorImage(UIImage.init(named: "checkedNo"), multiplier: 2, color: NCBrandColor.sharedInstance.brand)
                     cell.backgroundView = nil
@@ -679,11 +674,14 @@ class NCTrash: UIViewController ,UICollectionViewDataSource, UICollectionViewDel
                 cell.imageSelect.isHidden = false
                 if selectFileID.contains(tableTrash.fileID) {
                     cell.imageSelect.image = CCGraphics.changeThemingColorImage(UIImage.init(named: "checkedYes"), multiplier: 2, color: NCBrandColor.sharedInstance.brand)
+                    cell.backgroundView = cellBlurEffect(with: cell.bounds)
                 } else {
                     cell.imageSelect.isHidden = true
+                    cell.backgroundView = nil
                 }
             } else {
                 cell.imageSelect.isHidden = true
+                cell.backgroundView = nil
             }
             return cell
         }
@@ -711,6 +709,20 @@ class NCTrash: UIViewController ,UICollectionViewDataSource, UICollectionViewDel
             self.navigationController?.pushViewController(ncTrash, animated: true)
         }
     }
+    
+    // MARK: UTILITY
+    private func cellBlurEffect(with frame: CGRect) -> UIView {
+        
+        let blurEffect = UIBlurEffect(style: .extraLight)
+        let blurEffectView = UIVisualEffectView(effect: blurEffect)
+        
+        blurEffectView.frame = frame
+        blurEffectView.autoresizingMask = [.flexibleWidth, .flexibleHeight]
+        blurEffectView.backgroundColor = NCBrandColor.sharedInstance.brand.withAlphaComponent(0.2)
+        
+        return blurEffectView
+    }
+    
 }
 
 class ListLayout: UICollectionViewFlowLayout {
@@ -720,8 +732,11 @@ class ListLayout: UICollectionViewFlowLayout {
     override init() {
         super.init()
         
+        minimumInteritemSpacing = 0
+        minimumLineSpacing = 1
+        
         self.scrollDirection = .vertical
-        self.sectionInset = UIEdgeInsets(top: 0, left: 0, bottom: 0, right: 0)
+        self.sectionInset = UIEdgeInsets(top: 0, left: 0, bottom: 10, right: 0)
     }
     
     required init?(coder aDecoder: NSCoder) {
@@ -756,6 +771,8 @@ class GridLayout: UICollectionViewFlowLayout {
         super.init()
         
         minimumInteritemSpacing = 0
+        minimumLineSpacing = 1
+
         self.scrollDirection = .vertical
         self.sectionInset = UIEdgeInsets(top: 10, left: 12, bottom: 10, right: 12)
     }

+ 3 - 3
iOSClient/Trash/NCTrashGridCell.xib

@@ -46,7 +46,7 @@
                         </constraints>
                     </imageView>
                     <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="DHy-Up-3Bh" userLabel="imageSelect">
-                        <rect key="frame" x="190" y="190" width="25" height="25"/>
+                        <rect key="frame" x="192" y="192" width="25" height="25"/>
                         <constraints>
                             <constraint firstAttribute="height" constant="25" id="SoZ-J3-98x"/>
                             <constraint firstAttribute="width" constant="25" id="cZG-gx-gwt"/>
@@ -56,13 +56,13 @@
             </view>
             <constraints>
                 <constraint firstItem="eU3-lY-fKr" firstAttribute="top" secondItem="5Ci-V1-hf5" secondAttribute="bottom" id="4Yq-Nh-z1l"/>
-                <constraint firstItem="DHy-Up-3Bh" firstAttribute="top" secondItem="5Ci-V1-hf5" secondAttribute="bottom" constant="-30" id="I68-jJ-Ea7"/>
+                <constraint firstItem="DHy-Up-3Bh" firstAttribute="top" secondItem="5Ci-V1-hf5" secondAttribute="bottom" constant="-28" id="I68-jJ-Ea7"/>
                 <constraint firstItem="VXh-sQ-LeX" firstAttribute="trailing" secondItem="eU3-lY-fKr" secondAttribute="trailing" id="Lu1-AM-kPq"/>
                 <constraint firstItem="5Ci-V1-hf5" firstAttribute="top" secondItem="VXh-sQ-LeX" secondAttribute="top" id="Ouj-ZD-UFm"/>
                 <constraint firstItem="VXh-sQ-LeX" firstAttribute="trailing" secondItem="5Ci-V1-hf5" secondAttribute="trailing" id="cHT-cP-NN6"/>
                 <constraint firstItem="VXh-sQ-LeX" firstAttribute="bottom" secondItem="5Ci-V1-hf5" secondAttribute="bottom" constant="45" id="eEC-eB-alE"/>
                 <constraint firstItem="eU3-lY-fKr" firstAttribute="leading" secondItem="VXh-sQ-LeX" secondAttribute="leading" id="gZe-FC-8XQ"/>
-                <constraint firstItem="DHy-Up-3Bh" firstAttribute="leading" secondItem="5Ci-V1-hf5" secondAttribute="trailing" constant="-30" id="ib0-sc-DXe"/>
+                <constraint firstItem="DHy-Up-3Bh" firstAttribute="leading" secondItem="5Ci-V1-hf5" secondAttribute="trailing" constant="-28" id="ib0-sc-DXe"/>
                 <constraint firstItem="5Ci-V1-hf5" firstAttribute="leading" secondItem="VXh-sQ-LeX" secondAttribute="leading" id="qT3-WD-iTV"/>
                 <constraint firstItem="3sA-NC-kIg" firstAttribute="centerY" secondItem="EJs-Ro-nbe" secondAttribute="centerY" id="r4I-Ey-m5L"/>
                 <constraint firstItem="EJs-Ro-nbe" firstAttribute="top" secondItem="eU3-lY-fKr" secondAttribute="bottom" id="uL8-ea-AWa"/>