Implement New Contrast Surfaces Spec.

PiperOrigin-RevId: 585959265

Author: Material Eng

cpp/dynamiccolor/contrast_curve.h

@@ -22,8 +22,11 @@
 namespace material_color_utilities {
 
 /**
- * Documents a constraint between two DynamicColors, in which their tones must
- * have a certain distance from each other.
+ * A class containing a value that changes with the contrast level.
+ *
+ * Usually represents the contrast requirements for a dynamic color on its
+ * background. The four values correspond to values for contrast levels -1.0,
+ * 0.0, 0.5, and 1.0, respectively.
  */
 struct ContrastCurve {
   double low;
@@ -34,22 +37,22 @@ struct ContrastCurve {
   /**
    * Creates a `ContrastCurve` object.
    *
-   * @param low Contrast requirement for contrast level -1.0
-   * @param normal Contrast requirement for contrast level 0.0
-   * @param medium Contrast requirement for contrast level 0.5
-   * @param high Contrast requirement for contrast level 1.0
+   * @param low Value for contrast level -1.0
+   * @param normal Value for contrast level 0.0
+   * @param medium Value for contrast level 0.5
+   * @param high Value for contrast level 1.0
    */
   ContrastCurve(double low, double normal, double medium, double high)
       : low(low), normal(normal), medium(medium), high(high) {}
 
   /**
-   * Returns the contrast ratio at a given contrast level.
+   * Returns the value at a given contrast level.
    *
-   * @param contrastLevel The contrast level. 0.0 is the default (normal);
-   * -1.0 is the lowest; 1.0 is the highest.
-   * @return The contrast ratio, a number between 1.0 and 21.0.
+   * @param contrastLevel The contrast level. 0.0 is the default (normal); -1.0
+   *     is the lowest; 1.0 is the highest.
+   * @return The value. For contrast ratios, a number between 1.0 and 21.0.
    */
-  double getContrast(double contrastLevel) {
+  double get(double contrastLevel) {
     if (contrastLevel <= -1.0) {
       return low;
     } else if (contrastLevel < 0.0) {

cpp/dynamiccolor/dynamic_color.cc

@@ -154,9 +154,9 @@ double DynamicColor::GetTone(const DynamicScheme& scheme) {
 
     // 1st round: solve to min, each
     double n_contrast =
-        nearer.contrast_curve_.value().getContrast(scheme.contrast_level);
+        nearer.contrast_curve_.value().get(scheme.contrast_level);
     double f_contrast =
-        farther.contrast_curve_.value().getContrast(scheme.contrast_level);
+        farther.contrast_curve_.value().get(scheme.contrast_level);
 
     // If a color is good enough, it is not adjusted.
     // Initial and adjusted tones for `nearer`
@@ -234,8 +234,7 @@ double DynamicColor::GetTone(const DynamicScheme& scheme) {
 
     double bg_tone = background_.value()(scheme).GetTone(scheme);
 
-    double desired_ratio =
-        contrast_curve_.value().getContrast(scheme.contrast_level);
+    double desired_ratio = contrast_curve_.value().get(scheme.contrast_level);
 
     if (RatioOfTones(bg_tone, answer) >= desired_ratio) {
       // Don't "improve" what's good enough.

cpp/dynamiccolor/dynamic_color_test.cc

@@ -50,7 +50,7 @@ TEST(DynamicColorTest, One) {
   EXPECT_EQ((unsigned int)(MaterialDynamicColors::Surface().GetArgb(s)),
             0xfffff8f6);
   EXPECT_EQ((unsigned int)(MaterialDynamicColors::SurfaceDim().GetArgb(s)),
-            0xfff0d4cf);
+            0xffdcc0bc);
   EXPECT_EQ((unsigned int)(MaterialDynamicColors::SurfaceBright().GetArgb(s)),
             0xfffff8f6);
   EXPECT_EQ(
@@ -62,74 +62,74 @@ TEST(DynamicColorTest, One) {
       0xfffff0ee);
   EXPECT_EQ(
       (unsigned int)(MaterialDynamicColors::SurfaceContainer().GetArgb(s)),
-      0xffffe9e6);
+      0xffffe2dd);
   EXPECT_EQ(
       (unsigned int)(MaterialDynamicColors::SurfaceContainerHigh().GetArgb(s)),
-      0xffffe2dd);
+      0xfff3d7d2);
   EXPECT_EQ(
       (unsigned int)(MaterialDynamicColors::SurfaceContainerHighest().GetArgb(
           s)),
-      0xfff9dcd8);
+      0xffe7cbc7);
   EXPECT_EQ((unsigned int)(MaterialDynamicColors::OnSurface().GetArgb(s)),
-            0xff271815);
+            0xff1b0e0b);
   EXPECT_EQ((unsigned int)(MaterialDynamicColors::SurfaceVariant().GetArgb(s)),
             0xfffddbd5);
   EXPECT_EQ(
       (unsigned int)(MaterialDynamicColors::OnSurfaceVariant().GetArgb(s)),
-      0xff543d3a);
+      0xff46312e);
   EXPECT_EQ((unsigned int)(MaterialDynamicColors::InverseSurface().GetArgb(s)),
             0xff3d2c29);
   EXPECT_EQ(
       (unsigned int)(MaterialDynamicColors::InverseOnSurface().GetArgb(s)),
       0xffffedea);
   EXPECT_EQ((unsigned int)(MaterialDynamicColors::Outline().GetArgb(s)),
-            0xff725955);
+            0xff654d49);
   EXPECT_EQ((unsigned int)(MaterialDynamicColors::OutlineVariant().GetArgb(s)),
-            0xff907470);
+            0xff816763);
   EXPECT_EQ((unsigned int)(MaterialDynamicColors::Shadow().GetArgb(s)),
             0xff000000);
   EXPECT_EQ((unsigned int)(MaterialDynamicColors::Scrim().GetArgb(s)),
             0xff000000);
   EXPECT_EQ((unsigned int)(MaterialDynamicColors::SurfaceTint().GetArgb(s)),
             0xffc00100);
   EXPECT_EQ((unsigned int)(MaterialDynamicColors::Primary().GetArgb(s)),
-            0xff8c0100);
+            0xff740100);
   EXPECT_EQ((unsigned int)(MaterialDynamicColors::OnPrimary().GetArgb(s)),
             0xffffffff);
   EXPECT_EQ(
       (unsigned int)(MaterialDynamicColors::PrimaryContainer().GetArgb(s)),
-      0xffeb0000);
+      0xffdc0100);
   EXPECT_EQ(
       (unsigned int)(MaterialDynamicColors::OnPrimaryContainer().GetArgb(s)),
       0xffffffff);
   EXPECT_EQ((unsigned int)(MaterialDynamicColors::InversePrimary().GetArgb(s)),
             0xffffb4a8);
   EXPECT_EQ((unsigned int)(MaterialDynamicColors::Secondary().GetArgb(s)),
-            0xff603924);
+            0xff522d19);
   EXPECT_EQ((unsigned int)(MaterialDynamicColors::OnSecondary().GetArgb(s)),
             0xffffffff);
   EXPECT_EQ(
       (unsigned int)(MaterialDynamicColors::SecondaryContainer().GetArgb(s)),
-      0xff996952);
+      0xff91624b);
   EXPECT_EQ(
       (unsigned int)(MaterialDynamicColors::OnSecondaryContainer().GetArgb(s)),
       0xffffffff);
   EXPECT_EQ((unsigned int)(MaterialDynamicColors::Tertiary().GetArgb(s)),
-            0xff633909);
+            0xff532d00);
   EXPECT_EQ((unsigned int)(MaterialDynamicColors::OnTertiary().GetArgb(s)),
             0xffffffff);
   EXPECT_EQ(
       (unsigned int)(MaterialDynamicColors::TertiaryContainer().GetArgb(s)),
-      0xff9d6937);
+      0xff946230);
   EXPECT_EQ(
       (unsigned int)(MaterialDynamicColors::OnTertiaryContainer().GetArgb(s)),
       0xffffffff);
   EXPECT_EQ((unsigned int)(MaterialDynamicColors::Error().GetArgb(s)),
-            0xff8c0009);
+            0xff740006);
   EXPECT_EQ((unsigned int)(MaterialDynamicColors::OnError().GetArgb(s)),
             0xffffffff);
   EXPECT_EQ((unsigned int)(MaterialDynamicColors::ErrorContainer().GetArgb(s)),
-            0xffda342e);
+            0xffcf2c27);
   EXPECT_EQ(
       (unsigned int)(MaterialDynamicColors::OnErrorContainer().GetArgb(s)),
       0xffffffff);