From a153279e77c544859ab4310acb6d931b519a9acc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Cie=C5=9Blak?= Date: Fri, 17 May 2024 19:29:05 +0200 Subject: [PATCH] feat(StatusLetterIdenticon): make useAcronymForLetterIdenticon true by default --- ui/StatusQ/src/StatusQ/Controls/StatusIconTabButton.qml | 2 ++ ui/StatusQ/src/StatusQ/Controls/StatusNavBarTabButton.qml | 1 - ui/StatusQ/src/StatusQ/Core/StatusAssetSettings.qml | 4 ++-- ui/app/AppLayouts/Onboarding/views/ProfileChatKeyView.qml | 1 - ui/app/AppLayouts/Wallet/controls/SavedAddressesDelegate.qml | 2 +- ui/app/AppLayouts/Wallet/popups/AddEditSavedAddressPopup.qml | 2 +- ui/app/AppLayouts/Wallet/popups/ReceiveModal.qml | 3 +-- ui/app/AppLayouts/Wallet/popups/RemoveSavedAddressPopup.qml | 2 +- ui/app/mainui/AppMain.qml | 2 +- ui/imports/shared/controls/chat/UserImage.qml | 1 - 10 files changed, 9 insertions(+), 11 deletions(-) diff --git a/ui/StatusQ/src/StatusQ/Controls/StatusIconTabButton.qml b/ui/StatusQ/src/StatusQ/Controls/StatusIconTabButton.qml index 295cb96fca..d9db4ff03d 100644 --- a/ui/StatusQ/src/StatusQ/Controls/StatusIconTabButton.qml +++ b/ui/StatusQ/src/StatusQ/Controls/StatusIconTabButton.qml @@ -32,6 +32,8 @@ TabButton { asset.height: asset.isImage ? 28 : statusIconTabButton.icon.height asset.color: (statusIconTabButton.hovered || highlighted || statusIconTabButton.checked) ? Theme.palette.primaryColor1 : statusIconTabButton.icon.color asset.isLetterIdenticon: statusIconTabButton.name !== "" && !asset.isImage + asset.charactersLen: 1 + asset.useAcronymForLetterIdenticon: false name: statusIconTabButton.name } } diff --git a/ui/StatusQ/src/StatusQ/Controls/StatusNavBarTabButton.qml b/ui/StatusQ/src/StatusQ/Controls/StatusNavBarTabButton.qml index 1abdd2f0c6..222c71477a 100644 --- a/ui/StatusQ/src/StatusQ/Controls/StatusNavBarTabButton.qml +++ b/ui/StatusQ/src/StatusQ/Controls/StatusNavBarTabButton.qml @@ -12,7 +12,6 @@ StatusIconTabButton { property Component popupMenu property alias stateIcon: stateIcon - StatusToolTip { id: statusTooltip visible: statusNavBarTabButton.hovered && !!statusTooltip.text diff --git a/ui/StatusQ/src/StatusQ/Core/StatusAssetSettings.qml b/ui/StatusQ/src/StatusQ/Core/StatusAssetSettings.qml index 366cc65907..15133da5a5 100644 --- a/ui/StatusQ/src/StatusQ/Core/StatusAssetSettings.qml +++ b/ui/StatusQ/src/StatusQ/Core/StatusAssetSettings.qml @@ -15,8 +15,8 @@ QtObject { property int rotation property bool isLetterIdenticon - property bool useAcronymForLetterIdenticon - property bool useLetterIdenticonStrictBgColor: !useAcronymForLetterIdenticon + property bool useAcronymForLetterIdenticon: true + property bool useLetterIdenticonStrictBgColor: true property int letterSize: emoji ? 11 : (charactersLen == 1 ? _oneLetterSize : _twoLettersSize) property int charactersLen: 1 diff --git a/ui/app/AppLayouts/Onboarding/views/ProfileChatKeyView.qml b/ui/app/AppLayouts/Onboarding/views/ProfileChatKeyView.qml index f340a65f14..6a4657d17d 100644 --- a/ui/app/AppLayouts/Onboarding/views/ProfileChatKeyView.qml +++ b/ui/app/AppLayouts/Onboarding/views/ProfileChatKeyView.qml @@ -84,7 +84,6 @@ Item { asset.height: 86 asset.letterSize: 32 asset.color: Utils.colorForPubkey(d.publicKey) - asset.charactersLen: 2 asset.isImage: !!asset.name asset.imgIsIdenticon: false asset.name: d.image diff --git a/ui/app/AppLayouts/Wallet/controls/SavedAddressesDelegate.qml b/ui/app/AppLayouts/Wallet/controls/SavedAddressesDelegate.qml index a44e75e13c..b60acc28a2 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 - useAcronymForLetterIdenticon: true + useLetterIdenticonStrictBgColor: false } statusListItemIcon.hoverEnabled: true diff --git a/ui/app/AppLayouts/Wallet/popups/AddEditSavedAddressPopup.qml b/ui/app/AppLayouts/Wallet/popups/AddEditSavedAddressPopup.qml index 063bd3b514..de6c9272b6 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 - useAcronymForLetterIdenticon: model.type === AddEditSavedAddressPopup.CardType.SavedAddress + useLetterIdenticonStrictBgColor: 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 6cc0539536..16cb9ad6a3 100644 --- a/ui/app/AppLayouts/Wallet/popups/ReceiveModal.qml +++ b/ui/app/AppLayouts/Wallet/popups/ReceiveModal.qml @@ -233,13 +233,12 @@ StatusModal { emoji: root.selectedAccount.emoji charactersLen: 1 isLetterIdenticon: root.selectedAccount.name && !root.selectedAccount.emoji - useAcronymForLetterIdenticon: root.selectedAccount.name && !root.selectedAccount.emoji + useLetterIdenticonStrictBgColor: !root.selectedAccount.name || root.selectedAccount.emoji } } } } - Item { width: parent.width height: Math.max(flow.height, editButton.height) diff --git a/ui/app/AppLayouts/Wallet/popups/RemoveSavedAddressPopup.qml b/ui/app/AppLayouts/Wallet/popups/RemoveSavedAddressPopup.qml index cb0ab236a8..ed4bf3bd3c 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 - useAcronymForLetterIdenticon: true + useLetterIdenticonStrictBgColor: false } } } diff --git a/ui/app/mainui/AppMain.qml b/ui/app/mainui/AppMain.qml index 65763e2242..9a90f12ea6 100644 --- a/ui/app/mainui/AppMain.qml +++ b/ui/app/mainui/AppMain.qml @@ -715,7 +715,7 @@ Item { implicitHeight: 32 identicon.asset.width: width identicon.asset.height: height - identicon.asset.charactersLen: 2 + identicon.asset.useAcronymForLetterIdenticon: true identicon.asset.color: Utils.colorForPubkey(appMain.rootStore.userProfileInst.pubKey) identicon.ringSettings.ringSpecModel: Utils.getColorHashAsJson(appMain.rootStore.userProfileInst.pubKey, appMain.rootStore.userProfileInst.preferredName) diff --git a/ui/imports/shared/controls/chat/UserImage.qml b/ui/imports/shared/controls/chat/UserImage.qml index 337c2044ce..ff25460623 100644 --- a/ui/imports/shared/controls/chat/UserImage.qml +++ b/ui/imports/shared/controls/chat/UserImage.qml @@ -36,7 +36,6 @@ Loader { height: root.imageHeight color: Utils.colorForColorId(root.colorId) name: root.image - charactersLen: 2 isImage: true } ringSettings {