From c89e617850480b4949adbc33e07cb1b2293aa3a9 Mon Sep 17 00:00:00 2001
From: link2xt <link2xt@testrun.org>
Date: Sun, 16 May 2021 14:52:41 +0300
Subject: Redo chatlist items based on AbstractListItem

BasicListItem is not flexible enough to style avatars properly.

Now all avatars are of the same size.
---
 qml/ChatlistPage.qml | 100 +++++++++++++++++++++++++++++++--------------------
 1 file changed, 62 insertions(+), 38 deletions(-)

(limited to 'qml')

diff --git a/qml/ChatlistPage.qml b/qml/ChatlistPage.qml
index a6c3795..31c74a2 100644
--- a/qml/ChatlistPage.qml
+++ b/qml/ChatlistPage.qml
@@ -122,52 +122,76 @@ Kirigami.ScrollablePage {
             }
         }
 
-        delegate: Kirigami.BasicListItem {
+        delegate: Kirigami.AbstractListItem {
             width: chatlist.width
 
-            label: chatlistPage.context.getChat(model.chatId).getName()
-            subtitle: model.username
-
-            leading: Kirigami.Avatar {
-                source: model.avatarSource
-                name: model.chatName
-                implicitWidth: height
-                color: chatlistPage.context.getChat(model.chatId).getColor()
-                MouseArea {
-                    anchors.fill: parent
-                    acceptedButtons: Qt.RightButton
-                    onClicked: {
-                        if (mouse.button === Qt.RightButton)
-                            contextMenu.popup()
+            RowLayout {
+                Kirigami.Avatar {
+                    source: model.avatarSource
+                    name: model.chatName
+                    color: chatlistPage.context.getChat(model.chatId).getColor()
+                    MouseArea {
+                        anchors.fill: parent
+                        acceptedButtons: Qt.RightButton
+                        onClicked: {
+                            if (mouse.button === Qt.RightButton)
+                                contextMenu.popup()
+                        }
+
+                        Menu {
+                            id: contextMenu
+
+                            Action {
+                                text: "Pin chat"
+                                onTriggered: chatlistPage.context.setChatVisibility(model.chatId, 2)
+                            }
+                            Action {
+                                text: "Unpin chat"
+                                onTriggered: chatlistPage.context.setChatVisibility(model.chatId, 0)
+                            }
+                            Action {
+                                text: "Archive chat"
+                                onTriggered: chatlistPage.context.setChatVisibility(model.chatId, 1)
+                            }
+                            Action {
+                                text: "Delete chat"
+                                onTriggered: chatlistPage.context.deleteChat(model.chatId)
+                            }
+                        }
                     }
+                }
 
-                    Menu {
-                        id: contextMenu
+                ColumnLayout {
+                    Layout.fillWidth: true
 
-                        Action {
-                            text: "Pin chat"
-                            onTriggered: chatlistPage.context.setChatVisibility(model.chatId, 2)
-                        }
-                        Action {
-                            text: "Unpin chat"
-                            onTriggered: chatlistPage.context.setChatVisibility(model.chatId, 0)
-                        }
-                        Action {
-                            text: "Archive chat"
-                            onTriggered: chatlistPage.context.setChatVisibility(model.chatId, 1)
-                        }
-                        Action {
-                            text: "Delete chat"
-                            onTriggered: chatlistPage.context.deleteChat(model.chatId)
-                        }
+                    Label {
+                        text: chatlistPage.context.getChat(model.chatId).getName()
+                        font.weight: Font.Bold
+                        Layout.fillWidth: true
+                    }
+                    Label {
+                        text: model.username
+                        font: Kirigami.Theme.smallFont
+                        Layout.fillWidth: true
                     }
                 }
-            }
 
-            trailing: Label {
-                text: model.freshMsgCnt
-                visible: model.freshMsgCnt > 0
-                verticalAlignment: Text.AlignVCenter
+                Label {
+                    text: model.freshMsgCnt
+                    visible: model.freshMsgCnt > 0
+
+                    // Align label in the center of a badge.
+                    verticalAlignment: Text.AlignVCenter
+                    horizontalAlignment: Text.AlignHCenter
+
+                    // Make sure badge is not too narrow.
+                    Layout.minimumWidth: height
+
+                    background: Rectangle {
+                        color: Kirigami.Theme.alternateBackgroundColor
+                        radius: 0.25 * height
+                    }
+                }
             }
         }
     }
-- 
cgit v1.2.3-70-g09d2