status-im/status-qml
2
0
Fork 0
mirror of synced 2025-01-22 04:19:24 +00:00
Code Issues Projects Releases Wiki Activity

chore(ThemePalette): introduced userCustomizationColors

Browse Source 
BREAKING CHANGE: renamed accountColors to userCustomizationColors
This commit is contained in:
Patryk Osmaczko 2022-04-07 21:13:19 +02:00 committed by osmaczko
parent 1e5d389b53
commit f0c7d950ea
6 changed files with 31 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sandbox/pages/StatusWalletColorSelectPage.qml
View File

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

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

@ -55,7 +55,7 @@ Item {
return return
} }
if (selectedAccount.color) { 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) { if (selectedAccount.name) {
selectedTextField.text = selectedAccount.name selectedTextField.text = selectedAccount.name
@ -208,7 +208,7 @@ Item {
width: 20 width: 20
height: 20 height: 20
icon: "filled-account" 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 { Column {

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

@ -45,7 +45,7 @@ Item {
return true return true
} }
// Check the colors in the other theme // 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) { if (!currentColor) {
return false return false
} }

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

@ -147,15 +147,19 @@ ThemePalette {
miscColor11: getColor('yellow2') miscColor11: getColor('yellow2')
miscColor12: getColor('green6') miscColor12: getColor('green6')
accountColors: [ userCustomizationColors: [
getColor('blue5'), "#AAC6FF",
getColor('yellow2'), "#887AF9",
"#E6ABFC", "#51D0F0",
getColor('moss2'), "#D37EF4",
"#FB8383", "#FA6565",
getColor('green4'), "#FFCA0F",
"#ADA3FF", "#93DB33",
getColor('brown3') "#10A88E",
"#AD4343",
"#EAD27B",
"silver", // update me when figma is ready
"darkgrey", // update me when figma is ready
] ]
identiconRingColors: ["#000000", "#726F6F", "#C4C4C4", "#E7E7E7", "#FFFFFF", "#00FF00", identiconRingColors: ["#000000", "#726F6F", "#C4C4C4", "#E7E7E7", "#FFFFFF", "#00FF00",

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

@ -145,15 +145,19 @@ ThemePalette {
miscColor11: getColor('brown2') miscColor11: getColor('brown2')
miscColor12: getColor('green5') miscColor12: getColor('green5')
accountColors: [ userCustomizationColors: [
getColor('blue'), "#2946C4",
getColor('brown2'), "#887AF9",
getColor('violet'), "#51D0F0",
"#1D806F", "#D37EF4",
getColor('red2'), "#FA6565",
getColor('green2'), "#FFCA0F",
getColor('purple'), "#7CDA00",
getColor('brown') "#26A69A",
"#8B3131",
"#9B832F",
"silver", // update me when figma is ready
"darkgrey", // update me when figma is ready
] ]
identiconRingColors: ["#000000", "#726F6F", "#C4C4C4", "#E7E7E7", "#FFFFFF", "#00FF00", identiconRingColors: ["#000000", "#726F6F", "#C4C4C4", "#E7E7E7", "#FFFFFF", "#00FF00",

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

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