Finish getting all avatars jdenticonified

This commit is contained in:
Loren Burkholder 2021-08-31 21:53:12 -04:00
parent a23c586cde
commit 3a86d44c1e
11 changed files with 15 additions and 0 deletions

View File

@ -130,6 +130,7 @@ Page {
else else
return "image://colorimage/" + model.avatarUrl + "?" + communityItem.unimportantText; return "image://colorimage/" + model.avatarUrl + "?" + communityItem.unimportantText;
} }
roomid: model.roomid
displayName: model.displayName displayName: model.displayName
color: communityItem.background color: communityItem.background
} }

View File

@ -139,6 +139,7 @@ Popup {
height: popup.avatarHeight height: popup.avatarHeight
width: popup.avatarWidth width: popup.avatarWidth
displayName: model.displayName displayName: model.displayName
userid: model.userid
url: model.avatarUrl.replace("mxc://", "image://MxcImage/") url: model.avatarUrl.replace("mxc://", "image://MxcImage/")
onClicked: popup.completionClicked(completer.completionAt(model.index)) onClicked: popup.completionClicked(completer.completionAt(model.index))
} }
@ -194,6 +195,7 @@ Popup {
height: popup.avatarHeight height: popup.avatarHeight
width: popup.avatarWidth width: popup.avatarWidth
displayName: model.roomName displayName: model.roomName
roomid: model.roomid
url: model.avatarUrl.replace("mxc://", "image://MxcImage/") url: model.avatarUrl.replace("mxc://", "image://MxcImage/")
onClicked: { onClicked: {
popup.completionClicked(completer.completionAt(model.index)); popup.completionClicked(completer.completionAt(model.index));
@ -225,6 +227,7 @@ Popup {
height: popup.avatarHeight height: popup.avatarHeight
width: popup.avatarWidth width: popup.avatarWidth
displayName: model.roomName displayName: model.roomName
roomid: model.roomid
url: model.avatarUrl.replace("mxc://", "image://MxcImage/") url: model.avatarUrl.replace("mxc://", "image://MxcImage/")
onClicked: popup.completionClicked(completer.completionAt(model.index)) onClicked: popup.completionClicked(completer.completionAt(model.index))
} }

View File

@ -65,6 +65,7 @@ ApplicationWindow {
width: avatarSize width: avatarSize
height: avatarSize height: avatarSize
url: model.avatarUrl.replace("mxc://", "image://MxcImage/") url: model.avatarUrl.replace("mxc://", "image://MxcImage/")
roomid: model.roomid
displayName: model.name displayName: model.name
} }

View File

@ -39,6 +39,7 @@ ApplicationWindow {
width: 130 width: 130
height: width height: width
roomid: members.roomId
displayName: members.roomName displayName: members.roomName
Layout.alignment: Qt.AlignHCenter Layout.alignment: Qt.AlignHCenter
url: members.avatarUrl.replace("mxc://", "image://MxcImage/") url: members.avatarUrl.replace("mxc://", "image://MxcImage/")

View File

@ -38,6 +38,7 @@ ApplicationWindow {
Avatar { Avatar {
url: roomSettings.roomAvatarUrl.replace("mxc://", "image://MxcImage/") url: roomSettings.roomAvatarUrl.replace("mxc://", "image://MxcImage/")
roomid: roomSettings.roomid
displayName: roomSettings.roomName displayName: roomSettings.roomName
height: 130 height: 130
width: 130 width: 130

View File

@ -137,6 +137,7 @@ Item {
ColumnLayout { ColumnLayout {
id: preview id: preview
property string roomid: room ? room.roomid : (roomPreview ? roomPreview.roomid : "")
property string roomName: room ? room.roomName : (roomPreview ? roomPreview.roomName : "") property string roomName: room ? room.roomName : (roomPreview ? roomPreview.roomName : "")
property string roomTopic: room ? room.roomTopic : (roomPreview ? roomPreview.roomTopic : "") property string roomTopic: room ? room.roomTopic : (roomPreview ? roomPreview.roomTopic : "")
property string avatarUrl: room ? room.roomAvatarUrl : (roomPreview ? roomPreview.roomAvatarUrl : "") property string avatarUrl: room ? room.roomAvatarUrl : (roomPreview ? roomPreview.roomAvatarUrl : "")
@ -153,6 +154,7 @@ Item {
Avatar { Avatar {
url: parent.avatarUrl.replace("mxc://", "image://MxcImage/") url: parent.avatarUrl.replace("mxc://", "image://MxcImage/")
roomid: parent.roomid
displayName: parent.roomName displayName: parent.roomName
height: 130 height: 130
width: 130 width: 130

View File

@ -23,6 +23,8 @@ Rectangle {
required property int index required property int index
required property int selectedIndex required property int selectedIndex
property bool crop: true property bool crop: true
property alias roomid: avatar.roomid
property alias userid: avatar.userid
color: background color: background
height: avatarSize + 2 * Nheko.paddingMedium height: avatarSize + 2 * Nheko.paddingMedium

View File

@ -111,6 +111,7 @@ ApplicationWindow {
title: shortCode title: shortCode
subtitle: body subtitle: body
avatarUrl: url avatarUrl: url
roomid: imagePack.roomid
selectedIndex: currentImageIndex selectedIndex: currentImageIndex
crop: false crop: false

View File

@ -112,6 +112,7 @@ ApplicationWindow {
return qsTr("Globally enabled pack"); return qsTr("Globally enabled pack");
} }
selectedIndex: currentPackIndex selectedIndex: currentPackIndex
roomid: currentPack.roomid
TapHandler { TapHandler {
onSingleTapped: currentPackIndex = index onSingleTapped: currentPackIndex = index

View File

@ -35,6 +35,7 @@ Rectangle {
height: Nheko.avatarSize height: Nheko.avatarSize
url: CallManager.callPartyAvatarUrl.replace("mxc://", "image://MxcImage/") url: CallManager.callPartyAvatarUrl.replace("mxc://", "image://MxcImage/")
displayName: CallManager.callParty displayName: CallManager.callParty
userid: CallManager.callParty
onClicked: TimelineManager.openImageOverlay(room.avatarUrl(userid), room.data.eventId) onClicked: TimelineManager.openImageOverlay(room.avatarUrl(userid), room.data.eventId)
} }

View File

@ -79,6 +79,7 @@ Popup {
height: Nheko.avatarSize height: Nheko.avatarSize
url: room.roomAvatarUrl.replace("mxc://", "image://MxcImage/") url: room.roomAvatarUrl.replace("mxc://", "image://MxcImage/")
displayName: room.roomName displayName: room.roomName
roomid: room.roomid
onClicked: TimelineManager.openImageOverlay(room.avatarUrl(userid), room.data.eventId) onClicked: TimelineManager.openImageOverlay(room.avatarUrl(userid), room.data.eventId)
} }