status-im
/
status-desktop
mirror of https://github.com/status-im/status-desktop.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

chore(ThemePalette): introduced userCustomizationColors 

BREAKING CHANGE: renamed accountColors to userCustomizationColors
This commit is contained in:
Patryk Osmaczko 2022-04-07 21:13:19 +02:00 committed by Michał Cieślak
parent fe214b32a0
commit 94e168423e
6 changed files with 31 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ui/StatusQ/sandbox/pages/StatusWalletColorSelectPage.qml
View File

@ -12,6 +12,6 @@ Column {
spacing: 8
StatusWalletColorSelect {
model: Theme.palette.accountColors
model: Theme.palette.userCustomizationColors
}
}

4
ui/StatusQ/src/StatusQ/Controls/StatusAccountSelector.qml
View File

@ -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 {

2
ui/StatusQ/src/StatusQ/Controls/StatusWalletColorSelect.qml
View File

@ -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
}

22
ui/StatusQ/src/StatusQ/Core/Theme/StatusDarkTheme.qml
View File

@ -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",

22
ui/StatusQ/src/StatusQ/Core/Theme/StatusLightTheme.qml
View File

@ -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",

2
ui/StatusQ/src/StatusQ/Core/Theme/ThemePalette.qml
View File

@ -90,7 +90,7 @@ QtObject {
property color miscColor11
property color miscColor12
property var accountColors: []
property var userCustomizationColors: []
property var identiconRingColors: []