Add new surface colors, update mappings

albi005 · Apr 7, 2023 · cedfb65 · cedfb65
1 parent 7bd5c97
commit cedfb65
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 2 deletions.
diff --git a/MaterialColorUtilities/Schemes/DarkSchemeMapper.cs b/MaterialColorUtilities/Schemes/DarkSchemeMapper.cs
@@ -50,6 +50,20 @@ protected override void MapCore(TCorePalette corePalette, TScheme scheme)
             scheme.Surface3 = scheme.Surface.Add(scheme.Primary, .11);
             scheme.Surface4 = scheme.Surface.Add(scheme.Primary, .12);
             scheme.Surface5 = scheme.Surface.Add(scheme.Primary, .14);
+
+            scheme.SurfaceDim = corePalette.Neutral[6];
+            scheme.Surface = corePalette.Neutral[6];
+            scheme.SurfaceBright = corePalette.Neutral[24];
+            scheme.SurfaceContainerLowest = corePalette.Neutral[4];
+            scheme.SurfaceContainerLow = corePalette.Neutral[10];
+            scheme.SurfaceContainer = corePalette.Neutral[12];
+            scheme.SurfaceContainerHigh = corePalette.Neutral[17];
+            scheme.SurfaceContainerHighest = corePalette.Neutral[22];
+            scheme.OnSurface = corePalette.Neutral[90];
+            scheme.OnSurfaceVariant = corePalette.Neutral[80];
+            scheme.Outline = corePalette.Neutral[60];
+            scheme.OutlineVariant = corePalette.Neutral[30];
+
         }
     }
 }
diff --git a/MaterialColorUtilities/Schemes/LightSchemeMapper.cs b/MaterialColorUtilities/Schemes/LightSchemeMapper.cs
@@ -50,6 +50,19 @@ protected override void MapCore(TCorePalette corePalette, TScheme scheme)
             scheme.Surface3 = scheme.Surface.Add(scheme.Primary, .11);
             scheme.Surface4 = scheme.Surface.Add(scheme.Primary, .12);
             scheme.Surface5 = scheme.Surface.Add(scheme.Primary, .14);
+
+            scheme.SurfaceDim = corePalette.Neutral[87];
+            scheme.Surface = corePalette.Neutral[98];
+            scheme.SurfaceBright = corePalette.Neutral[98];
+            scheme.SurfaceContainerLowest = corePalette.Neutral[100];
+            scheme.SurfaceContainerLow = corePalette.Neutral[96];
+            scheme.SurfaceContainer = corePalette.Neutral[94];
+            scheme.SurfaceContainerHigh = corePalette.Neutral[92];
+            scheme.SurfaceContainerHighest = corePalette.Neutral[90];
+            scheme.OnSurface = corePalette.Neutral[10];
+            scheme.OnSurfaceVariant = corePalette.Neutral[30];
+            scheme.Outline = corePalette.Neutral[50];
+            scheme.OutlineVariant = corePalette.Neutral[80];
         }
     }
 }
diff --git a/MaterialColorUtilities/Schemes/Scheme.cs b/MaterialColorUtilities/Schemes/Scheme.cs
@@ -53,4 +53,12 @@ public partial class Scheme<TColor>
     public TColor Surface3 { get; set; } = default!;
     public TColor Surface4 { get; set; } = default!;
     public TColor Surface5 { get; set; } = default!;
+    public TColor SurfaceDim { get; set; } = default!;
+    public TColor SurfaceBright { get; set; } = default!;
+    public TColor SurfaceContainerLowest { get; set; } = default!;
+    public TColor SurfaceContainerLow { get; set; } = default!;
+    public TColor SurfaceContainer { get; set; } = default!;
+    public TColor SurfaceContainerHigh { get; set; } = default!;
+    public TColor SurfaceContainerHighest { get; set; } = default!;
+    public TColor OutlineVariant { get; set; } = default!;
 }
diff --git a/global.json b/global.json
@@ -1,7 +1,7 @@
 {
   "sdk": {
-    "version": "6.0.400",
-    "rollForward": "latestMinor",
+    "version": "7",
+    "rollForward": "latestMajor",
     "allowPrerelease": true
   }
 }