Bläddra i källkod

coding

Signed-off-by: marinofaggiana <ios@nextcloud.com>
marinofaggiana 2 år sedan
förälder
incheckning
55e93f581c
1 ändrade filer med 22 tillägg och 20 borttagningar
  1. 22 20
      iOSClient/Color/NCColorPicker.swift

+ 22 - 20
iOSClient/Color/NCColorPicker.swift

@@ -18,19 +18,19 @@ class NCColorPicker: UIViewController {
     @IBOutlet weak var redButton: UIButton!
     @IBOutlet weak var purpleButton: UIButton!
     @IBOutlet weak var blueButton: UIButton!
-    @IBOutlet weak var brownButton: UIButton!
     @IBOutlet weak var greenButton: UIButton!
-    @IBOutlet weak var grayButton: UIButton!
     @IBOutlet weak var cyanButton: UIButton!
     @IBOutlet weak var yellowButton: UIButton!
+    @IBOutlet weak var grayButton: UIButton!
+    @IBOutlet weak var brownButton: UIButton!
 
+    @IBOutlet weak var systemBlueButton: UIButton!
     @IBOutlet weak var systemIndigoButton: UIButton!
     @IBOutlet weak var systemMintButton: UIButton!
     @IBOutlet weak var systemPinkButton: UIButton!
-    @IBOutlet weak var systemBlueButton: UIButton!
 
-    @IBOutlet weak var customButton: UIButton!
     @IBOutlet weak var defaultButton: UIButton!
+    @IBOutlet weak var customButton: UIButton!
 
     var metadata: tableMetadata?
     var tapAction: UITapGestureRecognizer?
@@ -145,18 +145,10 @@ class NCColorPicker: UIViewController {
         updateColor(hexColor: UIColor.blue.hexString)
     }
 
-    @IBAction func brownButtonAction(_ sender: AnyObject) {
-        updateColor(hexColor: UIColor.brown.hexString)
-    }
-
     @IBAction func greenButtonAction(_ sender: AnyObject) {
         updateColor(hexColor: UIColor.green.hexString)
     }
 
-    @IBAction func grayButtonAction(_ sender: AnyObject) {
-        updateColor(hexColor: UIColor.gray.hexString)
-    }
-
     @IBAction func cyanButtonAction(_ sender: AnyObject) {
         updateColor(hexColor: UIColor.cyan.hexString)
     }
@@ -165,6 +157,18 @@ class NCColorPicker: UIViewController {
         updateColor(hexColor: UIColor.yellow.hexString)
     }
 
+    @IBAction func grayButtonAction(_ sender: AnyObject) {
+        updateColor(hexColor: UIColor.gray.hexString)
+    }
+
+    @IBAction func brownButtonAction(_ sender: AnyObject) {
+        updateColor(hexColor: UIColor.brown.hexString)
+    }
+
+    @IBAction func systemBlueButtonAction(_ sender: AnyObject) {
+        updateColor(hexColor: NCBrandColor.shared.systemBlue.hexString)
+    }
+
     @IBAction func systemIndigoButtonAction(_ sender: AnyObject) {
         updateColor(hexColor: NCBrandColor.shared.systemIndigo.hexString)
     }
@@ -177,6 +181,10 @@ class NCColorPicker: UIViewController {
         updateColor(hexColor: NCBrandColor.shared.systemPink.hexString)
     }
 
+    @IBAction func defaultButtonAction(_ sender: AnyObject) {
+        updateColor(hexColor: nil)
+    }
+
     @IBAction func customButtonAction(_ sender: AnyObject) {
 
         if #available(iOS 14.0, *) {
@@ -192,14 +200,8 @@ class NCColorPicker: UIViewController {
         }
     }
 
-    @IBAction func systemBlueButtonAction(_ sender: AnyObject) {
-        updateColor(hexColor: NCBrandColor.shared.systemBlue.hexString)
-    }
-
-    @IBAction func defaultButtonAction(_ sender: AnyObject) {
-        updateColor(hexColor: nil)
-    }
-
+    // MARK: -
+    
     func updateColor(hexColor: String?) {
         if let metadata = metadata {
             let serverUrl = metadata.serverUrl + "/" + metadata.fileName