dev new ui

iOSClient/Trash/NCTrash.swift

@@ -194,7 +194,7 @@ class ListLayout: UICollectionViewFlowLayout {
         
         self.itemHeight = itemHeight
         self.scrollDirection = .vertical
-        self.sectionInset = UIEdgeInsets(top: 0, left: 10, bottom: 0, right: 10)
+        self.sectionInset = UIEdgeInsets(top: 10, left: 0, bottom: 10, right: 0)
     }
     
     required init?(coder aDecoder: NSCoder) {
@@ -232,7 +232,7 @@ class GridLayout: UICollectionViewFlowLayout {
         
         self.numberOfColumns = numberOfColumns
         self.scrollDirection = .vertical
-        self.sectionInset = UIEdgeInsets(top: 0, left: 10, bottom: 0, right: 10)
+        self.sectionInset = UIEdgeInsets(top: 10, left: 10, bottom: 10, right: 10)
     }
     
     required init?(coder aDecoder: NSCoder) {
@@ -243,7 +243,7 @@ class GridLayout: UICollectionViewFlowLayout {
         get {
             if let collectionView = collectionView {
                 let itemWidth: CGFloat = (collectionView.frame.width/CGFloat(self.numberOfColumns)) - self.minimumInteritemSpacing
-                let itemHeight: CGFloat = itemWidth + 43
+                let itemHeight: CGFloat = itemWidth + 40
                 return CGSize(width: itemWidth, height: itemHeight)
             }
             

iOSClient/Trash/NCTrashGridCell.xib

@@ -20,23 +20,23 @@
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="5Ci-V1-hf5" userLabel="ImageItem">
-                        <rect key="frame" x="0.0" y="0.0" width="220" height="265"/>
+                        <rect key="frame" x="0.0" y="0.0" width="220" height="268"/>
                     </imageView>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="eU3-lY-fKr" userLabel="Label Title">
-                        <rect key="frame" x="0.0" y="265" width="220" height="17"/>
-                        <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                        <rect key="frame" x="0.0" y="268" width="220" height="14.5"/>
+                        <fontDescription key="fontDescription" type="system" pointSize="12"/>
                         <nil key="textColor"/>
                         <nil key="highlightedColor"/>
                     </label>
                     <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="3sA-NC-kIg" userLabel="More">
-                        <rect key="frame" x="194" y="282" width="26" height="26"/>
+                        <rect key="frame" x="194" y="282.5" width="26" height="26"/>
                         <constraints>
                             <constraint firstAttribute="width" constant="26" id="hoH-4o-Tff"/>
                             <constraint firstAttribute="height" constant="26" id="vGK-h7-x3M"/>
                         </constraints>
                     </imageView>
                     <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="b2F-OH-tLj" userLabel="restore">
-                        <rect key="frame" x="0.0" y="282" width="26" height="26"/>
+                        <rect key="frame" x="0.0" y="282.5" width="26" height="26"/>
                         <constraints>
                             <constraint firstAttribute="height" constant="26" id="L0E-5H-HIf"/>
                             <constraint firstAttribute="width" constant="26" id="Qmu-32-cdJ"/>
@@ -51,7 +51,7 @@
                 <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="3sA-NC-kIg" firstAttribute="top" secondItem="eU3-lY-fKr" secondAttribute="bottom" id="eAl-yv-CrK"/>
-                <constraint firstItem="VXh-sQ-LeX" firstAttribute="bottom" secondItem="5Ci-V1-hf5" secondAttribute="bottom" constant="43" id="eEC-eB-alE"/>
+                <constraint firstItem="VXh-sQ-LeX" firstAttribute="bottom" secondItem="5Ci-V1-hf5" secondAttribute="bottom" constant="40" id="eEC-eB-alE"/>
                 <constraint firstItem="eU3-lY-fKr" firstAttribute="leading" secondItem="VXh-sQ-LeX" secondAttribute="leading" id="gZe-FC-8XQ"/>
                 <constraint firstItem="b2F-OH-tLj" firstAttribute="leading" secondItem="VXh-sQ-LeX" secondAttribute="leading" id="i72-LQ-zRc"/>
                 <constraint firstItem="VXh-sQ-LeX" firstAttribute="trailing" secondItem="3sA-NC-kIg" secondAttribute="trailing" id="olr-QB-oyb"/>