Merge pull request #1414 from lingoslinger/1375-replace-rgb

Replace remaining rgb Color references with semantic Color assets
planetary-social · Aug 20, 2024 · bb70f0d · bb70f0d
2 parents 283ce85 + a575737
commit bb70f0d
Show file tree

Hide file tree

Showing 6 changed files with 84 additions and 4 deletions.
diff --git a/Nos/Assets/Colors.xcassets/action-banner-background-gradient-bottom.colorset/Contents.json b/Nos/Assets/Colors.xcassets/action-banner-background-gradient-bottom.colorset/Contents.json
@@ -0,0 +1,20 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0xFF",
+          "green" : "0xFF",
+          "red" : "0xFF"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/Nos/Assets/Colors.xcassets/action-banner-background-gradient-top.colorset/Contents.json b/Nos/Assets/Colors.xcassets/action-banner-background-gradient-top.colorset/Contents.json
@@ -0,0 +1,20 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "0.200",
+          "blue" : "0xFF",
+          "green" : "0xFF",
+          "red" : "0xFF"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/Nos/Assets/Colors.xcassets/big-action-button-linear-gradient-stop1.colorset/Contents.json b/Nos/Assets/Colors.xcassets/big-action-button-linear-gradient-stop1.colorset/Contents.json
@@ -0,0 +1,20 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0x38",
+          "green" : "0x63",
+          "red" : "0xEF"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/Nos/Assets/Colors.xcassets/big-action-button-linear-gradient-stop2.colorset/Contents.json b/Nos/Assets/Colors.xcassets/big-action-button-linear-gradient-stop2.colorset/Contents.json
@@ -0,0 +1,20 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0x54",
+          "green" : "0x4C",
+          "red" : "0xF2"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/Nos/Views/ActionBanner.swift b/Nos/Views/ActionBanner.swift
@@ -74,8 +74,8 @@ struct ActionBanner: View {
                     ZStack {
                         LinearGradient(
                             colors: [
-                                Color(red: 1, green: 1, blue: 1, opacity: 0.2),
-                                Color(red: 1, green: 1, blue: 1, opacity: 1.0),
+                                Color.actionBannerBackgroundGradientTop,
+                                Color.actionBannerBackgroundGradientBottom,
                             ],
                             startPoint: .top,
                             endPoint: .bottom

diff --git a/Nos/Views/BigActionButton.swift b/Nos/Views/BigActionButton.swift
@@ -69,8 +69,8 @@ struct BigActionButtonStyle: ButtonStyle {
                 ZStack {
                     LinearGradient(
                         stops: [
-                            Gradient.Stop(color: Color(red: 0.94, green: 0.39, blue: 0.22), location: 0.00),
-                            Gradient.Stop(color: Color(red: 0.95, green: 0.3, blue: 0.33), location: 1.00),
+                            Gradient.Stop(color: Color.bigActionButtonLinearGradientStop1, location: 0.00),
+                            Gradient.Stop(color: Color.bigActionButtonLinearGradientStop2, location: 1.00),
                         ],
                         startPoint: UnitPoint(x: 0.5, y: 0),
                         endPoint: UnitPoint(x: 0.5, y: 0.99)