marinofaggiana hace 3 años
padre
commit
358e94e117

+ 4 - 4
iOSClient/UserStatus/NCUserStatus.storyboard

@@ -270,16 +270,16 @@
                                 </connections>
                             </tableView>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="clear status message after" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="rha-b0-jMR">
-                                <rect key="frame" x="10" y="701" width="180" height="17"/>
+                                <rect key="frame" x="10" y="701" width="175" height="17"/>
                                 <constraints>
-                                    <constraint firstAttribute="width" constant="180" id="YE8-7b-aAT"/>
+                                    <constraint firstAttribute="width" constant="175" id="YE8-7b-aAT"/>
                                 </constraints>
                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                 <nil key="textColor"/>
                                 <nil key="highlightedColor"/>
                             </label>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="today" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="isA-Km-19L">
-                                <rect key="frame" x="200" y="694.66666666666663" width="165" height="30"/>
+                                <rect key="frame" x="190" y="694.66666666666663" width="175" height="30"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="30" id="c5F-cg-TMn"/>
                                 </constraints>
@@ -332,7 +332,7 @@
                             <constraint firstItem="vDu-zF-Fre" firstAttribute="trailing" secondItem="P09-kU-gUI" secondAttribute="trailing" constant="10" id="Qm6-Nb-VLH"/>
                             <constraint firstItem="3CT-dJ-sEj" firstAttribute="leading" secondItem="vDu-zF-Fre" secondAttribute="leading" constant="10" id="Ra0-dj-zWy"/>
                             <constraint firstItem="vDu-zF-Fre" firstAttribute="trailing" secondItem="ukn-PZ-9sx" secondAttribute="trailing" constant="10" id="Sxc-Bi-ERz"/>
-                            <constraint firstItem="isA-Km-19L" firstAttribute="leading" secondItem="rha-b0-jMR" secondAttribute="trailing" constant="10" id="T0V-51-vXV"/>
+                            <constraint firstItem="isA-Km-19L" firstAttribute="leading" secondItem="rha-b0-jMR" secondAttribute="trailing" constant="5" id="T0V-51-vXV"/>
                             <constraint firstItem="A55-9l-wXo" firstAttribute="leading" secondItem="vDu-zF-Fre" secondAttribute="leading" constant="10" id="TDf-oG-GcP"/>
                             <constraint firstItem="DgJ-Se-BTI" firstAttribute="top" secondItem="7YL-BS-nbc" secondAttribute="bottom" constant="30" id="Vqd-ZX-eQb"/>
                             <constraint firstItem="ldK-hD-vsJ" firstAttribute="leading" secondItem="vDu-zF-Fre" secondAttribute="leading" constant="5" id="XMX-Uc-FkN"/>

+ 3 - 1
iOSClient/UserStatus/NCUserStatus.swift

@@ -344,7 +344,7 @@ class NCUserStatus: UIViewController {
                 }
                 
                 if clearAt != nil {
-                    self.clearStatusMessageAfterText.text = "  " + CCUtility.getTitleSectionDate(clearAt! as Date)
+                    //self.clearStatusMessageAfterText.text = "  " + CCUtility.getTitleSectionDate(clearAt! as Date)
                 }
                 
                 switch status {
@@ -472,8 +472,10 @@ extension NCUserStatus: UITableViewDelegate {
                 cell.isSelected = false
                 
                 if errorCode == 0 {
+                    
                     self.statusMessageEmojiTextField.text = status.icon
                     self.statusMessageTextField.text = status.message
+                    self.clearStatusMessageAfterText.text = " " + self.getPredefinedClearStatusText(clearAt: status.clearAt, clearAtTime: status.clearAtTime, clearAtType: status.clearAtType)
                 }
                 
                 self.dismissIfError(errorCode, errorDescription: errorDescription)