fix(MonitorsView): fixed darkmode colors

propromo-software · Jun 23, 2024 · eaf9012 · eaf9012
1 parent 7fdf186
commit eaf9012
Show file tree

Hide file tree

Showing 12 changed files with 91 additions and 23 deletions.
diff --git a/core/features/Assets.xcassets/border.colorset/Contents.json b/core/features/Assets.xcassets/border.colorset/Contents.json
@@ -20,12 +20,10 @@
         }
       ],
       "color" : {
-        "color-space" : "srgb",
+        "color-space" : "gray-gamma-22",
         "components" : {
           "alpha" : "1.000",
-          "blue" : "1.000",
-          "green" : "1.000",
-          "red" : "1.000"
+          "white" : "236"
         }
       },
       "idiom" : "universal"

diff --git a/core/features/Assets.xcassets/green.colorset/Contents.json b/core/features/Assets.xcassets/green.colorset/Contents.json
@@ -23,9 +23,9 @@
         "color-space" : "srgb",
         "components" : {
           "alpha" : "1.000",
-          "blue" : "255",
-          "green" : "255",
-          "red" : "255"
+          "blue" : "66",
+          "green" : "196",
+          "red" : "34"
         }
       },
       "idiom" : "universal"

diff --git a/core/features/Assets.xcassets/orange.colorset/Contents.json b/core/features/Assets.xcassets/orange.colorset/Contents.json
@@ -23,9 +23,9 @@
         "color-space" : "srgb",
         "components" : {
           "alpha" : "1.000",
-          "blue" : "255",
-          "green" : "255",
-          "red" : "255"
+          "blue" : "22",
+          "green" : "214",
+          "red" : "251"
         }
       },
       "idiom" : "universal"

diff --git a/core/features/Assets.xcassets/primary.colorset/Contents.json b/core/features/Assets.xcassets/primary.colorset/Contents.json
@@ -23,9 +23,9 @@
         "color-space" : "srgb",
         "components" : {
           "alpha" : "1.000",
-          "blue" : "1.000",
-          "green" : "1.000",
-          "red" : "1.000"
+          "blue" : "217",
+          "green" : "120",
+          "red" : "37"
         }
       },
       "idiom" : "universal"

diff --git a/core/features/Assets.xcassets/primaryBackground.colorset/Contents.json b/core/features/Assets.xcassets/primaryBackground.colorset/Contents.json
@@ -0,0 +1,38 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "0.100",
+          "blue" : "105",
+          "green" : "50",
+          "red" : "13"
+        }
+      },
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "0.100",
+          "blue" : "144",
+          "green" : "50",
+          "red" : "13"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/core/features/Assets.xcassets/red.colorset/Contents.json b/core/features/Assets.xcassets/red.colorset/Contents.json
@@ -23,8 +23,8 @@
         "color-space" : "srgb",
         "components" : {
           "alpha" : "1.000",
-          "blue" : "255",
-          "green" : "255",
+          "blue" : "37",
+          "green" : "85",
           "red" : "255"
         }
       },

diff --git a/core/features/Assets.xcassets/secondary.colorset/Contents.json b/core/features/Assets.xcassets/secondary.colorset/Contents.json
@@ -20,12 +20,10 @@
         }
       ],
       "color" : {
-        "color-space" : "srgb",
+        "color-space" : "gray-gamma-22",
         "components" : {
           "alpha" : "1.000",
-          "blue" : "1.000",
-          "green" : "1.000",
-          "red" : "1.000"
+          "white" : "199"
         }
       },
       "idiom" : "universal"

diff --git a/core/features/Assets.xcassets/secondaryBackground.colorset/Contents.json b/core/features/Assets.xcassets/secondaryBackground.colorset/Contents.json
@@ -0,0 +1,36 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "0.100",
+          "blue" : "154",
+          "green" : "154",
+          "red" : "154"
+        }
+      },
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "gray-gamma-22",
+        "components" : {
+          "alpha" : "0.100",
+          "white" : "199"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/core/features/Home/Views/HomeView.swift b/core/features/Home/Views/HomeView.swift
@@ -15,7 +15,7 @@ struct HomeView: View {
     var body: some View {
         VStack(alignment: .center) {
             WebView(svgString: SVGIcons.logo())
-                .frame(minHeight: 325)
+                .frame(minHeight: 335)
 
             Text("Propromo")
                 .bold()

diff --git a/core/features/Milestones/View/MilestoneRowView.swift b/core/features/Milestones/View/MilestoneRowView.swift
@@ -39,7 +39,7 @@ struct MilestoneRowView: View {
         .padding()
         .background(
             RoundedRectangle(cornerRadius: 10)
-                .fill(Color.white)
+                .fill(Color("secondaryBackground"))
         )
         .overlay(
             RoundedRectangle(cornerRadius: 10)

diff --git a/core/features/Monitors/Views/MonitorDetailsView.swift b/core/features/Monitors/Views/MonitorDetailsView.swift
@@ -41,7 +41,6 @@ struct MonitorDetailsView: View {
         }
         .padding()
         .frame(maxWidth: .infinity)
-        .background(Color.white)
         Spacer()
     }
 }

diff --git a/core/features/Repositories/Views/RepositoryDetailsView.swift b/core/features/Repositories/Views/RepositoryDetailsView.swift
@@ -39,7 +39,6 @@ struct RepositoryDetailsView: View {
             }
             .padding()
             .frame(maxWidth: .infinity)
-            .background(Color.white)
             .padding(.horizontal, 20)
         }
         .frame(maxWidth: .infinity, alignment: .top) // Align VStack at the top