Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(SearchPopup): displaying community channel's emojis #7761

Merged
merged 1 commit into from
Oct 6, 2022
Merged

fix(SearchPopup): displaying community channel's emojis #7761

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/app/modules/main/app_search/module.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ proc buildLocationMenuForChannelGroup(self: Module, channelGroup: ChannelGroupDt
for chatDto in channelGroup.chats:
var chatName = chatDto.name
var chatImage = chatDto.icon
var chatEmoji = chatDto.emoji
var colorHash: ColorHashDto = @[]
var colorId: int = 0
let isOneToOneChat = chatDto.chatType == ChatType.OneToOne
Expand All @@ -91,7 +92,7 @@ proc buildLocationMenuForChannelGroup(self: Module, channelGroup: ChannelGroupDt
let subItem = location_menu_sub_item.initSubItem(
chatDto.id,
chatName,
chatImage,
if (chatImage != ""): chatImage else: chatEmoji,
"",
chatDto.color,
isOneToOneChat,
Expand Down
3 changes: 0 additions & 3 deletions ui/StatusQ/sandbox/controls/ListItems.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -539,9 +539,6 @@ ColumnLayout {
isAdmin: true
asset.isLetterIdenticon: true
isUntrustworthy: true
Component.onCompleted: {
print(asset.name, asset.isImage, asset.isLetterIdenticon)
}
}

StatusBaseText {
Expand Down
2 changes: 1 addition & 1 deletion ui/StatusQ/src/StatusQ/Components/StatusEmoji.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ Image {
mipmap: true
antialiasing: true
source: emojiId ? `../../assets/twemoji/svg/${emojiId}.svg` : ""
}
}
2 changes: 1 addition & 1 deletion ui/StatusQ/src/StatusQ/Components/StatusSmartIdenticon.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ Loader {
border.color: Theme.palette.directColor7
color: root.asset.imgIsIdenticon ?
Theme.palette.statusRoundedImage.backgroundColor :
"transparent"
root.asset.bgColor
}
Loader {
anchors.centerIn: parent
Expand Down
2 changes: 1 addition & 1 deletion ui/StatusQ/src/StatusQ/Popups/StatusMenuItemDelegate.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ MenuItem {
sourceComponent: {
let subMenuItemIcon = statusPopupMenu.subMenuItemIcons && statusPopupMenu.subMenuItemIcons[parent.subMenuIndex]

if ((parent.subMenu && subMenuItemIcon && subMenuItemIcon.source) ||
if ((parent.subMenu && subMenuItemIcon && statusPopupMenu.subMenuItemIcons[parent.subMenuIndex].source) ||
statusPopupMenuItem.action.assetSettings && !!statusPopupMenuItem.action.assetSettings.name.toString()
&& statusPopupMenuItem.action.assetSettings.isImage) {
return statusRoundImageCmp
Expand Down
5 changes: 4 additions & 1 deletion ui/StatusQ/src/StatusQ/Popups/StatusSearchLocationMenu.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import QtQuick.Controls 2.14
import StatusQ.Core 0.1
import StatusQ.Core.Theme 0.1
import StatusQ.Popups 0.1
import StatusQ.Core.Utils 0.1 as StatusQUtils

StatusPopupMenu {
id: root
Expand Down Expand Up @@ -103,8 +104,10 @@ StatusPopupMenu {
value: model.value
text: model.text
assetSettings.isImage: !!model.imageSource
assetSettings.name: !!model.imageSource ? model.imageSource : model.iconName
assetSettings.name: !!StatusQUtils.Emoji.iconSource(model.imageSource) ?
caybro marked this conversation as resolved.
Show resolved Hide resolved
StatusQUtils.Emoji.iconSource(model.imageSource) : model.imageSource
assetSettings.color: model.isUserIcon ? Theme.palette.userCustomizationColors[model.colorId] : model.iconColor
assetSettings.bgColor: model.iconColor
assetSettings.charactersLen: model.isUserIcon ? 2 : 1
ringSettings.ringSpecModel: model.colorHash
onTriggered: {
Expand Down
1 change: 1 addition & 0 deletions ui/StatusQ/src/StatusQ/Popups/StatusSearchPopupMenuItem.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ MenuItem {
property StatusAssetSettings assetSettings: StatusAssetSettings {
height: 16
width: 16
isImage: (name.toString() !== "")
caybro marked this conversation as resolved.
Show resolved Hide resolved
isLetterIdenticon: (name.toString() === "")
color: (name === "channel") ? Theme.palette.directColor1 : "transparent"
letterSize: charactersLen > 1 ? 8 : 11
Expand Down