add missing functions

Author: T-Dynamos

materialyoucolor/utils/color_utils.py

@@ -147,6 +147,10 @@ def argb_from_rgba(rgba: list[int]) -> int:
     return (rgba[3] << 24) | (rgba[0] << 16) | (rgba[1] << 8) | rgba[2]
 
 
+def argb_from_rgba_01(rgba: list[int]) -> int:
+    return argb_from_rgba([int(_ * 255) for _ in rgba])
+
+
 def lstar_from_argb(argb: int) -> float:
     y = xyz_from_argb(argb)[1]
     return 116.0 * lab_f(y / 100.0) - 16.0
@@ -160,6 +164,10 @@ def lstar_from_y(y: float) -> float:
     return lab_f(y / 100.0) * 116.0 - 16.0
 
 
+def srgb_to_argb(srgb):
+    return int("0xff{:06X}".format(0xFFFFFF & srgb), 16)
+
+
 def linearized(rgb_component: int) -> float:
     normalized = rgb_component / 255.0
     if normalized <= 0.040449936:

materialyoucolor/utils/platform_utils.py

@@ -6,7 +6,10 @@
 
 from materialyoucolor.hct import Hct
 from materialyoucolor.palettes.tonal_palette import TonalPalette
-from materialyoucolor.scheme.dynamic_scheme import DynamicScheme, DynamicSchemeOptions
+from materialyoucolor.dynamiccolor.dynamic_scheme import (
+    DynamicScheme,
+)
+from materialyoucolor.dynamiccolor.variant import Variant
 from materialyoucolor.scheme.scheme_content import SchemeContent
 from materialyoucolor.scheme.scheme_expressive import SchemeExpressive
 from materialyoucolor.scheme.scheme_fidelity import SchemeFidelity
@@ -16,15 +19,14 @@
 from materialyoucolor.scheme.scheme_rainbow import SchemeRainbow
 from materialyoucolor.scheme.scheme_tonal_spot import SchemeTonalSpot
 from materialyoucolor.scheme.scheme_vibrant import SchemeVibrant
-from materialyoucolor.scheme.variant import Variant
 from materialyoucolor.score.score import Score
 from materialyoucolor.utils.color_utils import argb_from_rgba_01, srgb_to_argb
 from materialyoucolor.utils.math_utils import sanitize_degrees_double
 
 try:
-    from materialyoucolor.quantize import QuantizeCelebi
+    from materialyoucolor.quantize import ImageQuantizeCelebi
 except:
-    QuantizeCelebi = None
+    ImageQuantizeCelebi = None
 
 autoclass = None
 _is_android = "ANDROID_ARGUMENT" in os.environ
@@ -38,11 +40,6 @@
     context = mActivity.getApplicationContext()
     WallpaperManager = autoclass("android.app.WallpaperManager").getInstance(mActivity)
 
-try:
-    from PIL import Image
-except Exception:
-    Image = None
-
 SCHEMES = {
     "TONAL_SPOT": SchemeTonalSpot,
     "SPRITZ": SchemeNeutral,
@@ -171,26 +168,17 @@ def get_system_color(color_name):
         color_names[color_name] = TonalPalette.from_hue_and_chroma(hct.hue, hct.chroma)
 
     return DynamicScheme(
-        DynamicSchemeOptions(
-            reverse_color_from_primary(
-                get_system_color("primary_palette"),
-                selected_scheme,
-            ),
-            getattr(Variant, selected_scheme),
-            contrast,
-            dark_mode,
-            **color_names,
-        )
+        reverse_color_from_primary(
+            get_system_color("primary_palette"),
+            selected_scheme,
+        ),
+        getattr(Variant, selected_scheme),
+        contrast,
+        dark_mode,
+        **color_names,
     )
 
 
-def open_wallpaper_file(file_path) -> Image:
-    try:
-        return Image.open(file_path)
-    except Exception:
-        return None
-
-
 def get_dynamic_scheme(
     # Scheme options
     dark_mode=True,
@@ -277,33 +265,16 @@ def logger(message):
         not selected_scheme
         and not selected_color
         and fallback_wallpaper_path
-        and (image := open_wallpaper_file(fallback_wallpaper_path))
-        and QuantizeCelebi is not None
+        and ImageQuantizeCelebi is not None
     ):
         timer_start = default_timer()
-        pixel_len = image.width * image.height
-        try:
-            image_data = image.get_flattened_data()
-        except:
-            image_data = image.getdata()
-        # TODO: Think about getting data from bitmap
-        pixel_array = [
-            image_data[_]
-            for _ in range(
-                0, pixel_len, dynamic_color_quality if not _is_android else 1
-            )
-        ]
-        logger(
-            f"Created an array of pixels from a "
-            f"system wallpaper file - {default_timer() - timer_start} sec."
-        )
-        timer_start = default_timer()
-        colors = QuantizeCelebi(pixel_array, 128)
+        colors = ImageQuantizeCelebi(fallback_wallpaper_path, dynamic_color_quality)
         selected_color = Score.score(colors)[0]
         WALLPAPER_CACHE[fallback_wallpaper_path] = [
             selected_color,
             os.path.getsize(fallback_wallpaper_path),
         ]
+
         logger(f"Got dominant colors - {default_timer() - timer_start} sec.")
 
     return (