diff --git a/src/StatusQ/Controls/StatusColorSelectorGrid.qml b/src/StatusQ/Controls/StatusColorSelectorGrid.qml index ebc6e676..1658e295 100644 --- a/src/StatusQ/Controls/StatusColorSelectorGrid.qml +++ b/src/StatusQ/Controls/StatusColorSelectorGrid.qml @@ -14,18 +14,7 @@ Column { property int selectedColorIndex: 0 property string selectedColor: "" - property var model:[ StatusColors.colors['black'], - StatusColors.colors['grey'], - StatusColors.colors['blue2'], - StatusColors.colors['purple'], - StatusColors.colors['cyan'], - StatusColors.colors['violet'], - StatusColors.colors['red2'], - StatusColors.colors['yellow'], - StatusColors.colors['green2'], - StatusColors.colors['moss'], - StatusColors.colors['brown'], - StatusColors.colors['brown2'] ] + property var model: Theme.palette.userCustomizationColors signal colorSelected(color color) @@ -43,6 +32,7 @@ Column { columns: 6 rowSpacing: 16 columnSpacing: 32 + Repeater { model: root.model delegate: StatusColorRadioButton { diff --git a/src/StatusQ/Core/Theme/StatusDarkTheme.qml b/src/StatusQ/Core/Theme/StatusDarkTheme.qml index ff48d111..4a977e9b 100644 --- a/src/StatusQ/Core/Theme/StatusDarkTheme.qml +++ b/src/StatusQ/Core/Theme/StatusDarkTheme.qml @@ -147,21 +147,6 @@ ThemePalette { miscColor11: getColor('yellow2') miscColor12: getColor('green6') - userCustomizationColors: [ - "#AAC6FF", - "#887AF9", - "#51D0F0", - "#D37EF4", - "#FA6565", - "#FFCA0F", - "#93DB33", - "#10A88E", - "#AD4343", - "#EAD27B", - "silver", // update me when figma is ready - "darkgrey", // update me when figma is ready - ] - identiconRingColors: ["#000000", "#726F6F", "#C4C4C4", "#E7E7E7", "#FFFFFF", "#00FF00", "#009800", "#B8FFBB", "#FFC413", "#9F5947", "#FFFF00", "#A8AC00", "#FFFFB0", "#FF5733", "#FF0000", "#9A0000", "#FF9D9D", "#FF0099", diff --git a/src/StatusQ/Core/Theme/StatusLightTheme.qml b/src/StatusQ/Core/Theme/StatusLightTheme.qml index 7a4e0a95..e6f978dd 100644 --- a/src/StatusQ/Core/Theme/StatusLightTheme.qml +++ b/src/StatusQ/Core/Theme/StatusLightTheme.qml @@ -145,21 +145,6 @@ ThemePalette { miscColor11: getColor('brown2') miscColor12: getColor('green5') - userCustomizationColors: [ - "#2946C4", - "#887AF9", - "#51D0F0", - "#D37EF4", - "#FA6565", - "#FFCA0F", - "#7CDA00", - "#26A69A", - "#8B3131", - "#9B832F", - "silver", // update me when figma is ready - "darkgrey", // update me when figma is ready - ] - identiconRingColors: ["#000000", "#726F6F", "#C4C4C4", "#E7E7E7", "#FFFFFF", "#00FF00", "#009800", "#B8FFBB", "#FFC413", "#9F5947", "#FFFF00", "#A8AC00", "#FFFFB0", "#FF5733", "#FF0000", "#9A0000", "#FF9D9D", "#FF0099", diff --git a/src/StatusQ/Core/Theme/ThemePalette.qml b/src/StatusQ/Core/Theme/ThemePalette.qml index 262a62e5..ab6fc077 100644 --- a/src/StatusQ/Core/Theme/ThemePalette.qml +++ b/src/StatusQ/Core/Theme/ThemePalette.qml @@ -90,7 +90,20 @@ QtObject { property color miscColor11 property color miscColor12 - property var userCustomizationColors: [] + property var userCustomizationColors: [ + getColor('black', 0.8), + getColor('grey'), + getColor('blue2'), + getColor('purple'), + getColor('cyan'), + getColor('violet'), + getColor('red2'), + getColor('yellow'), + getColor('green2'), + getColor('moss'), + getColor('brown'), + getColor('brown2'), + ] property var identiconRingColors: []