From ef0045c9275759755a103f32e7cc8a77117d25d3 Mon Sep 17 00:00:00 2001
From: cberthet <capucine.berthet@savoirfairelinux.com>
Date: Mon, 11 Dec 2023 12:09:38 -0500
Subject: [PATCH] notification icons: new color and placement
GitLab: #1325
Change-Id: I1df248e37c89cea3007856ce4d56ea9e7c5f6b6d
---
src/app/constant/JamiTheme.qml | 1 +
.../components/SmartListItemDelegate.qml | 43 ++++++++++++-------
2 files changed, 28 insertions(+), 16 deletions(-)
diff --git a/src/app/constant/JamiTheme.qml b/src/app/constant/JamiTheme.qml
index 938f98095..2ff11e42b 100644
--- a/src/app/constant/JamiTheme.qml
+++ b/src/app/constant/JamiTheme.qml
@@ -254,6 +254,7 @@ Item {
property color previewUrlColor: darkTheme ? "#eeeeee" : "#333"
property color messageWebViewFooterButtonImageColor: darkTheme ? "#838383" : "#656565"
property color chatviewSecondaryInformationColor: "#A7A7A7"
+ property color draftIconColor: "#707070"
// ChatView Footer
property color chatViewFooterListColor: darkTheme ? blackColor : "#E5E5E5"
diff --git a/src/app/mainview/components/SmartListItemDelegate.qml b/src/app/mainview/components/SmartListItemDelegate.qml
index 53708f12f..ef54c8d36 100644
--- a/src/app/mainview/components/SmartListItemDelegate.qml
+++ b/src/app/mainview/components/SmartListItemDelegate.qml
@@ -192,11 +192,29 @@ ItemDelegate {
}
}
+ BlinkingLocationIcon {
+ isSharing: true
+ visible: showSharePositionIndicator
+ arrowTimerVisibility: locationIconTimer.showIconArrow
+ color: JamiTheme.draftIconColor
+ containerWidth: 25
+ }
+
+ BlinkingLocationIcon {
+ isSharing: false
+ visible: showSharedPositionIndicator
+ arrowTimerVisibility: locationIconTimer.showIconArrow
+ color: JamiTheme.draftIconColor
+ containerWidth: 25
+ }
+
// Draft indicator
ResponsiveImage {
visible: Draft && !root.highlighted
+ containerWidth: 20
+
source: JamiResources.round_edit_24dp_svg
- color: JamiTheme.primaryForegroundColor
+ color: JamiTheme.draftIconColor
}
// Show that a call is ongoing for groups indicator
@@ -206,20 +224,6 @@ ItemDelegate {
color: JamiTheme.primaryForegroundColor
}
- BlinkingLocationIcon {
- isSharing: true
- visible: showSharePositionIndicator
- arrowTimerVisibility: locationIconTimer.showIconArrow
- color: JamiTheme.sharePositionIndicatorColor
- }
-
- BlinkingLocationIcon {
- isSharing: false
- visible: showSharedPositionIndicator
- arrowTimerVisibility: locationIconTimer.showIconArrow
- color: JamiTheme.sharedPositionIndicatorColor
- }
-
ColumnLayout {
Layout.fillHeight: true
spacing: 2
@@ -228,6 +232,7 @@ ItemDelegate {
Text {
id: callStatusText
+ visible : text
Layout.minimumHeight: 20
Layout.alignment: Qt.AlignRight
text: InCall ? UtilsAdapter.getCallStatusStr(CallState) : ""
@@ -239,17 +244,23 @@ ItemDelegate {
// unread message count
Item {
+
Layout.preferredWidth: childrenRect.width
Layout.preferredHeight: childrenRect.height
Layout.alignment: Qt.AlignTop | Qt.AlignRight
BadgeNotifier {
- size: 20
+ size: 16
count: UnreadMessagesCount
animate: index === 0
+ radius: 3
}
}
}
+
+
+
+
Accessible.role: Accessible.Button
Accessible.name: Title === undefined? "" : Title
Accessible.description: LastInteraction === undefined? "" : LastInteraction
--
GitLab