From f0c7d950ea96731d70169b047acc18a4e7141f2a Mon Sep 17 00:00:00 2001 From: Patryk Osmaczko Date: Thu, 7 Apr 2022 21:13:19 +0200 Subject: [PATCH] chore(ThemePalette): introduced userCustomizationColors BREAKING CHANGE: renamed accountColors to userCustomizationColors --- sandbox/pages/StatusWalletColorSelectPage.qml | 2 +- .../Controls/StatusAccountSelector.qml | 4 ++-- .../Controls/StatusWalletColorSelect.qml | 2 +- src/StatusQ/Core/Theme/StatusDarkTheme.qml | 22 +++++++++++-------- src/StatusQ/Core/Theme/StatusLightTheme.qml | 22 +++++++++++-------- src/StatusQ/Core/Theme/ThemePalette.qml | 2 +- 6 files changed, 31 insertions(+), 23 deletions(-) diff --git a/sandbox/pages/StatusWalletColorSelectPage.qml b/sandbox/pages/StatusWalletColorSelectPage.qml index a25a421d..af2d5f4b 100644 --- a/sandbox/pages/StatusWalletColorSelectPage.qml +++ b/sandbox/pages/StatusWalletColorSelectPage.qml @@ -12,6 +12,6 @@ Column { spacing: 8 StatusWalletColorSelect { - model: Theme.palette.accountColors + model: Theme.palette.userCustomizationColors } } diff --git a/src/StatusQ/Controls/StatusAccountSelector.qml b/src/StatusQ/Controls/StatusAccountSelector.qml index 1caf1566..73a84152 100644 --- a/src/StatusQ/Controls/StatusAccountSelector.qml +++ b/src/StatusQ/Controls/StatusAccountSelector.qml @@ -55,7 +55,7 @@ Item { return } if (selectedAccount.color) { - selectedIconImg.color = Utils.getThemeAccountColor(selectedAccount.color, Theme.palette.accountColors) || Theme.palette.accountColors[0] + selectedIconImg.color = Utils.getThemeAccountColor(selectedAccount.color, Theme.palette.userCustomizationColors) || Theme.palette.userCustomizationColors[0] } if (selectedAccount.name) { selectedTextField.text = selectedAccount.name @@ -208,7 +208,7 @@ Item { width: 20 height: 20 icon: "filled-account" - color: Utils.getThemeAccountColor(model.color, Theme.palette.accountColors) || Theme.palette.accountColors[0] + color: Utils.getThemeAccountColor(model.color, Theme.palette.userCustomizationColors) || Theme.palette.userCustomizationColors[0] } Column { diff --git a/src/StatusQ/Controls/StatusWalletColorSelect.qml b/src/StatusQ/Controls/StatusWalletColorSelect.qml index b34dc280..cb14737f 100644 --- a/src/StatusQ/Controls/StatusWalletColorSelect.qml +++ b/src/StatusQ/Controls/StatusWalletColorSelect.qml @@ -45,7 +45,7 @@ Item { return true } // Check the colors in the other theme - const currentColor = Utils.getThemeAccountColor(upperCaseColor, Theme.palette.accountColors) + const currentColor = Utils.getThemeAccountColor(upperCaseColor, Theme.palette.userCustomizationColors) if (!currentColor) { return false } diff --git a/src/StatusQ/Core/Theme/StatusDarkTheme.qml b/src/StatusQ/Core/Theme/StatusDarkTheme.qml index 799479ef..eaf697c1 100644 --- a/src/StatusQ/Core/Theme/StatusDarkTheme.qml +++ b/src/StatusQ/Core/Theme/StatusDarkTheme.qml @@ -147,15 +147,19 @@ ThemePalette { miscColor11: getColor('yellow2') miscColor12: getColor('green6') - accountColors: [ - getColor('blue5'), - getColor('yellow2'), - "#E6ABFC", - getColor('moss2'), - "#FB8383", - getColor('green4'), - "#ADA3FF", - getColor('brown3') + 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", diff --git a/src/StatusQ/Core/Theme/StatusLightTheme.qml b/src/StatusQ/Core/Theme/StatusLightTheme.qml index fcb35ea1..be645942 100644 --- a/src/StatusQ/Core/Theme/StatusLightTheme.qml +++ b/src/StatusQ/Core/Theme/StatusLightTheme.qml @@ -145,15 +145,19 @@ ThemePalette { miscColor11: getColor('brown2') miscColor12: getColor('green5') - accountColors: [ - getColor('blue'), - getColor('brown2'), - getColor('violet'), - "#1D806F", - getColor('red2'), - getColor('green2'), - getColor('purple'), - getColor('brown') + 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", diff --git a/src/StatusQ/Core/Theme/ThemePalette.qml b/src/StatusQ/Core/Theme/ThemePalette.qml index af6a340e..a7f6abb9 100644 --- a/src/StatusQ/Core/Theme/ThemePalette.qml +++ b/src/StatusQ/Core/Theme/ThemePalette.qml @@ -90,7 +90,7 @@ QtObject { property color miscColor11 property color miscColor12 - property var accountColors: [] + property var userCustomizationColors: [] property var identiconRingColors: []