UI/UX

iOSClient/Main/Cell/NCGridCell.swift

@@ -46,9 +46,11 @@ class NCGridCell: UICollectionViewCell {
     var fileID = ""
     var indexPath = IndexPath()
     
-    let labelTitleTrailingConstant: CGFloat = 55
+    let labelTitleTrailingConstant: CGFloat = 50
     let imageShareTrailingConstant: CGFloat = 25
-    
+    let imageShareWidth: CGFloat = 25
+    let buttonMoreWidth: CGFloat = 25
+
     override func awakeFromNib() {
         super.awakeFromNib()
        
@@ -64,46 +66,34 @@ class NCGridCell: UICollectionViewCell {
         if buttonMore && imageShare {
             
             self.buttonMore.isHidden = true
-            self.buttonMore.isEnabled = false
             self.imageShare.isHidden = true
             
-            imageShareTrailing.constant = 0
-            labelTitleTrailing.constant = imageShareTrailingConstant
+            labelTitleTrailing.constant = 0
             
         } else if buttonMore && !imageShare {
             
             self.buttonMore.isHidden = true
-            self.buttonMore.isEnabled = false
             self.imageShare.isHidden = false
             
             imageShareTrailing.constant = 0
-            labelTitleTrailing.constant = 10
+            labelTitleTrailing.constant = imageShareWidth
             
         } else if !buttonMore && imageShare {
             
             self.buttonMore.isHidden = false
-            self.buttonMore.isEnabled = true
             self.imageShare.isHidden = true
             
-            imageShareTrailing.constant = 0
-            labelTitleTrailing.constant = 25
+            labelTitleTrailing.constant = buttonMoreWidth
             
         } else if !buttonMore && !imageShare {
             
             self.buttonMore.isHidden = false
-            self.buttonMore.isEnabled = true
             self.imageShare.isHidden = false
             
             imageShareTrailing.constant = labelTitleTrailingConstant
             labelTitleTrailing.constant = labelTitleTrailingConstant
         }
     }
-    
-    func hideButtonMore() {
-        buttonMore.isHidden = true
-        buttonMore.isEnabled = false
-        labelTitleTrailing.constant = 10
-    }
 }
 
 protocol NCGridCellDelegate {

iOSClient/Main/Cell/NCGridCell.xib

@@ -23,7 +23,7 @@
                         <rect key="frame" x="0.0" y="0.0" width="220" height="220"/>
                     </imageView>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="eU3-lY-fKr" userLabel="labelTitle">
-                        <rect key="frame" x="0.0" y="230" width="165" height="15"/>
+                        <rect key="frame" x="0.0" y="230" width="170" height="15"/>
                         <fontDescription key="fontDescription" type="system" pointSize="12"/>
                         <nil key="textColor"/>
                         <nil key="highlightedColor"/>
@@ -80,7 +80,7 @@
                 <constraint firstItem="DHy-Up-3Bh" firstAttribute="leading" secondItem="VXh-sQ-LeX" secondAttribute="leading" constant="5" id="1T3-8p-uIW"/>
                 <constraint firstItem="AYs-f2-vve" firstAttribute="leading" secondItem="5Ci-V1-hf5" secondAttribute="trailing" constant="-20" id="3e3-0A-NSl"/>
                 <constraint firstItem="eU3-lY-fKr" firstAttribute="top" secondItem="5Ci-V1-hf5" secondAttribute="bottom" constant="10" id="4Yq-Nh-z1l"/>
-                <constraint firstItem="VXh-sQ-LeX" firstAttribute="trailing" secondItem="eU3-lY-fKr" secondAttribute="trailing" constant="55" id="5SO-rO-DnZ"/>
+                <constraint firstItem="VXh-sQ-LeX" firstAttribute="trailing" secondItem="eU3-lY-fKr" secondAttribute="trailing" constant="50" id="5SO-rO-DnZ"/>
                 <constraint firstItem="VXh-sQ-LeX" firstAttribute="trailing" secondItem="nZn-9M-s4G" secondAttribute="trailing" constant="25" id="645-Kw-aJh"/>
                 <constraint firstItem="EJs-Ro-nbe" firstAttribute="top" secondItem="5Ci-V1-hf5" secondAttribute="bottom" constant="5" id="89Q-77-ulE"/>
                 <constraint firstItem="DHy-Up-3Bh" firstAttribute="top" secondItem="VXh-sQ-LeX" secondAttribute="top" constant="5" id="ESV-qE-tbO"/>

iOSClient/Main/Cell/NCListCell.swift

@@ -54,6 +54,8 @@ class NCListCell: UICollectionViewCell {
 
     let labelTitleTrailingConstant: CGFloat = 75
     let imageShareTrailingConstant: CGFloat = 45
+    let imageShareWidth: CGFloat = 25
+    let buttonMoreWidth: CGFloat = 40
     
     override func awakeFromNib() {
         super.awakeFromNib()
@@ -72,51 +74,38 @@ class NCListCell: UICollectionViewCell {
         if buttonMore && imageShare {
             
             self.buttonMore.isHidden = true
-            self.buttonMore.isEnabled = false
             self.imageMore.isHidden = true
             self.imageShare.isHidden = true
             
-            imageShareTrailing.constant = 0
-            labelTitleTrailing.constant = 25
+            labelTitleTrailing.constant = 0
             
         } else if buttonMore && !imageShare {
             
             self.buttonMore.isHidden = true
-            self.buttonMore.isEnabled = false
             self.imageMore.isHidden = true
             self.imageShare.isHidden = false
             
-            imageShareTrailing.constant = 0
-            labelTitleTrailing.constant = 10
+            imageShareTrailing.constant = 5
+            labelTitleTrailing.constant = imageShareWidth + imageShareTrailing.constant
             
         } else if !buttonMore && imageShare {
             
             self.buttonMore.isHidden = false
-            self.buttonMore.isEnabled = true
             self.imageMore.isHidden = false
             self.imageShare.isHidden = true
 
-            imageShareTrailing.constant = 0
-            labelTitleTrailing.constant = 25
+            labelTitleTrailing.constant = buttonMoreWidth
             
         } else if !buttonMore && !imageShare {
             
             self.buttonMore.isHidden = false
-            self.buttonMore.isEnabled = true
             self.imageMore.isHidden = false
             self.imageShare.isHidden = false
             
-            imageShareTrailing.constant = labelTitleTrailingConstant
+            imageShareTrailing.constant = imageShareTrailingConstant
             labelTitleTrailing.constant = labelTitleTrailingConstant
         }
     }
-    
-    func hideButtonMore() {
-        buttonMore.isHidden = true
-        buttonMore.isEnabled = false
-        imageMore.isHidden = true
-        labelTitleTrailing.constant = 10
-    }
 }
 
 protocol NCListCellDelegate {

iOSClient/Main/NCMainCommon.swift

@@ -219,7 +219,7 @@ class NCMainCommon: NSObject {
             
             // hide button more
             if hideButtonMore {
-                cell.hideButtonMore()
+                cell.hide(buttonMore: true, imageShare: true)
             }
             
             if metadata.directory {
@@ -300,7 +300,7 @@ class NCMainCommon: NSObject {
             
             // hide button more
             if hideButtonMore {
-                cell.hideButtonMore()
+                cell.hide(buttonMore: true, imageShare: true)
             }
             
             if metadata.directory {