From 15078260b4b8e46421274be415b4474ae7ef5a02 Mon Sep 17 00:00:00 2001
From: Claudio Cambra <claudio.cambra@gmail.com>
Date: Thu, 14 Apr 2022 00:27:43 +0200
Subject: [PATCH] Removed spacing between activies, labels now centre-aligned

Signed-off-by: Claudio Cambra <claudio.cambra@gmail.com>
---
 src/gui/tray/ActivityItemContent.qml | 8 ++++++--
 src/gui/tray/ActivityList.qml        | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/gui/tray/ActivityItemContent.qml b/src/gui/tray/ActivityItemContent.qml
index d716d76eb..640fa3876 100644
--- a/src/gui/tray/ActivityItemContent.qml
+++ b/src/gui/tray/ActivityItemContent.qml
@@ -95,13 +95,14 @@ RowLayout {
         Label {
             id: activityTextTitle
             text: (root.activityData.type === "Activity" || root.activityData.type === "Notification") ? root.activityData.subject : root.activityData.message
+            height: (text === "") ? 0 : implicitHeight
             width: parent.width
             elide: Text.ElideRight
             wrapMode: Text.Wrap
             maximumLineCount: 2
             font.pixelSize: Style.topLinePixelSize
             color: Style.ncTextColor
-            //color: root.activityData.activityTextTitleColor
+            visible: text !== ""
         }
 
         Label {
@@ -117,6 +118,7 @@ RowLayout {
             maximumLineCount: 2
             font.pixelSize: Style.subLinePixelSize
             color: Style.ncTextColor
+            visible: text !== ""
         }
 
         Label {
@@ -129,18 +131,20 @@ RowLayout {
             maximumLineCount: 2
             font.pixelSize: Style.subLinePixelSize
             color: Style.ncSecondaryTextColor
+            visible: text !== ""
         }
 
         Label {
             id: talkReplyMessageSent
             text: root.activityData.messageSent
-            height: implicitHeight
+            height: (text === "") ? 0 : implicitHeight
             width: parent.width
             elide: Text.ElideRight
             wrapMode: Text.Wrap
             maximumLineCount: 2
             font.pixelSize: Style.topLinePixelSize
             color: Style.ncSecondaryTextColor
+            visible: text !== ""
         }
 
         Loader {
diff --git a/src/gui/tray/ActivityList.qml b/src/gui/tray/ActivityList.qml
index fe66267f9..acfb1bbdc 100644
--- a/src/gui/tray/ActivityList.qml
+++ b/src/gui/tray/ActivityList.qml
@@ -31,7 +31,7 @@ ScrollView {
 
         clip: true
 
-        spacing: 10
+        spacing: 0
 
         delegate: ActivityItem {
             isFileActivityList: controlRoot.isFileActivityList
-- 
2.30.2