dev ui trash

iOSClient/Trash/NCTrashListCell.swift

@@ -16,6 +16,8 @@ class NCTrashListCell: UICollectionViewCell {
     @IBOutlet weak var labelInfo: UILabel!
     @IBOutlet weak var restore: UIImageView!
     @IBOutlet weak var more: UIImageView!
+    @IBOutlet weak var separator: UIView!
+
     
     var delegate: NCTrashListDelegate?
     
@@ -24,6 +26,10 @@ class NCTrashListCell: UICollectionViewCell {
     override func awakeFromNib() {
         super.awakeFromNib()
        
+        restore.image = CCGraphics.changeThemingColorImage(UIImage.init(named: "restore"), multiplier: 2, color: NCBrandColor.sharedInstance.icon)
+        more.image = CCGraphics.changeThemingColorImage(UIImage.init(named: "more"), multiplier: 2, color: NCBrandColor.sharedInstance.icon)
+        separator.backgroundColor = NCBrandColor.sharedInstance.seperator
+        
         let tapGestureRestore = UITapGestureRecognizer(target: self, action: #selector(NCTrashListCell.tapRestore(sender:)))
         addGestureRecognizer(tapGestureRestore)
         tapGestureRestore.numberOfTapsRequired = 1
@@ -43,10 +49,7 @@ class NCTrashListCell: UICollectionViewCell {
 
         imageView.image = image
         labelTitle.text = title
-        labelInfo.text = info
-        
-        restore.image = CCGraphics.changeThemingColorImage(UIImage.init(named: "restore"), multiplier: 2, color: NCBrandColor.sharedInstance.icon)
-        more.image = CCGraphics.changeThemingColorImage(UIImage.init(named: "more"), multiplier: 2, color: NCBrandColor.sharedInstance.icon)
+        labelInfo.text = info        
     }
     
     @objc func tapRestore(sender: UITapGestureRecognizer) {

iOSClient/Trash/NCTrashListCell.xib

@@ -27,43 +27,54 @@
                         </constraints>
                     </imageView>
                     <label opaque="NO" userInteractionEnabled="NO" tag="101" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="UtT-L6-mgW" userLabel="Label Title">
-                        <rect key="frame" x="65" y="13" width="415" height="18"/>
+                        <rect key="frame" x="65" y="13" width="425" height="18"/>
                         <fontDescription key="fontDescription" type="system" pointSize="15"/>
                         <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <nil key="highlightedColor"/>
                     </label>
                     <label opaque="NO" userInteractionEnabled="NO" tag="102" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="AXX-71-9Q6" userLabel="Label Info File">
-                        <rect key="frame" x="65" y="31" width="415" height="15"/>
+                        <rect key="frame" x="65" y="31" width="425" height="15"/>
                         <fontDescription key="fontDescription" type="system" pointSize="12"/>
                         <color key="textColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="calibratedRGB"/>
                         <nil key="highlightedColor"/>
                     </label>
                     <imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="nwZ-pi-Igj" userLabel="restore">
-                        <rect key="frame" x="490" y="0.0" width="55" height="60"/>
+                        <rect key="frame" x="500" y="5" width="50" height="50"/>
                         <constraints>
-                            <constraint firstAttribute="width" constant="55" id="5Zc-h7-ZRJ"/>
-                            <constraint firstAttribute="height" constant="60" id="xvo-pN-hfE"/>
+                            <constraint firstAttribute="width" constant="50" id="5Zc-h7-ZRJ"/>
+                            <constraint firstAttribute="height" constant="50" id="xvo-pN-hfE"/>
                         </constraints>
                     </imageView>
                     <imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="dgL-g5-Nkc" userLabel="More">
-                        <rect key="frame" x="545" y="0.0" width="55" height="60"/>
+                        <rect key="frame" x="550" y="5" width="50" height="50"/>
                         <constraints>
-                            <constraint firstAttribute="width" constant="55" id="05P-NL-pd8"/>
-                            <constraint firstAttribute="height" constant="60" id="Jet-eo-x1M"/>
+                            <constraint firstAttribute="width" constant="50" id="05P-NL-pd8"/>
+                            <constraint firstAttribute="height" constant="50" id="Jet-eo-x1M"/>
                         </constraints>
                     </imageView>
+                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Egg-cb-EhZ" userLabel="Separator">
+                        <rect key="frame" x="55" y="59" width="545" height="1"/>
+                        <color key="backgroundColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                        <color key="tintColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                        <constraints>
+                            <constraint firstAttribute="height" constant="1" id="G5S-67-boG"/>
+                        </constraints>
+                    </view>
                 </subviews>
             </view>
             <constraints>
+                <constraint firstItem="Gu8-oz-zWa" firstAttribute="bottom" secondItem="Egg-cb-EhZ" secondAttribute="bottom" id="81D-sw-EaX"/>
                 <constraint firstItem="dgL-g5-Nkc" firstAttribute="centerY" secondItem="Gu8-oz-zWa" secondAttribute="centerY" id="8S3-NI-RXu"/>
                 <constraint firstItem="nwZ-pi-Igj" firstAttribute="leading" secondItem="AXX-71-9Q6" secondAttribute="trailing" constant="10" id="9oy-QL-WsN"/>
                 <constraint firstItem="dgL-g5-Nkc" firstAttribute="leading" secondItem="nwZ-pi-Igj" secondAttribute="trailing" id="GW0-RK-slT"/>
                 <constraint firstItem="nwZ-pi-Igj" firstAttribute="leading" secondItem="UtT-L6-mgW" secondAttribute="trailing" constant="10" id="Hhf-7M-29G"/>
+                <constraint firstItem="Egg-cb-EhZ" firstAttribute="leading" secondItem="w2m-Vw-hpd" secondAttribute="trailing" id="JCm-UU-Pxu"/>
                 <constraint firstItem="UtT-L6-mgW" firstAttribute="leading" secondItem="w2m-Vw-hpd" secondAttribute="trailing" constant="10" id="PQ8-0b-fLa"/>
                 <constraint firstItem="nwZ-pi-Igj" firstAttribute="centerY" secondItem="Gu8-oz-zWa" secondAttribute="centerY" id="QNH-El-hoW"/>
                 <constraint firstItem="AXX-71-9Q6" firstAttribute="leading" secondItem="w2m-Vw-hpd" secondAttribute="trailing" constant="10" id="Qvq-r5-AX9"/>
                 <constraint firstItem="Gu8-oz-zWa" firstAttribute="bottom" secondItem="AXX-71-9Q6" secondAttribute="bottom" constant="14" id="d06-sn-I3Y"/>
                 <constraint firstItem="Gu8-oz-zWa" firstAttribute="trailing" secondItem="dgL-g5-Nkc" secondAttribute="trailing" id="fFe-pj-Yzy"/>
+                <constraint firstItem="Gu8-oz-zWa" firstAttribute="trailing" secondItem="Egg-cb-EhZ" secondAttribute="trailing" id="k8f-bU-D6I"/>
                 <constraint firstItem="w2m-Vw-hpd" firstAttribute="leading" secondItem="Gu8-oz-zWa" secondAttribute="leading" constant="15" id="mBb-ff-7HD"/>
                 <constraint firstItem="UtT-L6-mgW" firstAttribute="top" secondItem="Gu8-oz-zWa" secondAttribute="top" constant="13" id="nrY-2F-QZ2"/>
                 <constraint firstItem="w2m-Vw-hpd" firstAttribute="centerY" secondItem="Gu8-oz-zWa" secondAttribute="centerY" id="qKl-4Y-m5t"/>
@@ -76,6 +87,7 @@
                 <outlet property="labelTitle" destination="UtT-L6-mgW" id="Xv6-zM-2v1"/>
                 <outlet property="more" destination="dgL-g5-Nkc" id="FOg-ZX-Yti"/>
                 <outlet property="restore" destination="nwZ-pi-Igj" id="CHB-Fl-yAZ"/>
+                <outlet property="separator" destination="Egg-cb-EhZ" id="uhq-Nc-z8K"/>
             </connections>
             <point key="canvasLocation" x="97.599999999999994" y="129.53523238380811"/>
         </collectionViewCell>