Skip to content
Snippets Groups Projects
Commit ef0045c9 authored by Capucine Berthet's avatar Capucine Berthet Committed by Sébastien Blin
Browse files

notification icons: new color and placement

GitLab: #1325
Change-Id: I1df248e37c89cea3007856ce4d56ea9e7c5f6b6d
parent d45f8636
No related branches found
No related tags found
No related merge requests found
......@@ -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"
......
......@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment