feat: contrast level

Author: luisbocanegra

src/kde_material_you_colors/apply_themes.py

@@ -23,6 +23,7 @@ def apply(config: Configs, wallpaper: WallpaperReader, dark_light):
         config.read("scheme_variant"),
         config.read("chroma_multiplier"),
         config.read("tone_multiplier"),
+        config.read("contrast_level"),
     )
 
     if material_colors is None:

src/kde_material_you_colors/config.py

@@ -178,6 +178,7 @@ def defaults(self):
             "chroma_multiplier": [args.chroma_multiplier, 1, 2],
             "tone_multiplier": [args.tone_multiplier, 1, 2],
             "frame_contrast": [args.frame_contrast, 1, 2],
+            "contrast_level": [args.contrast_level, 1, 2],
             "qdbus_executable": [args.qdbus_executable, None, 3],
             "manual_fetch": [args.manual_fetch, False, 0],
             "fetch_colors": [None, False, 0],

src/kde_material_you_colors/data/sample_config.conf

@@ -211,6 +211,11 @@ tone_multiplier = 1
 # Default is 0.2
 frame_contrast = 1
 
+# Contrast
+# A float between -1 and 1
+# Default is 0
+contrast_level = 0
+
 # QDbus executable
 # Name or location of the QDbus executable e.g qdbus6, qdbus-qt6...
 # Default is qdbus6

src/kde_material_you_colors/main.py

@@ -370,6 +370,14 @@ def main():
         metavar="<float>",
     )
 
+    parser.add_argument(
+        "--contrast-level",
+        type=float,
+        help="General contrast level (value from -1 to 1, default is 0)",
+        default=None,
+        metavar="<float>",
+    )
+
     # Get commandline arguments
     args = parser.parse_args()
     # Check for one shot arguments

src/kde_material_you_colors/utils/m3_scheme_utils.py

@@ -42,34 +42,6 @@ def palette_to_hex(palette: TonalPalette):
     return tones
 
 
-def custom_dynamic_color(
-    custom_color,
-    source_color=0,
-    blend=True,
-    scheme_variant=5,
-    chroma_mult=1.0,
-    tone_mult=1.0,
-):
-    value = custom_color["value"]
-    value = DislikeAnalyzer.fix_if_disliked(Hct.from_int(value)).to_int()
-    if custom_color["blend"]:
-        value = Blend.harmonize(value, source_color)
-
-    hct = Hct.from_int(value)
-    scheme = getScheme(scheme_variant, hct, False, 0)
-    schemeDark = getScheme(scheme_variant, hct, True, 0)
-    colorsLight = getColors(scheme, chroma_mult, tone_mult, False)
-    colorsDark = getColors(schemeDark, chroma_mult, tone_mult, True)
-
-    return {
-        "source": hexFromArgb(custom_color["value"]),
-        "value": hexFromArgb(value),
-        "blended": blend,
-        "light": colorsLight,
-        "dark": colorsDark,
-    }
-
-
 schemes = [
     SchemeContent,
     SchemeExpressive,
@@ -85,7 +57,11 @@ def custom_dynamic_color(
 
 def getScheme(scheme_variant, source, isDark, contrastLevel):
     scheme_class = schemes[scheme_variant]
-    return scheme_class(source, isDark, contrastLevel)
+    return scheme_class(
+        source_color_hct=source,
+        is_dark=isDark,
+        contrast_level=contrastLevel,
+    )
 
 
 def getColors(scheme, chroma_mult, tone_mult, is_dark):
@@ -109,10 +85,12 @@ def getColors(scheme, chroma_mult, tone_mult, is_dark):
     return colors
 
 
-def themeFromSourceColor(seed_color, scheme_variant=5, chroma_mult=1, tone_mult=1):
+def themeFromSourceColor(
+    seed_color, scheme_variant=5, chroma_mult=1, tone_mult=1, contrast_level=0
+):
     source = Hct.from_int(seed_color)
-    scheme = getScheme(scheme_variant, source, False, 0)
-    schemeDark = getScheme(scheme_variant, source, True, 0)
+    scheme = getScheme(scheme_variant, source, False, contrast_level)
+    schemeDark = getScheme(scheme_variant, source, True, contrast_level)
     colorsLight = getColors(scheme, chroma_mult, tone_mult, False)
     colorsDark = getColors(schemeDark, chroma_mult, tone_mult, True)
     # Base text states taken from Breeze Color Scheme
@@ -152,7 +130,13 @@ def themeFromSourceColor(seed_color, scheme_variant=5, chroma_mult=1, tone_mult=
 
 
 def get_material_you_colors(
-    wallpaper_data, ncolor, source_type, scheme_variant, chroma_mult, tone_mult
+    wallpaper_data,
+    ncolor,
+    source_type,
+    scheme_variant,
+    chroma_mult,
+    tone_mult,
+    contrast_level,
 ):
     """Get material you colors from wallpaper or hex color using material-color-utility
 
@@ -191,7 +175,11 @@ def get_material_you_colors(
             ncolor = 0
         source_color = hexFromArgb(source_colors[ncolor])
         theme = themeFromSourceColor(
-            argbFromHex(source_color), scheme_variant, chroma_mult, tone_mult
+            argbFromHex(source_color),
+            scheme_variant,
+            chroma_mult,
+            tone_mult,
+            contrast_level,
         )
 
         materialYouColors = {
@@ -229,6 +217,7 @@ def get_color_schemes(
     scheme_variant=5,
     chroma_mult=1.0,
     tone_mult=1.0,
+    contrast_level=0.0,
 ):
     """Display best colors, allow to select alternative color,
     and make and apply color schemes for dark and light mode
@@ -258,6 +247,7 @@ def get_color_schemes(
             scheme_variant,
             chroma_mult,
             tone_mult,
+            contrast_level,
         )
 
     elif wallpaper_type == "color" and wallpaper_data:
@@ -269,6 +259,7 @@ def get_color_schemes(
             scheme_variant,
             chroma_mult,
             tone_mult,
+            contrast_level,
         )
 
     if materialYouColors is not None:

src/plasmoid/package/contents/ui/FullRepresentation.qml

@@ -551,7 +551,8 @@ ColumnLayout {
                                     property int scheme_variant: 5; \
                                     property real chroma_multiplier: 1.0; \
                                     property real tone_multiplier: 1.0; \
-                                    property real frame_contrast: 1.0; \
+                                    property real frame_contrast: 0.2; \
+                                    property real contrast_level: 0.0; \
                                 }';
 
                             settings = Qt.createQmlObject(settingsString, mainLayout, "settingsObject");
@@ -2137,6 +2138,53 @@ ColumnLayout {
                                 visible: fullRepresentation.showAdvanced && settings.frame_contrast < 0.15
                             }
 
+                            Rectangle {
+                                Layout.topMargin: Kirigami.Units.mediumSpacing
+                                Layout.preferredWidth: mainLayout.width
+                                height: 1
+                                color: dividerColor
+                                opacity: dividerOpacity
+                                visible: fullRepresentation.showAdvanced
+                            }
+
+                            PlasmaExtras.Heading {
+                                level: 1
+                                text: "Contrast"
+                                Layout.alignment: Qt.AlignHCenter
+                                visible: fullRepresentation.showAdvanced
+                            }
+
+                            RowLayout {
+                                visible: fullRepresentation.showAdvanced
+
+                                PlasmaComponents3.Slider {
+                                    value: settings.contrast_level
+                                    from: -1
+                                    to: 1
+                                    Layout.fillWidth: true
+                                    onValueChanged: {
+                                        settings.contrast_level = value.toFixed(2)
+                                    }
+                                }
+
+                                PlasmaComponents3.TextField {
+                                    Layout.preferredWidth: controlWidth
+                                    placeholderText: "-1-1"
+                                    horizontalAlignment: TextInput.AlignHCenter
+                                    text: parseFloat(settings.contrast_level)
+
+                                    validator: DoubleValidator {
+                                        bottom: -1
+                                        top: 1
+                                        decimals: 2
+                                        notation: DoubleValidator.StandardNotation
+                                    }
+
+                                    onAccepted: {
+                                        settings.contrast_level = parseFloat(text)
+                                    }
+                                }
+                            }
 
                             Rectangle {
                                 Layout.topMargin: Kirigami.Units.mediumSpacing