diff --git a/ui/StatusQ/src/StatusQ/Components/StatusLetterIdenticon.qml b/ui/StatusQ/src/StatusQ/Components/StatusLetterIdenticon.qml index 5f1c5bc09c..fa88696bd8 100644 --- a/ui/StatusQ/src/StatusQ/Components/StatusLetterIdenticon.qml +++ b/ui/StatusQ/src/StatusQ/Components/StatusLetterIdenticon.qml @@ -14,12 +14,15 @@ Rectangle { property int charactersLen: 1 property color letterIdenticonColor: Theme.palette.miscColor5 property bool useAcronymForLetterIdenticon: false + property bool strictBackgroundColor: !useAcronymForLetterIdenticon color: { - if (root.useAcronymForLetterIdenticon) { - return Qt.rgba(root.letterIdenticonColor.r, root.letterIdenticonColor.g, root.letterIdenticonColor.b, 0.2) - } - return root.letterIdenticonColor + if (root.strictBackgroundColor) + return root.letterIdenticonColor + + return Qt.rgba(root.letterIdenticonColor.r, + root.letterIdenticonColor.g, + root.letterIdenticonColor.b, 0.2) } width: 40 @@ -33,7 +36,7 @@ Rectangle { height: Math.round(parent.height / 2) emojiId: Emoji.iconId(root.emoji, root.emojiSize) || Emoji.iconHex(root.emoji) || "" } - + StatusBaseText { id: identiconText @@ -47,9 +50,9 @@ Rectangle { font.weight: Font.Bold font.pixelSize: root.letterSize color: { - if (root.useAcronymForLetterIdenticon) { + if (!root.strictBackgroundColor) return root.letterIdenticonColor - } + return d.luminance(root.letterIdenticonColor) > 0.5 ? Qt.rgba(0, 0, 0, 0.5) : Qt.rgba(1, 1, 1, 0.7) } diff --git a/ui/StatusQ/src/StatusQ/Components/StatusSmartIdenticon.qml b/ui/StatusQ/src/StatusQ/Components/StatusSmartIdenticon.qml index a6fa6a3135..ac651e54c4 100644 --- a/ui/StatusQ/src/StatusQ/Components/StatusSmartIdenticon.qml +++ b/ui/StatusQ/src/StatusQ/Components/StatusSmartIdenticon.qml @@ -120,6 +120,7 @@ Loader { letterSize: root.asset.letterSize charactersLen: root.asset.charactersLen useAcronymForLetterIdenticon: root.asset.useAcronymForLetterIdenticon + strictBackgroundColor: root.asset.useLetterIdenticonStrictBgColor } } diff --git a/ui/StatusQ/src/StatusQ/Core/StatusAssetSettings.qml b/ui/StatusQ/src/StatusQ/Core/StatusAssetSettings.qml index 9e6c632ee1..366cc65907 100644 --- a/ui/StatusQ/src/StatusQ/Core/StatusAssetSettings.qml +++ b/ui/StatusQ/src/StatusQ/Core/StatusAssetSettings.qml @@ -13,10 +13,13 @@ QtObject { property color hoverColor property color disabledColor property int rotation + property bool isLetterIdenticon property bool useAcronymForLetterIdenticon + property bool useLetterIdenticonStrictBgColor: !useAcronymForLetterIdenticon property int letterSize: emoji ? 11 : (charactersLen == 1 ? _oneLetterSize : _twoLettersSize) property int charactersLen: 1 + property string emoji property string emojiSize: _emojiSize