marinofaggiana 3 lat temu
rodzic
commit
b9f217c3c9

+ 19 - 0
iOSClient/Brand/NCBrand.swift

@@ -148,6 +148,7 @@ class NCBrandColor: NSObject {
     
     @objc public let nextcloud:             UIColor = UIColor(red: 0.0/255.0, green: 130.0/255.0, blue: 201.0/255.0, alpha: 1.0)
     @objc public let gray:                  UIColor = UIColor(red: 104.0/255.0, green: 104.0/255.0, blue: 104.0/255.0, alpha: 1.0)
+    @objc public let lightGray:             UIColor = UIColor(red: 229.0/255.0, green: 229.0/229.0, blue: 104.0/255.0, alpha: 1.0)
     @objc public let yellowFavorite:        UIColor = UIColor(red: 248.0/255.0, green: 205.0/255.0, blue: 70.0/255.0, alpha: 1.0)
 
     @objc public var systemBackground: UIColor {
@@ -168,6 +169,15 @@ class NCBrandColor: NSObject {
             }
         }
     }
+    @objc public var tertiarySystemBackground: UIColor {
+        get {
+            if #available(iOS 13, *) {
+                return .tertiarySystemBackground
+            } else {
+                return UIColor(red: 1.0, green: 1.0, blue: 1.0, alpha: 1.0)
+            }
+        }
+    }
     @objc public var systemGroupedBackground: UIColor {
         get {
             if #available(iOS 13, *) {
@@ -267,6 +277,15 @@ class NCBrandColor: NSObject {
             }
         }
     }
+    @objc public var systemFill: UIColor {
+        get {
+            if #available(iOS 13, *) {
+                return .systemFill
+            } else {
+                return UIColor(red: 120/255, green: 120/255, blue: 120/255, alpha: 1.0)
+            }
+        }
+    }
     
     override init() {
         self.brand = self.customer

+ 0 - 1
iOSClient/UserStatus/NCUserStatus.storyboard

@@ -211,7 +211,6 @@
                             </label>
                             <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" text="😀" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="A55-9l-wXo" customClass="emojiTextField" customModule="Nextcloud" customModuleProvider="target">
                                 <rect key="frame" x="10" y="319" width="32" height="34"/>
-                                <color key="backgroundColor" systemColor="systemGray6Color"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="34" id="aOa-cO-Bhd"/>
                                     <constraint firstAttribute="width" constant="32" id="lgT-iI-Zr7"/>

+ 6 - 4
iOSClient/UserStatus/NCUserStatus.swift

@@ -147,7 +147,8 @@ class NCUserStatus: UIViewController {
         clearStatusMessageAfterText.layer.borderWidth = 0.2
         clearStatusMessageAfterText.layer.borderColor = UIColor.lightGray.cgColor
         clearStatusMessageAfterText.text = NSLocalizedString("_dont_clear_", comment: "")
-        clearStatusMessageAfterText.textColor = .lightGray
+        clearStatusMessageAfterText.textColor = .gray
+        clearStatusMessageAfterText.backgroundColor = NCBrandColor.shared.systemGray6
         let tap = UITapGestureRecognizer(target: self, action: #selector(self.actionClearStatusMessageAfterText(sender:)))
         clearStatusMessageAfterText.isUserInteractionEnabled = true
         clearStatusMessageAfterText.addGestureRecognizer(tap)
@@ -284,11 +285,12 @@ class NCUserStatus: UIViewController {
         let appearance = DropDown.appearance()
         let clearStatusMessageAfterTextBackup = clearStatusMessageAfterText.text
             
-        appearance.backgroundColor = NCBrandColor.shared.systemBackground
-        appearance.cornerRadius = 5
+        appearance.backgroundColor = NCBrandColor.shared.systemGray6
+        appearance.cornerRadius = 0
         appearance.shadowColor = UIColor(white: 0.5, alpha: 1)
         appearance.shadowOpacity = 0.9
-        appearance.shadowRadius = 25
+        appearance.shadowRadius = 0
+        appearance.animationEntranceOptions = .transitionCurlUp
         appearance.animationduration = 0.25
         appearance.textColor = .darkGray
         appearance.setupMaskedCorners([.layerMaxXMaxYCorner, .layerMinXMaxYCorner])