Change green color usage

open-eid · Dec 20, 2023 · b4b4cda · b4b4cda
1 parent eeec71f
commit b4b4cda
Show file tree

Hide file tree

Showing 7 changed files with 52 additions and 4 deletions.
diff --git a/MoppApp/MoppApp/Assets.xcassets/Colors/Custom/MoppGreen700.colorset/Contents.json b/MoppApp/MoppApp/Assets.xcassets/Colors/Custom/MoppGreen700.colorset/Contents.json
@@ -0,0 +1,20 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0x23",
+          "green" : "0x81",
+          "red" : "0x21"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/MoppApp/MoppApp/Assets.xcassets/Colors/Custom/MoppGreen800.colorset/Contents.json b/MoppApp/MoppApp/Assets.xcassets/Colors/Custom/MoppGreen800.colorset/Contents.json
@@ -0,0 +1,20 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0x1B",
+          "green" : "0x64",
+          "red" : "0x1A"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/MoppApp/MoppApp/ContainerNotificationCell.swift b/MoppApp/MoppApp/ContainerNotificationCell.swift
@@ -33,7 +33,7 @@ class ContainerNotificationCell: UITableViewCell {
     }
 
     func populate(isSuccess: Bool, text: String) {
-        contentView.backgroundColor = isSuccess ? UIColor.moppSuccess : UIColor.moppWarning
+        contentView.backgroundColor = isSuccess ? UIColor.moppGreen700 : UIColor.moppWarning
         infoLabel.text = text
     }
 }
diff --git a/MoppApp/MoppApp/ContainerSignatureCell.swift b/MoppApp/MoppApp/ContainerSignatureCell.swift
@@ -124,7 +124,7 @@ class ContainerSignatureCell: UITableViewCell {
         let signatureStatus = NSMutableAttributedString(string: signatureStatusText)
         let mainColor: UIColor
         if (valid) {
-            mainColor = UIColor.moppSuccess
+            mainColor = UIColor.moppGreen800
         } else {
             mainColor = UIColor.moppError
         }

diff --git a/MoppApp/MoppApp/Extensions/UIColor+Additions.swift b/MoppApp/MoppApp/Extensions/UIColor+Additions.swift
@@ -106,6 +106,14 @@ extension UIColor {
         return UIColor(named: "MoppLabelDarker")!
     }
 
+    class var moppGreen700: UIColor {
+        return UIColor(named: "MoppGreen700")!
+    }
+
+    class var moppGreen800: UIColor {
+        return UIColor(named: "MoppGreen800")!
+    }
+
     class var moppWarningTextDarker: UIColor {
         return UIColor(named: "MoppWarningTextDarker")!
     }

diff --git a/MoppApp/MoppApp/MyeIDInfoManager.swift b/MoppApp/MoppApp/MyeIDInfoManager.swift
@@ -258,7 +258,7 @@ class MyeIDInfoManager {
         if isValid {
             let certValidText = capitalized ? L(.myEidCertValid).capitalized : L(.myEidCertValid)
             let validText = NSAttributedString(string: certValidText, attributes:
-                [.foregroundColor : UIColor.moppSuccess])
+                [.foregroundColor : UIColor.moppGreen700])
             attrText.append(validText)
         } else {
             let certExpiredText = capitalized ? L(.myEidCertExpired).capitalized : L(.myEidCertExpired)

diff --git a/MoppApp/MoppApp/SwitchButton.swift b/MoppApp/MoppApp/SwitchButton.swift
@@ -38,7 +38,7 @@ class SwitchButton: UISwitch {
     }
 
     private func setDefaultOnColor() {
-        self.onTintColor = UIColor.moppSuccess
+        self.onTintColor = UIColor.moppGreen700
     }
 
     private func setDefaultOffColor() {