From 13ce878b05806274d2fc51fe491c70d66832d28a Mon Sep 17 00:00:00 2001
From: "Sebastian J. Wolf" <sebastian@ygriega.de>
Date: Thu, 20 Aug 2020 20:06:59 +0200
Subject: [PATCH] Display unread message count on chat list

---
 qml/pages/OverviewPage.qml | 49 ++++++++++++++++++++++++++++++++++----
 src/chatlistmodel.cpp      |  4 ++--
 src/chatlistmodel.h        |  2 +-
 3 files changed, 47 insertions(+), 8 deletions(-)

diff --git a/qml/pages/OverviewPage.qml b/qml/pages/OverviewPage.qml
index bdb9f7f..9d92781 100644
--- a/qml/pages/OverviewPage.qml
+++ b/qml/pages/OverviewPage.qml
@@ -44,6 +44,16 @@ Page {
         }
     }
 
+    Timer {
+        id: synchronizeChangesTimer
+        interval: 60000
+        running: false
+        repeat: true
+        onTriggered: {
+            chatListModel.enableDeltaUpdates();
+        }
+    }
+
     Timer {
         id: chatListCreatedTimer
         interval: 500
@@ -51,7 +61,9 @@ Page {
         repeat: false
         onTriggered: {
             overviewPage.chatListCreated = true;
-            chatListModel.uiCreated();
+            chatListModel.enableDeltaUpdates();
+            // Sometimes delta updates are not properly displayed, enforce list redraw every minute
+            synchronizeChangesTimer.start();
         }
     }
 
@@ -232,12 +244,39 @@ Page {
                                 height: chatListContentColumn.height - Theme.paddingSmall
                                 anchors.verticalCenter: parent.verticalCenter
 
-                                ProfileThumbnail {
-                                    id: chatListPictureThumbnail
-                                    photoData: (typeof display.photo !== "undefined") ? display.photo.small : ""
-                                    replacementStringHint: chatListNameText.text
+                                Item {
+                                    id: chatListPictureItem
                                     width: parent.width
                                     height: parent.width
+
+                                    ProfileThumbnail {
+                                        id: chatListPictureThumbnail
+                                        photoData: (typeof display.photo !== "undefined") ? display.photo.small : ""
+                                        replacementStringHint: chatListNameText.text
+                                        width: parent.width
+                                        height: parent.width
+                                    }
+
+                                    Rectangle {
+                                        id: chatUnreadMessagesCountBackground
+                                        color: Theme.highlightBackgroundColor
+                                        width: Theme.fontSizeLarge
+                                        height: Theme.fontSizeLarge
+                                        anchors.right: parent.right
+                                        anchors.bottom: parent.bottom
+                                        radius: parent.width / 2
+                                        visible: display.unread_count > 0
+                                    }
+
+                                    Text {
+                                        id: chatUnreadMessagesCount
+                                        font.pixelSize: Theme.fontSizeExtraSmall
+                                        font.bold: true
+                                        color: Theme.primaryColor
+                                        anchors.centerIn: chatUnreadMessagesCountBackground
+                                        visible: chatUnreadMessagesCountBackground.visible
+                                        text: display.unread_count > 99 ? "99+" : display.unread_count
+                                    }
                                 }
                             }
 
diff --git a/src/chatlistmodel.cpp b/src/chatlistmodel.cpp
index 68bbfab..038c63a 100644
--- a/src/chatlistmodel.cpp
+++ b/src/chatlistmodel.cpp
@@ -38,9 +38,9 @@ bool ChatListModel::insertRows(int row, int count, const QModelIndex &parent)
     return true;
 }
 
-void ChatListModel::uiCreated()
+void ChatListModel::enableDeltaUpdates()
 {
-    qDebug() << "[ChatListModel] Chat list on UI created, enabling delta updates...";
+    qDebug() << "[ChatListModel] Enabling delta updates and enforcing UI redraw...";
     layoutChanged();
     this->deltaUpdates = true;
 }
diff --git a/src/chatlistmodel.h b/src/chatlistmodel.h
index 9a55741..af245f4 100644
--- a/src/chatlistmodel.h
+++ b/src/chatlistmodel.h
@@ -17,7 +17,7 @@ public:
     virtual QVariant data(const QModelIndex &index, int role) const override;
     virtual bool insertRows(int row, int count, const QModelIndex &parent = QModelIndex()) override;
 
-    Q_INVOKABLE void uiCreated();
+    Q_INVOKABLE void enableDeltaUpdates();
 
 public slots:
     void handleChatDiscovered(const QString &chatId, const QVariantMap &chatInformation);