feat: material specification version configuration

Author: luisbocanegra

src/kde_material_you_colors/apply_themes.py

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

src/kde_material_you_colors/config.py

@@ -182,6 +182,7 @@ def defaults(self):
             "qdbus_executable": [args.qdbus_executable, None, 3],
             "manual_fetch": [args.manual_fetch, False, 0],
             "fetch_colors": [None, False, 0],
+            "spec_version": [args.spec_version, None, 3],
         }
 
     def parse_conf(self):

src/kde_material_you_colors/data/sample_config.conf

@@ -227,3 +227,9 @@ contrast_level = 0
 # scheduled screenshot take in screenshot mode
 # Default is False
 manual_fetch = False
+
+# Spec version
+# The version of the material color specification to use
+# One of 2021 2025
+# Default is 2025
+spec_version = 2025

src/kde_material_you_colors/main.py

@@ -378,6 +378,14 @@ def main():
         metavar="<float>",
     )
 
+    parser.add_argument(
+        "--spec-version",
+        type=str,
+        help="The version of the material color specification to use (2021, 2025)",
+        default=None,
+        metavar="<version>",
+    )
+
     # Get commandline arguments
     args = parser.parse_args()
     # Check for one shot arguments

src/kde_material_you_colors/utils/m3_scheme_utils.py

@@ -54,12 +54,13 @@ def palette_to_hex(palette: TonalPalette):
 ]
 
 
-def getScheme(scheme_variant, source, isDark, contrastLevel):
+def getScheme(scheme_variant, source, isDark, contrastLevel, spec):
     scheme_class = schemes[scheme_variant]
     return scheme_class(
         source_color_hct=source,
         is_dark=isDark,
         contrast_level=contrastLevel,
+        spec_version=spec if spec is not None else "2025",
     )
 
 
@@ -85,11 +86,16 @@ def getColors(scheme, chroma_mult, tone_mult, is_dark):
 
 
 def themeFromSourceColor(
-    seed_color, scheme_variant=5, chroma_mult=1, tone_mult=1, contrast_level=0
+    seed_color,
+    scheme_variant=5,
+    chroma_mult=1,
+    tone_mult=1,
+    contrast_level=0,
+    spec_version="2025",
 ):
     source = Hct.from_int(seed_color)
-    scheme = getScheme(scheme_variant, source, False, contrast_level)
-    schemeDark = getScheme(scheme_variant, source, True, contrast_level)
+    scheme = getScheme(scheme_variant, source, False, contrast_level, spec_version)
+    schemeDark = getScheme(scheme_variant, source, True, contrast_level, spec_version)
     colorsLight = getColors(scheme, chroma_mult, tone_mult, False)
     colorsDark = getColors(schemeDark, chroma_mult, tone_mult, True)
     # Base text states taken from Breeze Color Scheme
@@ -136,6 +142,7 @@ def get_material_you_colors(
     chroma_mult,
     tone_mult,
     contrast_level,
+    spec_version,
 ):
     """Get material you colors from wallpaper or hex color using material-color-utility
 
@@ -179,6 +186,7 @@ def get_material_you_colors(
             chroma_mult,
             tone_mult,
             contrast_level,
+            spec_version,
         )
 
         materialYouColors = {
@@ -217,6 +225,7 @@ def get_color_schemes(
     chroma_mult=1.0,
     tone_mult=1.0,
     contrast_level=0.0,
+    spec_version="2025",
 ):
     """Display best colors, allow to select alternative color,
     and make and apply color schemes for dark and light mode
@@ -247,6 +256,7 @@ def get_color_schemes(
             chroma_mult,
             tone_mult,
             contrast_level,
+            spec_version,
         )
 
     elif wallpaper_type == "color" and wallpaper_data:
@@ -259,6 +269,7 @@ def get_color_schemes(
             chroma_mult,
             tone_mult,
             contrast_level,
+            spec_version,
         )
 
     if materialYouColors is not None:

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

@@ -552,6 +552,7 @@ ColumnLayout {
                                     property real tone_multiplier: 1.0; \
                                     property real frame_contrast: 0.2; \
                                     property real contrast_level: 0.0; \
+                                    property string spec_version: "2025"; \
                                 }';
 
                             settings = Qt.createQmlObject(settingsString, mainLayout, "settingsObject");
@@ -2193,6 +2194,58 @@ ColumnLayout {
                                 opacity: dividerOpacity
                             }
 
+                            PlasmaExtras.Heading {
+                                level: 1
+                                text: "Spec Version"
+                                Layout.alignment: Qt.AlignHCenter
+                                visible: fullRepresentation.showAdvanced
+                            }
+
+                            RowLayout {
+                                PlasmaComponents3.Label {
+                                    text: "Version"
+                                    Layout.alignment: Qt.AlignLeft
+                                }
+
+                                PlasmaComponents3.ComboBox {
+                                    model: ["2021", "2025"]
+                                    Layout.fillWidth: true
+                                    currentValue: settings.spec_version
+                                    onActivated: (index) => {
+                                        settings.spec_version = currentText
+                                    }
+
+                                    // Prevent starting scrolling on collapsed combobox
+                                    MouseArea {
+                                        anchors.fill: parent
+                                        hoverEnabled: true
+                                        onWheel: {}
+                                        onClicked: parent.popup.open()
+                                    }
+                                }
+                                PlasmaComponents3.ToolButton {
+                                    icon.name: "help-contents"
+
+                                    hoverEnabled: true
+                                    onClicked: specPopup.open()
+
+                                    PlasmaComponents3.ToolTip {
+                                        id: specPopup
+                                        x: parent.width / 2
+                                        y: parent.height
+                                        text: "The version of the material color specification to use"
+                                    }
+                                }
+                            }
+
+                            Rectangle {
+                                Layout.topMargin: Kirigami.Units.mediumSpacing
+                                Layout.preferredWidth: mainLayout.width
+                                height: 1
+                                color: dividerColor
+                                opacity: dividerOpacity
+                            }
+
                             PlasmaExtras.Heading {
                                 level: 1
                                 text: "Colors"