Port most Avatar usage to new KirigamiAddons Avatar

src/qml/Panel/DirectChatDrawerHeader.qml

@@ -6,6 +6,7 @@ import QtQuick 2.15
 import QtQuick.Controls 2.15 as QQC2
 import QtQuick.Layouts 1.15
 import org.kde.kirigami 2.15 as Kirigami
+import org.kde.kirigamiaddons.labs.components 1.0 as KirigamiComponents
 
 import org.kde.neochat 1.0
 
@@ -18,43 +19,45 @@ ColumnLayout {
         Layout.fillWidth: true
         Layout.preferredHeight: Kirigami.Units.largeSpacing * 2
     }
-    Kirigami.Avatar {
+
+    QQC2.AbstractButton {
         Layout.preferredWidth: Math.round(Kirigami.Units.gridUnit * 3.5)
         Layout.preferredHeight: Math.round(Kirigami.Units.gridUnit * 3.5)
         Layout.alignment: Qt.AlignHCenter
 
-        name: room ? room.displayName : ""
-        source: room ? ("image://mxc/" +  room.avatarMediaId) : ""
-
-        Rectangle {
-            visible: room.usesEncryption
-            color: Kirigami.Theme.backgroundColor
-
-            width: Kirigami.Units.gridUnit
-            height: Kirigami.Units.gridUnit
-            anchors.bottom: parent.bottom
-            anchors.right: parent.right
-
-            radius: Math.round(width / 2)
-
-            Kirigami.Icon {
-                source: "channel-secure-symbolic"
-                anchors.fill: parent
+        onClicked: {
+            const popup = userDetailDialog.createObject(QQC2.ApplicationWindow.overlay, {
+                room: room,
+                user: room.getUser(room.directChatRemoteUser.id),
+            })
+            popup.closed.connect(() => {
+                userListItem.highlighted = false
+            })
+            if (roomDrawer.modal) {
+                roomDrawer.close()
             }
+            popup.open()
         }
-        actions.main: Kirigami.Action {
-            onTriggered: {
-                const popup = userDetailDialog.createObject(QQC2.ApplicationWindow.overlay, {
-                    room: room,
-                    user: room.getUser(room.directChatRemoteUser.id),
-                })
-                popup.closed.connect(() => {
-                    userListItem.highlighted = false
-                })
-                if (roomDrawer.modal) {
-                    roomDrawer.close()
+
+        contentItem: KirigamiComponents.Avatar {
+            name: room ? room.displayName : ""
+            source: room ? ("image://mxc/" +  room.avatarMediaId) : ""
+
+            Rectangle {
+                visible: room.usesEncryption
+                color: Kirigami.Theme.backgroundColor
+
+                width: Kirigami.Units.gridUnit
+                height: Kirigami.Units.gridUnit
+                anchors.bottom: parent.bottom
+                anchors.right: parent.right
+
+                radius: Math.round(width / 2)
+
+                Kirigami.Icon {
+                    source: "channel-secure-symbolic"
+                    anchors.fill: parent
                 }
-                popup.open()
             }
         }
     }