From b7644465685dcbcf1dcbb4279b3932cca4defeac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Cie=C5=9Blak?= Date: Fri, 17 May 2024 19:45:27 +0200 Subject: [PATCH] feat(StatusLetterIdenticon): simplify names of properties Closes: #14439 --- ui/StatusQ/src/StatusQ/Components/StatusLetterIdenticon.qml | 6 +++--- ui/StatusQ/src/StatusQ/Components/StatusSmartIdenticon.qml | 2 +- ui/StatusQ/src/StatusQ/Core/StatusAssetSettings.qml | 2 +- .../AppLayouts/Wallet/controls/SavedAddressesDelegate.qml | 2 +- .../AppLayouts/Wallet/popups/AddEditSavedAddressPopup.qml | 2 +- ui/app/AppLayouts/Wallet/popups/ReceiveModal.qml | 2 +- ui/app/AppLayouts/Wallet/popups/RemoveSavedAddressPopup.qml | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/ui/StatusQ/src/StatusQ/Components/StatusLetterIdenticon.qml b/ui/StatusQ/src/StatusQ/Components/StatusLetterIdenticon.qml index 60a831f67b..5faecba2e5 100644 --- a/ui/StatusQ/src/StatusQ/Components/StatusLetterIdenticon.qml +++ b/ui/StatusQ/src/StatusQ/Components/StatusLetterIdenticon.qml @@ -21,10 +21,10 @@ Rectangle { // // characterLen is ignored property bool useAcronymForLetterIdenticon: false - property bool strictBackgroundColor: !useAcronymForLetterIdenticon + property bool backgroundWithAlpha: useAcronymForLetterIdenticon color: { - if (root.strictBackgroundColor) + if (!root.backgroundWithAlpha) return root.letterIdenticonColor return Qt.rgba(root.letterIdenticonColor.r, @@ -57,7 +57,7 @@ Rectangle { font.weight: Font.Bold font.pixelSize: root.letterSize color: { - if (!root.strictBackgroundColor) + if (root.backgroundWithAlpha) 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 ac651e54c4..20b2c1f3b2 100644 --- a/ui/StatusQ/src/StatusQ/Components/StatusSmartIdenticon.qml +++ b/ui/StatusQ/src/StatusQ/Components/StatusSmartIdenticon.qml @@ -120,7 +120,7 @@ Loader { letterSize: root.asset.letterSize charactersLen: root.asset.charactersLen useAcronymForLetterIdenticon: root.asset.useAcronymForLetterIdenticon - strictBackgroundColor: root.asset.useLetterIdenticonStrictBgColor + backgroundWithAlpha: root.asset.letterIdenticonBgWithAlpha } } diff --git a/ui/StatusQ/src/StatusQ/Core/StatusAssetSettings.qml b/ui/StatusQ/src/StatusQ/Core/StatusAssetSettings.qml index 15133da5a5..35c1af1575 100644 --- a/ui/StatusQ/src/StatusQ/Core/StatusAssetSettings.qml +++ b/ui/StatusQ/src/StatusQ/Core/StatusAssetSettings.qml @@ -16,7 +16,7 @@ QtObject { property bool isLetterIdenticon property bool useAcronymForLetterIdenticon: true - property bool useLetterIdenticonStrictBgColor: true + property bool letterIdenticonBgWithAlpha: false property int letterSize: emoji ? 11 : (charactersLen == 1 ? _oneLetterSize : _twoLettersSize) property int charactersLen: 1 diff --git a/ui/app/AppLayouts/Wallet/controls/SavedAddressesDelegate.qml b/ui/app/AppLayouts/Wallet/controls/SavedAddressesDelegate.qml index b60acc28a2..9bdd8a3042 100644 --- a/ui/app/AppLayouts/Wallet/controls/SavedAddressesDelegate.qml +++ b/ui/app/AppLayouts/Wallet/controls/SavedAddressesDelegate.qml @@ -63,7 +63,7 @@ StatusListItem { height: 40 color: Utils.getColorForId(root.colorId) isLetterIdenticon: true - useLetterIdenticonStrictBgColor: false + letterIdenticonBgWithAlpha: true } statusListItemIcon.hoverEnabled: true diff --git a/ui/app/AppLayouts/Wallet/popups/AddEditSavedAddressPopup.qml b/ui/app/AppLayouts/Wallet/popups/AddEditSavedAddressPopup.qml index de6c9272b6..92404e5da5 100644 --- a/ui/app/AppLayouts/Wallet/popups/AddEditSavedAddressPopup.qml +++ b/ui/app/AppLayouts/Wallet/popups/AddEditSavedAddressPopup.qml @@ -562,7 +562,7 @@ StatusModal { emoji: model.emoji color: model.color isLetterIdenticon: !model.icon - useLetterIdenticonStrictBgColor: model.type !== AddEditSavedAddressPopup.CardType.SavedAddress + letterIdenticonBgWithAlpha: model.type === AddEditSavedAddressPopup.CardType.SavedAddress charactersLen: 2 } } diff --git a/ui/app/AppLayouts/Wallet/popups/ReceiveModal.qml b/ui/app/AppLayouts/Wallet/popups/ReceiveModal.qml index 16cb9ad6a3..8f4e46fa3e 100644 --- a/ui/app/AppLayouts/Wallet/popups/ReceiveModal.qml +++ b/ui/app/AppLayouts/Wallet/popups/ReceiveModal.qml @@ -233,7 +233,7 @@ StatusModal { emoji: root.selectedAccount.emoji charactersLen: 1 isLetterIdenticon: root.selectedAccount.name && !root.selectedAccount.emoji - useLetterIdenticonStrictBgColor: !root.selectedAccount.name || root.selectedAccount.emoji + letterIdenticonBgWithAlpha: root.selectedAccount.name && !root.selectedAccount.emoji } } } diff --git a/ui/app/AppLayouts/Wallet/popups/RemoveSavedAddressPopup.qml b/ui/app/AppLayouts/Wallet/popups/RemoveSavedAddressPopup.qml index ed4bf3bd3c..7f82574815 100644 --- a/ui/app/AppLayouts/Wallet/popups/RemoveSavedAddressPopup.qml +++ b/ui/app/AppLayouts/Wallet/popups/RemoveSavedAddressPopup.qml @@ -55,7 +55,7 @@ StatusDialog { asset { color: Utils.getColorForId(root.colorId) isLetterIdenticon: true - useLetterIdenticonStrictBgColor: false + letterIdenticonBgWithAlpha: true } } }