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()
             }
         }
     }

src/qml/Panel/GroupChatDrawerHeader.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.20 as Kirigami
+import org.kde.kirigamiaddons.labs.components 1.0 as KirigamiComponents
 
 import org.kde.neochat 1.0
 
@@ -19,9 +20,9 @@ ColumnLayout {
         Layout.leftMargin: Kirigami.Units.largeSpacing
         spacing: Kirigami.Units.largeSpacing
 
-        Kirigami.Avatar {
-            Layout.preferredWidth: Kirigami.Units.gridUnit * 3.5
-            Layout.preferredHeight: Kirigami.Units.gridUnit * 3.5
+        KirigamiComponents.Avatar {
+            Layout.preferredWidth: Kirigami.Units.iconSizes.large
+            Layout.preferredHeight: Kirigami.Units.iconSizes.large
 
             name: room ? room.displayName : ""
             source: room && room.avatarMediaId ? ("image://mxc/" +  room.avatarMediaId) : ""
@@ -47,6 +48,7 @@ ColumnLayout {
             }
         }
 
+
         ColumnLayout {
             Layout.fillWidth: true
             Layout.alignment: Qt.AlignVCenter
@@ -54,14 +56,13 @@ ColumnLayout {
 
             Kirigami.Heading {
                 Layout.fillWidth: true
-                type: Kirigami.Heading.Type.Primary
-                wrapMode: QQC2.Label.Wrap
                 text: room ? room.displayName : i18n("No name")
                 textFormat: Text.PlainText
             }
 
             Kirigami.SelectableLabel {
                 Layout.fillWidth: true
+                font: Kirigami.Theme.smallFont
                 textFormat: TextEdit.PlainText
                 text: room && room.canonicalAlias ? room.canonicalAlias : i18n("No Canonical Alias")
             }

src/qml/Panel/RoomDrawer.qml

@@ -8,6 +8,7 @@ import QtQuick.Layouts 1.15
 
 import org.kde.kirigami 2.20 as Kirigami
 import org.kde.kirigamiaddons.delegates 1.0 as Delegates
+import org.kde.kirigamiaddons.labs.components 1.0 as KirigamiComponents
 import org.kde.kitemmodels 1.0
 
 import org.kde.neochat 1.0
@@ -302,7 +303,7 @@ Kirigami.OverlayDrawer {
                         }
 
                         contentItem: RowLayout {
-                            Kirigami.Avatar {
+                            KirigamiComponents.Avatar {
                                 implicitWidth: height
                                 sourceSize {
                                     height: Kirigami.Units.gridUnit + Kirigami.Units.smallSpacing * 2.5