minor fix

Author: T-Dynamos

materialyoucolor/dynamiccolor/color_spec.py

@@ -7,6 +7,85 @@
 
 SpecVersion = Literal["2021", "2025"]
 
+COLOR_NAMES = [
+    # Background & surface base
+    "background",
+    "onBackground",
+    "surface",
+    "surfaceDim",
+    "surfaceBright",
+
+    # Surface containers (elevation scale)
+    "surfaceContainerLowest",
+    "surfaceContainerLow",
+    "surfaceContainer",
+    "surfaceContainerHigh",
+    "surfaceContainerHighest",
+
+    # Surface content
+    "onSurface",
+    "surfaceVariant",
+    "onSurfaceVariant",
+
+    # Outlines & effects
+    "outline",
+    "outlineVariant",
+    "inverseSurface",
+    "inverseOnSurface",
+    "shadow",
+    "scrim",
+    "surfaceTint",
+
+    # Primary colors
+    "primary",
+    "primaryDim",
+    "onPrimary",
+    "primaryContainer",
+    "onPrimaryContainer",
+    "inversePrimary",
+    "primaryFixed",
+    "primaryFixedDim",
+    "onPrimaryFixed",
+    "onPrimaryFixedVariant",
+
+    # Secondary colors
+    "secondary",
+    "secondaryDim",
+    "onSecondary",
+    "secondaryContainer",
+    "onSecondaryContainer",
+    "secondaryFixed",
+    "secondaryFixedDim",
+    "onSecondaryFixed",
+    "onSecondaryFixedVariant",
+
+    # Tertiary colors
+    "tertiary",
+    "tertiaryDim",
+    "onTertiary",
+    "tertiaryContainer",
+    "onTertiaryContainer",
+    "tertiaryFixed",
+    "tertiaryFixedDim",
+    "onTertiaryFixed",
+    "onTertiaryFixedVariant",
+
+    # Error colors
+    "error",
+    "errorDim",
+    "onError",
+    "errorContainer",
+    "onErrorContainer",
+
+    # Palette key colors
+    "primaryPaletteKeyColor",
+    "secondaryPaletteKeyColor",
+    "tertiaryPaletteKeyColor",
+    "neutralPaletteKeyColor",
+    "neutralVariantPaletteKeyColor",
+    "errorPaletteKeyColor",
+]
+
 
 class ColorSpecDelegate(ABC):
     """
@@ -17,250 +96,11 @@ class ColorSpecDelegate(ABC):
     versions.
     """
 
-    # Main Palettes
-    @abstractmethod
-    def primaryPaletteKeyColor(self) -> "DynamicColor":
-        pass
-
-    @abstractmethod
-    def secondaryPaletteKeyColor(self) -> "DynamicColor":
-        pass
-
-    @abstractmethod
-    def tertiaryPaletteKeyColor(self) -> "DynamicColor":
-        pass
-
-    @abstractmethod
-    def neutralPaletteKeyColor(self) -> "DynamicColor":
-        pass
-
-    @abstractmethod
-    def neutralVariantPaletteKeyColor(self) -> "DynamicColor":
-        pass
-
-    @abstractmethod
-    def errorPaletteKeyColor(self) -> "DynamicColor":
-        pass
-
-    # Surfaces [S]
-    @abstractmethod
-    def background(self) -> "DynamicColor":
-        pass
-
-    @abstractmethod
-    def onBackground(self) -> "DynamicColor":
-        pass
-
-    @abstractmethod
-    def surface(self) -> "DynamicColor":
-        pass
-
-    @abstractmethod
-    def surfaceDim(self) -> "DynamicColor":
-        pass
-
-    @abstractmethod
-    def surfaceBright(self) -> "DynamicColor":
-        pass
-
-    @abstractmethod
-    def surfaceContainerLowest(self) -> "DynamicColor":
-        pass
-
-    @abstractmethod
-    def surfaceContainerLow(self) -> "DynamicColor":
-        pass
-
-    @abstractmethod
-    def surfaceContainer(self) -> "DynamicColor":
-        pass
-
-    @abstractmethod
-    def surfaceContainerHigh(self) -> "DynamicColor":
-        pass
-
-    @abstractmethod
-    def surfaceContainerHighest(self) -> "DynamicColor":
-        pass
-
-    @abstractmethod
-    def onSurface(self) -> "DynamicColor":
-        pass
-
-    @abstractmethod
-    def surfaceVariant(self) -> "DynamicColor":
-        pass
-
-    @abstractmethod
-    def onSurfaceVariant(self) -> "DynamicColor":
-        pass
-
-    @abstractmethod
-    def inverseSurface(self) -> "DynamicColor":
-        pass
-
-    @abstractmethod
-    def inverseOnSurface(self) -> "DynamicColor":
-        pass
-
-    @abstractmethod
-    def outline(self) -> "DynamicColor":
-        pass
-
-    @abstractmethod
-    def outlineVariant(self) -> "DynamicColor":
-        pass
-
-    @abstractmethod
-    def shadow(self) -> "DynamicColor":
-        pass
-
-    @abstractmethod
-    def scrim(self) -> "DynamicColor":
-        pass
-
-    @abstractmethod
-    def surfaceTint(self) -> "DynamicColor":
-        pass
-
-    # Primaries [P]
-    @abstractmethod
-    def primary(self) -> "DynamicColor":
-        pass
-
-    @abstractmethod
-    def primaryDim(self) -> "DynamicColor":
-        pass
-
-    @abstractmethod
-    def onPrimary(self) -> "DynamicColor":
-        pass
-
-    @abstractmethod
-    def primaryContainer(self) -> "DynamicColor":
-        pass
-
-    @abstractmethod
-    def onPrimaryContainer(self) -> "DynamicColor":
-        pass
-
-    @abstractmethod
-    def inversePrimary(self) -> "DynamicColor":
-        pass
-
-    # Secondaries [Q]
-    @abstractmethod
-    def secondary(self) -> "DynamicColor":
-        pass
-
-    @abstractmethod
-    def secondaryDim(self) -> "DynamicColor":
-        pass
-
-    @abstractmethod
-    def onSecondary(self) -> "DynamicColor":
-        pass
-
-    @abstractmethod
-    def secondaryContainer(self) -> "DynamicColor":
-        pass
-
-    @abstractmethod
-    def onSecondaryContainer(self) -> "DynamicColor":
-        pass
-
-    # Tertiaries [T]
-    @abstractmethod
-    def tertiary(self) -> "DynamicColor":
-        pass
-
-    @abstractmethod
-    def tertiaryDim(self) -> "DynamicColor":
-        pass
-
-    @abstractmethod
-    def onTertiary(self) -> "DynamicColor":
-        pass
-
-    @abstractmethod
-    def tertiaryContainer(self) -> "DynamicColor":
-        pass
-
-    @abstractmethod
-    def onTertiaryContainer(self) -> "DynamicColor":
-        pass
-
-    # Errors [E]
-    @abstractmethod
-    def error(self) -> "DynamicColor":
-        pass
-
-    @abstractmethod
-    def errorDim(self) -> "DynamicColor":
-        pass
-
-    @abstractmethod
-    def onError(self) -> "DynamicColor":
-        pass
-
-    @abstractmethod
-    def errorContainer(self) -> "DynamicColor":
-        pass
-
-    @abstractmethod
-    def onErrorContainer(self) -> "DynamicColor":
-        pass
-
-    # Primary Fixed Colors [PF]
-    @abstractmethod
-    def primaryFixed(self) -> "DynamicColor":
-        pass
-
-    @abstractmethod
-    def primaryFixedDim(self) -> "DynamicColor":
-        pass
-
-    @abstractmethod
-    def onPrimaryFixed(self) -> "DynamicColor":
-        pass
-
-    @abstractmethod
-    def onPrimaryFixedVariant(self) -> "DynamicColor":
-        pass
-
-    # Secondary Fixed Colors [QF]
-    @abstractmethod
-    def secondaryFixed(self) -> "DynamicColor":
-        pass
-
-    @abstractmethod
-    def secondaryFixedDim(self) -> "DynamicColor":
-        pass
-
-    @abstractmethod
-    def onSecondaryFixed(self) -> "DynamicColor":
-        pass
-
-    @abstractmethod
-    def onSecondaryFixedVariant(self) -> "DynamicColor":
-        pass
-
-    # Tertiary Fixed Colors [TF]
-    @abstractmethod
-    def tertiaryFixed(self) -> "DynamicColor":
-        pass
-
-    @abstractmethod
-    def tertiaryFixedDim(self) -> "DynamicColor":
-        pass
-
-    @abstractmethod
-    def onTertiaryFixed(self) -> "DynamicColor":
-        pass
-
-    @abstractmethod
-    def onTertiaryFixedVariant(self) -> "DynamicColor":
-        pass
+    # define them dynamically
+    for color_name in COLOR_NAMES:
+        exec(
+            f"@abstractmethod\ndef {color_name}(self) -> 'DynamicColor':\n\treturn None"
+        )
 
     # Other
     @abstractmethod

materialyoucolor/dynamiccolor/color_spec_2021.py

@@ -382,9 +382,7 @@ def onSecondaryContainer(self) -> DynamicColor:
                 90
                 if is_monochrome(s)
                 else (
-                    DynamicColor.foreground_tone(
-                        self.secondaryContainer().tone(s), 4.5
-                    )
+                    DynamicColor.foreground_tone(self.secondaryContainer().tone(s), 4.5)
                     if is_fidelity(s)
                     else (90 if s.is_dark else 30)
                 )