feat(StatusLetterIdenticon): make useAcronymForLetterIdenticon true by default
This commit is contained in:
parent
b2ab3a455a
commit
a153279e77
|
@ -32,6 +32,8 @@ TabButton {
|
||||||
asset.height: asset.isImage ? 28 : statusIconTabButton.icon.height
|
asset.height: asset.isImage ? 28 : statusIconTabButton.icon.height
|
||||||
asset.color: (statusIconTabButton.hovered || highlighted || statusIconTabButton.checked) ? Theme.palette.primaryColor1 : statusIconTabButton.icon.color
|
asset.color: (statusIconTabButton.hovered || highlighted || statusIconTabButton.checked) ? Theme.palette.primaryColor1 : statusIconTabButton.icon.color
|
||||||
asset.isLetterIdenticon: statusIconTabButton.name !== "" && !asset.isImage
|
asset.isLetterIdenticon: statusIconTabButton.name !== "" && !asset.isImage
|
||||||
|
asset.charactersLen: 1
|
||||||
|
asset.useAcronymForLetterIdenticon: false
|
||||||
name: statusIconTabButton.name
|
name: statusIconTabButton.name
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -12,7 +12,6 @@ StatusIconTabButton {
|
||||||
property Component popupMenu
|
property Component popupMenu
|
||||||
property alias stateIcon: stateIcon
|
property alias stateIcon: stateIcon
|
||||||
|
|
||||||
|
|
||||||
StatusToolTip {
|
StatusToolTip {
|
||||||
id: statusTooltip
|
id: statusTooltip
|
||||||
visible: statusNavBarTabButton.hovered && !!statusTooltip.text
|
visible: statusNavBarTabButton.hovered && !!statusTooltip.text
|
||||||
|
|
|
@ -15,8 +15,8 @@ QtObject {
|
||||||
property int rotation
|
property int rotation
|
||||||
|
|
||||||
property bool isLetterIdenticon
|
property bool isLetterIdenticon
|
||||||
property bool useAcronymForLetterIdenticon
|
property bool useAcronymForLetterIdenticon: true
|
||||||
property bool useLetterIdenticonStrictBgColor: !useAcronymForLetterIdenticon
|
property bool useLetterIdenticonStrictBgColor: true
|
||||||
property int letterSize: emoji ? 11 : (charactersLen == 1 ? _oneLetterSize : _twoLettersSize)
|
property int letterSize: emoji ? 11 : (charactersLen == 1 ? _oneLetterSize : _twoLettersSize)
|
||||||
property int charactersLen: 1
|
property int charactersLen: 1
|
||||||
|
|
||||||
|
|
|
@ -84,7 +84,6 @@ Item {
|
||||||
asset.height: 86
|
asset.height: 86
|
||||||
asset.letterSize: 32
|
asset.letterSize: 32
|
||||||
asset.color: Utils.colorForPubkey(d.publicKey)
|
asset.color: Utils.colorForPubkey(d.publicKey)
|
||||||
asset.charactersLen: 2
|
|
||||||
asset.isImage: !!asset.name
|
asset.isImage: !!asset.name
|
||||||
asset.imgIsIdenticon: false
|
asset.imgIsIdenticon: false
|
||||||
asset.name: d.image
|
asset.name: d.image
|
||||||
|
|
|
@ -63,7 +63,7 @@ StatusListItem {
|
||||||
height: 40
|
height: 40
|
||||||
color: Utils.getColorForId(root.colorId)
|
color: Utils.getColorForId(root.colorId)
|
||||||
isLetterIdenticon: true
|
isLetterIdenticon: true
|
||||||
useAcronymForLetterIdenticon: true
|
useLetterIdenticonStrictBgColor: false
|
||||||
}
|
}
|
||||||
|
|
||||||
statusListItemIcon.hoverEnabled: true
|
statusListItemIcon.hoverEnabled: true
|
||||||
|
|
|
@ -562,7 +562,7 @@ StatusModal {
|
||||||
emoji: model.emoji
|
emoji: model.emoji
|
||||||
color: model.color
|
color: model.color
|
||||||
isLetterIdenticon: !model.icon
|
isLetterIdenticon: !model.icon
|
||||||
useAcronymForLetterIdenticon: model.type === AddEditSavedAddressPopup.CardType.SavedAddress
|
useLetterIdenticonStrictBgColor: model.type !== AddEditSavedAddressPopup.CardType.SavedAddress
|
||||||
charactersLen: 2
|
charactersLen: 2
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -233,13 +233,12 @@ StatusModal {
|
||||||
emoji: root.selectedAccount.emoji
|
emoji: root.selectedAccount.emoji
|
||||||
charactersLen: 1
|
charactersLen: 1
|
||||||
isLetterIdenticon: root.selectedAccount.name && !root.selectedAccount.emoji
|
isLetterIdenticon: root.selectedAccount.name && !root.selectedAccount.emoji
|
||||||
useAcronymForLetterIdenticon: root.selectedAccount.name && !root.selectedAccount.emoji
|
useLetterIdenticonStrictBgColor: !root.selectedAccount.name || root.selectedAccount.emoji
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
Item {
|
Item {
|
||||||
width: parent.width
|
width: parent.width
|
||||||
height: Math.max(flow.height, editButton.height)
|
height: Math.max(flow.height, editButton.height)
|
||||||
|
|
|
@ -55,7 +55,7 @@ StatusDialog {
|
||||||
asset {
|
asset {
|
||||||
color: Utils.getColorForId(root.colorId)
|
color: Utils.getColorForId(root.colorId)
|
||||||
isLetterIdenticon: true
|
isLetterIdenticon: true
|
||||||
useAcronymForLetterIdenticon: true
|
useLetterIdenticonStrictBgColor: false
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -715,7 +715,7 @@ Item {
|
||||||
implicitHeight: 32
|
implicitHeight: 32
|
||||||
identicon.asset.width: width
|
identicon.asset.width: width
|
||||||
identicon.asset.height: height
|
identicon.asset.height: height
|
||||||
identicon.asset.charactersLen: 2
|
identicon.asset.useAcronymForLetterIdenticon: true
|
||||||
identicon.asset.color: Utils.colorForPubkey(appMain.rootStore.userProfileInst.pubKey)
|
identicon.asset.color: Utils.colorForPubkey(appMain.rootStore.userProfileInst.pubKey)
|
||||||
identicon.ringSettings.ringSpecModel: Utils.getColorHashAsJson(appMain.rootStore.userProfileInst.pubKey,
|
identicon.ringSettings.ringSpecModel: Utils.getColorHashAsJson(appMain.rootStore.userProfileInst.pubKey,
|
||||||
appMain.rootStore.userProfileInst.preferredName)
|
appMain.rootStore.userProfileInst.preferredName)
|
||||||
|
|
|
@ -36,7 +36,6 @@ Loader {
|
||||||
height: root.imageHeight
|
height: root.imageHeight
|
||||||
color: Utils.colorForColorId(root.colorId)
|
color: Utils.colorForColorId(root.colorId)
|
||||||
name: root.image
|
name: root.image
|
||||||
charactersLen: 2
|
|
||||||
isImage: true
|
isImage: true
|
||||||
}
|
}
|
||||||
ringSettings {
|
ringSettings {
|
||||||
|
|
Loading…
Reference in New Issue