Parcourir la source

coding

Signed-off-by: marinofaggiana <ios@nextcloud.com>
marinofaggiana il y a 2 ans
Parent
commit
351718dd74

+ 3 - 3
iOSClient/Color/NCColorPicker.storyboard

@@ -57,7 +57,7 @@
                                 </constraints>
                                 <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
                                 <connections>
-                                    <action selector="violaButtonAction:" destination="Y6W-OH-hqX" eventType="touchUpInside" id="hIN-qB-6r5"/>
+                                    <action selector="pupleButtonAction:" destination="Y6W-OH-hqX" eventType="touchUpInside" id="SYH-xz-xzQ"/>
                                 </connections>
                             </button>
                             <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="DoG-RI-jcO">
@@ -205,10 +205,10 @@
                         <outlet property="greenText" destination="5XA-n8-8l6" id="9Md-fj-QWW"/>
                         <outlet property="orangeButton" destination="JUR-Vj-yBU" id="aGO-8f-0Em"/>
                         <outlet property="orangeText" destination="Jc0-7X-JuE" id="IAe-Ps-Cr2"/>
+                        <outlet property="purpleButton" destination="dOn-SY-wnl" id="hes-XJ-gMJ"/>
+                        <outlet property="purpleText" destination="DoG-RI-jcO" id="jlj-qV-lqU"/>
                         <outlet property="redButton" destination="Zr2-rF-YUt" id="jib-wX-2Of"/>
                         <outlet property="redText" destination="p7z-g7-hkV" id="FiU-ZR-JxH"/>
-                        <outlet property="violaButton" destination="dOn-SY-wnl" id="XFX-c3-ky3"/>
-                        <outlet property="violaText" destination="DoG-RI-jcO" id="axQ-8d-eQr"/>
                     </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="Ief-a0-LHa" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>

+ 8 - 8
iOSClient/Color/NCColorPicker.swift

@@ -13,7 +13,7 @@ class NCColorPicker: UIViewController {
 
     @IBOutlet weak var orangeButton: UIButton!
     @IBOutlet weak var redButton: UIButton!
-    @IBOutlet weak var violaButton: UIButton!
+    @IBOutlet weak var purpleButton: UIButton!
     @IBOutlet weak var blueButton: UIButton!
     @IBOutlet weak var blackButton: UIButton!
     @IBOutlet weak var greenButton: UIButton!
@@ -22,7 +22,7 @@ class NCColorPicker: UIViewController {
 
     @IBOutlet weak var orangeText: UITextField!
     @IBOutlet weak var redText: UITextField!
-    @IBOutlet weak var violaText: UITextField!
+    @IBOutlet weak var purpleText: UITextField!
     @IBOutlet weak var blueText: UITextField!
     @IBOutlet weak var blackText: UITextField!
     @IBOutlet weak var greenText: UITextField!
@@ -46,10 +46,10 @@ class NCColorPicker: UIViewController {
         redButton.layer.masksToBounds = true
         redText.text = NSLocalizedString("_red_", comment: "")
 
-        violaButton.backgroundColor = UIColor(hex: "#8f00ff")
-        violaButton.layer.cornerRadius = 5
-        violaButton.layer.masksToBounds = true
-        violaText.text = NSLocalizedString("_viola_", comment: "")
+        purpleButton.backgroundColor = .purple
+        purpleButton.layer.cornerRadius = 5
+        purpleButton.layer.masksToBounds = true
+        purpleText.text = NSLocalizedString("_purple_", comment: "")
 
         blueButton.backgroundColor = .blue
         blueButton.layer.cornerRadius = 5
@@ -85,8 +85,8 @@ class NCColorPicker: UIViewController {
         updateColor(hexColor: UIColor.red.hexString)
     }
 
-    @IBAction func violaButtonAction(_ sender: UIButton) {
-        updateColor(hexColor: "#8f00ff")
+    @IBAction func pupleButtonAction(_ sender: UIButton) {
+        updateColor(hexColor: UIColor.purple.hexString)
     }
 
     @IBAction func blueButtonAction(_ sender: UIButton) {

+ 8 - 1
iOSClient/Supporting Files/en.lproj/Localizable.strings

@@ -877,7 +877,14 @@
 "_ITMS-90076_"              = "Due to a change in the Nextcloud application identifier, the settings and password for accessing your cloud are reset, so please re-enter your account data and check your Settings. We are sorry about that.";
 "_copy_passphrase_"         = "Copy passphrase";
 "_change_color_"            = "Change color";
-"_remove_color_"            = "Remove color";
+"_orange_"                  = "Orange";
+"_red_"                     = "Red";
+"_purple_"                  = "Purple";
+"_blue_"                    = "Blue";
+"_black_"                   = "Black";
+"_green_"                   = "Green";
+"_gray_"                    = "Gray";
+"_default_"                 = "Default";
 
 // Video
 "_select_trace_"            = "Select the trace";