refactor: simplify static color logic

Author: luisbocanegra

src/kde_material_you_colors/utils/color_utils.py

@@ -363,31 +363,28 @@ def argbFromHex(hex):
     )
 
 
-def static_color(scheme: DynamicScheme, color, blend=True) -> dict:
+def static_color(scheme: DynamicScheme, argb: int, blend=True) -> dict:
     """_summary_
 
     Args:
         scheme (DynamicScheme): DynamicScheme to use as source
-        color (int): color to generate static version of
-        blend (bool, optional): Whether to blend the color with the scheme's source color. Defaults to True.
+        argb (int): argb value of the color to generate static version of
+        blend (bool, optional): Whether to blend the color towards the source color. Defaults to True.
 
     Returns:
         dict: Static color roles for the given color in hex format
     """
-    md = MaterialDynamicColors()
     if blend:
-        color = Blend.harmonize(color, scheme.source_color_argb)
-    hct = Hct.from_int(color)
-    palette = TonalPalette.from_hue_and_chroma(hct.hue, hct.chroma)
+        argb = Blend.harmonize(argb, scheme.source_color_argb)
 
-    scheme2 = copy.copy(scheme)
-    scheme2.error_palette = palette
+    scheme.error_palette = TonalPalette.from_int(argb)
+    mdc = MaterialDynamicColors()
 
     return {
-        "color": md.error.get_hex(scheme2)[:-2],
-        "onColor": md.onError.get_hex(scheme2)[:-2],
-        "container": md.errorContainer.get_hex(scheme2)[:-2],
-        "onContainer": md.onErrorContainer.get_hex(scheme2)[:-2],
+        "color": mdc.error.get_hex(scheme)[:-2],
+        "onColor": mdc.onError.get_hex(scheme)[:-2],
+        "container": mdc.errorContainer.get_hex(scheme)[:-2],
+        "onContainer": mdc.onErrorContainer.get_hex(scheme)[:-2],
     }
 
 

src/kde_material_you_colors/utils/m3_scheme_utils.py

@@ -11,8 +11,6 @@
 from materialyoucolor.scheme.scheme_monochrome import SchemeMonochrome
 from materialyoucolor.scheme import *
 from materialyoucolor.palettes.tonal_palette import TonalPalette
-from materialyoucolor.dislike.dislike_analyzer import DislikeAnalyzer
-from materialyoucolor.blend import Blend
 from materialyoucolor.dynamiccolor.dynamic_color import DynamicColor
 from kde_material_you_colors.config import Configs
 from kde_material_you_colors.utils.color_utils import rgb2hex
@@ -96,22 +94,22 @@ def themeFromSourceColor(
     colorsDark = getColors(schemeDark, chroma_mult, tone_mult, True)
     # Base text states taken from Breeze Color Scheme
     base_text_states = [
-        {"name": "link", "value": argbFromHex("#2980b9"), "blend": True},
-        {"name": "visited", "value": argbFromHex("#9b59b6"), "blend": True},
-        {"name": "negative", "value": argbFromHex("#da4453"), "blend": True},
-        {"name": "neutral", "value": argbFromHex("#f67400"), "blend": True},
-        {"name": "positive", "value": argbFromHex("#27ae60"), "blend": True},
+        {"name": "link", "value": 4280910009, "hex": "#2980b9"},
+        {"name": "visited", "value": 4288371126, "hex": "#9b59b6"},
+        {"name": "negative", "value": 4292494419, "hex": "#da4453"},
+        {"name": "neutral", "value": 4294341632, "hex": "#f67400"},
+        {"name": "positive", "value": 4280790624, "hex": "#27ae60"},
     ]
 
     cc = {}
+    seed_color_hex = hexFromArgb(seed_color)
 
     for color in base_text_states:
         cc[color["name"]] = {
-            "source": hexFromArgb(seed_color),
-            "value": hexFromArgb(color["value"]),
-            "blend": color["blend"],
-            "light": static_color(scheme, color["value"], color["blend"]),
-            "dark": static_color(schemeDark, color["value"], color["blend"]),
+            "source": seed_color_hex,
+            "value": color["hex"],
+            "light": static_color(scheme, color["value"], True),
+            "dark": static_color(schemeDark, color["value"], True),
         }
 
     out = {