Browse Source

user status

marinofaggiana 3 years ago
parent
commit
60a1252179
2 changed files with 27 additions and 17 deletions
  1. 19 16
      iOSClient/UserStatus/NCUserStatus.storyboard
  2. 8 1
      iOSClient/UserStatus/NCUserStatus.swift

+ 19 - 16
iOSClient/UserStatus/NCUserStatus.storyboard

@@ -257,6 +257,24 @@
                                     <outlet property="delegate" destination="Y6W-OH-hqX" id="1gT-op-OwA"/>
                                 </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="733" width="180" height="17"/>
+                                <constraints>
+                                    <constraint firstAttribute="width" constant="180" 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="726.66666666666663" width="180" height="30"/>
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="30" id="c5F-cg-TMn"/>
+                                </constraints>
+                                <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                <color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                <nil key="highlightedColor"/>
+                            </label>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="3CT-dJ-sEj">
                                 <rect key="frame" x="10" y="770" width="175" height="30"/>
                                 <color key="backgroundColor" systemColor="systemGray6Color"/>
@@ -276,21 +294,6 @@
                                 <fontDescription key="fontDescription" type="boldSystem" pointSize="14"/>
                                 <state key="normal" title="set status message"/>
                             </button>
-                            <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="733" width="180" height="17"/>
-                                <constraints>
-                                    <constraint firstAttribute="width" constant="180" 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="733" width="180" height="17"/>
-                                <fontDescription key="fontDescription" type="system" pointSize="14"/>
-                                <color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                                <nil key="highlightedColor"/>
-                            </label>
                         </subviews>
                         <viewLayoutGuide key="safeArea" id="vDu-zF-Fre"/>
                         <color key="backgroundColor" systemColor="systemBackgroundColor"/>
@@ -304,6 +307,7 @@
                             <constraint firstItem="vDu-zF-Fre" firstAttribute="trailing" secondItem="isA-Km-19L" secondAttribute="trailing" constant="10" id="DT7-9H-DEt"/>
                             <constraint firstItem="P09-kU-gUI" firstAttribute="top" secondItem="qXf-nl-3Li" secondAttribute="bottom" constant="20" id="HtI-LZ-wPJ"/>
                             <constraint firstItem="ldK-hD-vsJ" firstAttribute="top" secondItem="Hed-Bz-0g1" secondAttribute="bottom" constant="40" id="K8i-hZ-ic0"/>
+                            <constraint firstItem="isA-Km-19L" firstAttribute="centerY" secondItem="rha-b0-jMR" secondAttribute="centerY" id="KLC-hn-HTt"/>
                             <constraint firstItem="3CT-dJ-sEj" firstAttribute="top" secondItem="rha-b0-jMR" secondAttribute="bottom" constant="20" id="KlN-Ud-r2X"/>
                             <constraint firstItem="Hed-Bz-0g1" firstAttribute="top" secondItem="ukn-PZ-9sx" secondAttribute="bottom" constant="30" id="LJ2-Qn-qbJ"/>
                             <constraint firstItem="vDu-zF-Fre" firstAttribute="trailing" secondItem="qXf-nl-3Li" secondAttribute="trailing" constant="10" id="MLs-tH-cbf"/>
@@ -320,7 +324,6 @@
                             <constraint firstItem="qXf-nl-3Li" firstAttribute="top" secondItem="ldK-hD-vsJ" secondAttribute="bottom" constant="20" id="jPk-b5-RCo"/>
                             <constraint firstItem="vDu-zF-Fre" firstAttribute="trailing" secondItem="3xN-e7-N0L" secondAttribute="trailing" constant="10" id="n76-Wo-n2b"/>
                             <constraint firstItem="vDu-zF-Fre" firstAttribute="bottom" secondItem="3xN-e7-N0L" secondAttribute="bottom" constant="10" id="r6F-XX-ATR"/>
-                            <constraint firstItem="3xN-e7-N0L" firstAttribute="top" secondItem="isA-Km-19L" secondAttribute="bottom" constant="20" id="rEs-SD-aVb"/>
                             <constraint firstItem="rha-b0-jMR" firstAttribute="top" secondItem="P09-kU-gUI" secondAttribute="bottom" constant="23" id="rJR-kN-VR7"/>
                             <constraint firstItem="ukn-PZ-9sx" firstAttribute="top" secondItem="vDu-zF-Fre" secondAttribute="top" constant="20" id="vBm-Uq-cEs"/>
                             <constraint firstItem="vDu-zF-Fre" firstAttribute="trailing" secondItem="ldK-hD-vsJ" secondAttribute="trailing" constant="5" id="yZf-48-jHR"/>

+ 8 - 1
iOSClient/UserStatus/NCUserStatus.swift

@@ -122,6 +122,13 @@ class NCUserStatus: UIViewController {
         clearStatusMessageAfterLabel.text = NSLocalizedString("_clear_status_message_after_", comment: "")
         clearStatusMessageAfterLabel.textColor = NCBrandColor.shared.label
         
+        clearStatusMessageAfterText.layer.cornerRadius = 5
+        clearStatusMessageAfterText.layer.masksToBounds = true
+        clearStatusMessageAfterText.layer.borderWidth = 0.2
+        clearStatusMessageAfterText.layer.borderColor = UIColor.lightGray.cgColor
+        clearStatusMessageAfterText.text = NSLocalizedString("_dont_clear_", comment: "")
+        clearStatusMessageAfterText.textColor = .lightGray
+        
         clearStatusMessageButton.layer.cornerRadius = 15
         clearStatusMessageButton.layer.masksToBounds = true
         clearStatusMessageButton.layer.borderWidth = 0.5
@@ -168,7 +175,7 @@ class NCUserStatus: UIViewController {
                 
                 self.statusMessageEmojiTextField.text = icon
                 self.statusMessageTextField.text = message
-                self.clearStatusMessageAfterText.text = CCUtility.getTitleSectionDate(clearAt! as Date)
+                self.clearStatusMessageAfterText.text = "  " +  CCUtility.getTitleSectionDate(clearAt! as Date)
                 
                 switch status {
                 case "online":