refactor(settings): colors & cleanup

2026-06-18 17:15:20 -04:00 · 2026-06-17 00:32:58 -04:00
parent 68410e882d
commit 820a9ce983
5 changed files with 60 additions and 44 deletions
@@ -30,42 +30,14 @@ Column {

    function colorForValue(value) {
        switch (value) {
-        case "primary":
-        case "pri":
-            return Theme.primary;
-        case "primaryContainer":
-            return Theme.primaryContainer;
-        case "secondary":
-        case "sec":
-            return Theme.secondary;
-        case "secondaryContainer":
-            return Theme.secondaryContainer;
-        case "tertiary":
-        case "ter":
-            return Theme.tertiary;
-        case "tertiaryContainer":
-            return Theme.tertiaryContainer;
-        case "surfaceText":
-            return Theme.surfaceText;
-        case "s":
-            return Theme.surface;
-        case "sc":
-            return Theme.surfaceContainer;
-        case "sch":
-            return Theme.surfaceContainerHigh;
-        case "schh":
-            return Theme.surfaceContainerHighest;
-        case "sth":
-            return Theme.surfaceTextHover;
-        case "error":
-        case "err":
-            return Theme.error;
        case "custom":
            return root.customColor;
        case "none":
            return "transparent";
-        default:
+        case "default":
            return root.defaultColor;
+        default:
+            return Theme.roleColor(value);
        }
    }

@@ -858,13 +858,6 @@ Item {
                }
            }

-            SettingsControlledByFrame {
-                visible: dankBarTab.appearanceOnly && SettingsData.frameEnabled
-                parentModal: dankBarTab.parentModal
-                settingLabel: I18n.tr("Bar spacing and size")
-                reason: I18n.tr("Managed by Frame")
-            }
-
            SettingsCard {
                tab: "appearance"
                iconName: "space_bar"
@@ -1562,7 +1562,7 @@ Item {
                    }
                }

-                WorkspaceColorRow {
+                ColorDropdownRow {
                    tab: "theme"
                    tags: ["widget", "background", "color", "surface", "material"]
                    settingKey: "widgetBackgroundColor"
@@ -1607,6 +1607,12 @@ Item {
                    text: I18n.tr("Control Center Tile Color")
                    description: I18n.tr("Active tile background and icon color", "control center tile color setting description")
                    options: [I18n.tr("Primary", "tile color option"), I18n.tr("Primary Container", "tile color option"), I18n.tr("Secondary", "tile color option"), I18n.tr("Surface Variant", "tile color option")]
+                    optionColorMap: ({
+                            [I18n.tr("Primary", "tile color option")]: Theme.roleColor("primary"),
+                            [I18n.tr("Primary Container", "tile color option")]: Theme.roleColor("primaryContainer"),
+                            [I18n.tr("Secondary", "tile color option")]: Theme.roleColor("secondary"),
+                            [I18n.tr("Surface Variant", "tile color option")]: Theme.roleColor("surfaceVariant")
+                        })
                    currentValue: {
                        switch (SettingsData.controlCenterTileColorMode) {
                        case "primaryContainer":
@@ -1639,6 +1645,12 @@ Item {
                    text: I18n.tr("Button Color")
                    description: I18n.tr("Color for primary action buttons")
                    options: [I18n.tr("Primary", "button color option"), I18n.tr("Primary Container", "button color option"), I18n.tr("Secondary", "button color option"), I18n.tr("Surface Variant", "button color option")]
+                    optionColorMap: ({
+                            [I18n.tr("Primary", "button color option")]: Theme.roleColor("primary"),
+                            [I18n.tr("Primary Container", "button color option")]: Theme.roleColor("primaryContainer"),
+                            [I18n.tr("Secondary", "button color option")]: Theme.roleColor("secondary"),
+                            [I18n.tr("Surface Variant", "button color option")]: Theme.roleColor("surfaceVariant")
+                        })
                    currentValue: {
                        switch (SettingsData.buttonColorMode) {
                        case "primaryContainer":
@@ -184,7 +184,7 @@ SettingsCard {
    readonly property bool workspaceStateColorsVisible: CompositorService.isNiri || CompositorService.isHyprland || CompositorService.isMango
    readonly property bool urgentWorkspaceColorsVisible: workspaceStateColorsVisible || CompositorService.isSway || CompositorService.isScroll || CompositorService.isMiracle

-    WorkspaceColorRow {
+    ColorDropdownRow {
        text: I18n.tr("Focused Color")
        settingKey: "workspaceColorMode"
        tags: ["workspace", "focused", "color", "custom"]
@@ -202,7 +202,7 @@ SettingsCard {
        opacity: 0.15
    }

-    WorkspaceColorRow {
+    ColorDropdownRow {
        text: I18n.tr("Occupied Color")
        settingKey: "workspaceOccupiedColorMode"
        tags: ["workspace", "occupied", "color", "custom"]
@@ -222,7 +222,7 @@ SettingsCard {
        visible: CompositorService.isNiri || CompositorService.isHyprland || CompositorService.isMango
    }

-    WorkspaceColorRow {
+    ColorDropdownRow {
        text: I18n.tr("Unfocused Color")
        settingKey: "workspaceUnfocusedColorMode"
        tags: ["workspace", "unfocused", "color", "custom"]
@@ -242,7 +242,7 @@ SettingsCard {
        visible: CompositorService.isNiri || CompositorService.isHyprland || CompositorService.isMango || CompositorService.isSway || CompositorService.isScroll || CompositorService.isMiracle
    }

-    WorkspaceColorRow {
+    ColorDropdownRow {
        text: I18n.tr("Urgent Color")
        settingKey: "workspaceUrgentColorMode"
        tags: ["workspace", "urgent", "color", "custom"]
@@ -277,7 +277,7 @@ SettingsCard {
        visible: SettingsData.workspaceFocusedBorderEnabled
        leftPadding: Theme.spacingM

-        WorkspaceColorRow {
+        ColorDropdownRow {
            width: parent.width - parent.leftPadding
            text: I18n.tr("Border Color")
            settingKey: "workspaceFocusedBorderColor"