color bug fix

Author: T-Dynamos

.gitignore

@@ -6,3 +6,4 @@ materialyoucolor/quantize
 __pycache__
 *.pyc
 image.jpg
+tests/compare*

materialyoucolor/dynamiccolor/color_spec.py

@@ -275,6 +275,11 @@ def get_tone(self, scheme: "DynamicScheme", color: "DynamicColor") -> float:
 
 
 class ColorCalculationDelegateImpl2025(ColorCalculationDelegate):
+    @staticmethod
+    def _is_fixed_dim_name(name: str) -> bool:
+        lowered = name.lower()
+        return lowered.endswith("_fixed_dim") or lowered.endswith("fixeddim")
+
     def get_hct(self, scheme: "DynamicScheme", color: "DynamicColor") -> "Hct":
         palette = color.palette(scheme)
         tone = color.get_tone(scheme)
@@ -345,7 +350,7 @@ def get_tone(self, scheme: "DynamicScheme", color: "DynamicColor") -> float:
                         else DynamicColor.foreground_tone(bg_tone, self_contrast)
                     )
 
-            if color.is_background and not color.name.endswith("_fixed_dim"):
+            if color.is_background and not self._is_fixed_dim_name(color.name):
                 if self_tone >= 57:
                     self_tone = clamp_double(65, 100, self_tone)
                 else:
@@ -371,7 +376,7 @@ def get_tone(self, scheme: "DynamicScheme", color: "DynamicColor") -> float:
                 else DynamicColor.foreground_tone(bg_tone, desired_ratio)
             )
 
-            if color.is_background and not color.name.endswith("_fixed_dim"):
+            if color.is_background and not self._is_fixed_dim_name(color.name):
                 if answer >= 57:
                     answer = clamp_double(65, 100, answer)
                 else:

materialyoucolor/dynamiccolor/color_spec_2021.py

@@ -263,7 +263,11 @@ def primary(self) -> DynamicColor:
         return DynamicColor.from_palette(
             name="primary",
             palette=lambda s: s.primary_palette,
-            tone=lambda s: 100 if is_monochrome(s) else (80 if s.is_dark else 40),
+            tone=lambda s: (
+                (100 if s.is_dark else 0)
+                if is_monochrome(s)
+                else (80 if s.is_dark else 40)
+            ),
             is_background=True,
             background=lambda s: self.highestSurface(s),
             contrast_curve=lambda s: ContrastCurve(3, 4.5, 7, 7),
@@ -279,7 +283,11 @@ def onPrimary(self) -> DynamicColor:
         return DynamicColor.from_palette(
             name="onPrimary",
             palette=lambda s: s.primary_palette,
-            tone=lambda s: 10 if is_monochrome(s) else (20 if s.is_dark else 100),
+            tone=lambda s: (
+                (10 if s.is_dark else 90)
+                if is_monochrome(s)
+                else (20 if s.is_dark else 100)
+            ),
             background=lambda s: self.primary(),
             contrast_curve=lambda s: ContrastCurve(4.5, 7, 11, 21),
         )
@@ -291,7 +299,11 @@ def primaryContainer(self) -> DynamicColor:
             tone=lambda s: (
                 s.source_color_hct.tone
                 if is_fidelity(s)
-                else (85 if is_monochrome(s) else (30 if s.is_dark else 90))
+                else (
+                    (85 if s.is_dark else 25)
+                    if is_monochrome(s)
+                    else (30 if s.is_dark else 90)
+                )
             ),
             is_background=True,
             background=lambda s: self.highestSurface(s),
@@ -308,7 +320,11 @@ def onPrimaryContainer(self) -> DynamicColor:
             tone=lambda s: (
                 DynamicColor.foreground_tone(self.primaryContainer().tone(s), 4.5)
                 if is_fidelity(s)
-                else (0 if is_monochrome(s) else (90 if s.is_dark else 30))
+                else (
+                    (0 if s.is_dark else 100)
+                    if is_monochrome(s)
+                    else (90 if s.is_dark else 30)
+                )
             ),
             background=lambda s: self.primaryContainer(),
             contrast_curve=lambda s: ContrastCurve(3, 4.5, 7, 11),
@@ -343,7 +359,11 @@ def onSecondary(self) -> DynamicColor:
         return DynamicColor.from_palette(
             name="onSecondary",
             palette=lambda s: s.secondary_palette,
-            tone=lambda s: 10 if is_monochrome(s) else (20 if s.is_dark else 100),
+            tone=lambda s: (
+                (10 if s.is_dark else 100)
+                if is_monochrome(s)
+                else (20 if s.is_dark else 100)
+            ),
             background=lambda s: self.secondary(),
             contrast_curve=lambda s: ContrastCurve(4.5, 7, 11, 21),
         )
@@ -353,7 +373,7 @@ def secondaryContainer(self) -> DynamicColor:
             name="secondaryContainer",
             palette=lambda s: s.secondary_palette,
             tone=lambda s: (
-                30
+                (30 if s.is_dark else 85)
                 if is_monochrome(s)
                 else (
                     find_desired_chroma_by_tone(
@@ -379,7 +399,7 @@ def onSecondaryContainer(self) -> DynamicColor:
             name="onSecondaryContainer",
             palette=lambda s: s.secondary_palette,
             tone=lambda s: (
-                90
+                (90 if s.is_dark else 10)
                 if is_monochrome(s)
                 else (
                     DynamicColor.foreground_tone(self.secondaryContainer().tone(s), 4.5)
@@ -395,9 +415,11 @@ def tertiary(self) -> DynamicColor:
         return DynamicColor.from_palette(
             name="tertiary",
             palette=lambda s: s.tertiary_palette,
-            tone=lambda s: 90
-            if is_monochrome(s)
-            else (25 if is_monochrome(s) else (80 if s.is_dark else 40)),
+            tone=lambda s: (
+                (90 if s.is_dark else 25)
+                if is_monochrome(s)
+                else (80 if s.is_dark else 40)
+            ),
             is_background=True,
             background=lambda s: self.highestSurface(s),
             contrast_curve=lambda s: ContrastCurve(3, 4.5, 7, 7),
@@ -413,9 +435,11 @@ def onTertiary(self) -> DynamicColor:
         return DynamicColor.from_palette(
             name="onTertiary",
             palette=lambda s: s.tertiary_palette,
-            tone=lambda s: 10
-            if is_monochrome(s)
-            else (90 if is_monochrome(s) else (20 if s.is_dark else 100)),
+            tone=lambda s: (
+                (10 if s.is_dark else 90)
+                if is_monochrome(s)
+                else (20 if s.is_dark else 100)
+            ),
             background=lambda s: self.tertiary(),
             contrast_curve=lambda s: ContrastCurve(4.5, 7, 11, 21),
         )
@@ -425,7 +449,7 @@ def tertiaryContainer(self) -> DynamicColor:
             name="tertiaryContainer",
             palette=lambda s: s.tertiary_palette,
             tone=lambda s: (
-                60
+                (60 if s.is_dark else 49)
                 if is_monochrome(s)
                 else (
                     DislikeAnalyzer.fix_if_disliked(
@@ -448,7 +472,7 @@ def onTertiaryContainer(self) -> DynamicColor:
             name="onTertiaryContainer",
             palette=lambda s: s.tertiary_palette,
             tone=lambda s: (
-                0
+                (0 if s.is_dark else 100)
                 if is_monochrome(s)
                 else (
                     DynamicColor.foreground_tone(self.tertiaryContainer().tone(s), 4.5)
@@ -502,9 +526,11 @@ def onErrorContainer(self) -> DynamicColor:
         return DynamicColor.from_palette(
             name="onErrorContainer",
             palette=lambda s: s.error_palette,
-            tone=lambda s: 90
-            if is_monochrome(s)
-            else (10 if is_monochrome(s) else (90 if s.is_dark else 30)),
+            tone=lambda s: (
+                (90 if s.is_dark else 10)
+                if is_monochrome(s)
+                else (90 if s.is_dark else 30)
+            ),
             background=lambda s: self.errorContainer(),
             contrast_curve=lambda s: ContrastCurve(3, 4.5, 7, 11),
         )

materialyoucolor/dynamiccolor/dynamic_color.py

@@ -98,6 +98,10 @@ def __init__(self, *args, **kwargs):
 
     @classmethod
     def from_palette(cls, *args, **kwargs) -> "DynamicColor":
+        if "tone" not in kwargs or kwargs.get("tone") is None:
+            kwargs["tone"] = cls.get_initial_tone_from_background(
+                kwargs.get("background")
+            )
         return cls(*args, **kwargs)
 
     @staticmethod