diff --git a/src/app/commoncomponents/CallMessageDelegate.qml b/src/app/commoncomponents/CallMessageDelegate.qml
index 46af5de2db130374346169d5056dde9729fc5ea4..423b7c851fcd4e271198f9722c5b7401a0af6edb 100644
--- a/src/app/commoncomponents/CallMessageDelegate.qml
+++ b/src/app/commoncomponents/CallMessageDelegate.qml
@@ -28,7 +28,7 @@ SBSMessageBase {
component JoinCallButton: PushButton {
visible: root.isActive
toolTipText: JamiStrings.joinCall
- preferredSize: 40
+ preferredSize: visible ? 40 : 0
imageColor: callLabel.color
normalColor: "transparent"
hoveredColor: Qt.rgba(255, 255, 255, 0.2)
diff --git a/src/app/commoncomponents/ContactMessageDelegate.qml b/src/app/commoncomponents/ContactMessageDelegate.qml
index 464171f3b0847fd0d6720600b68ee32cdfed1774..7026a7413aad372bac5318771a717c39e5e5678b 100644
--- a/src/app/commoncomponents/ContactMessageDelegate.qml
+++ b/src/app/commoncomponents/ContactMessageDelegate.qml
@@ -30,17 +30,16 @@ Column {
property int timestamp: Timestamp
property string formattedTime: MessagesAdapter.getFormattedTime(Timestamp)
property string formattedDay: MessagesAdapter.getFormattedDay(Timestamp)
- property int seq: MsgSeq.single//a changer par textlabel
+ property int seq: MsgSeq.single
property alias messageToSend: textLabel.text
width: ListView.view ? ListView.view.width : 0
- spacing: 2
- topPadding: 12
- bottomPadding: 12
+ spacing: 0
ColumnLayout {
anchors.horizontalCenter: parent.horizontalCenter
width: parent.width
+ spacing: 0
TimestampInfo {
id: timestampItem
@@ -52,43 +51,16 @@ Column {
Layout.alignment: Qt.AlignHCenter
}
- Rectangle {
- id: msg
+ Label {
+ id: textLabel
- width: childrenRect.width
- height: JamiTheme.contactMessageAvatarSize + 12
- radius: JamiTheme.contactMessageAvatarSize / 2 + 6
Layout.alignment: Qt.AlignCenter
- color: "transparent"
- border.width: 1
- border.color: CurrentConversation.isCoreDialog ? JamiTheme.messageInBgColor : CurrentConversation.color
-
- RowLayout {
- anchors.verticalCenter: parent.verticalCenter
-
- Avatar {
- Layout.leftMargin: 6
- width: JamiTheme.contactMessageAvatarSize
- height: JamiTheme.contactMessageAvatarSize
- visible: ActionUri !== ""
- imageId: ActionUri !== CurrentAccount.uri ? ActionUri : CurrentAccount.id
- showPresenceIndicator: false
- mode: ActionUri !== CurrentAccount.uri ? Avatar.Mode.Contact : Avatar.Mode.Account
- }
-
- Label {
- id: textLabel
-
- Layout.rightMargin: 6
- width: parent.width
- text: Body
- horizontalAlignment: Qt.AlignHCenter
- font.pointSize: JamiTheme.contactEventPointSize
- font.bold: true
- color: JamiTheme.chatviewTextColor
- textFormat: TextEdit.PlainText
- }
- }
+ width: parent.width
+ text: Body
+ horizontalAlignment: Qt.AlignHCenter
+ font.pointSize: JamiTheme.smallFontSize
+ color: JamiTheme.chatviewSecondaryInformationColor
+ textFormat: TextEdit.PlainText
}
}
opacity: 0
diff --git a/src/app/commoncomponents/GeneratedMessageDelegate.qml b/src/app/commoncomponents/GeneratedMessageDelegate.qml
index 82937d94244f513db793bdf1c6f1543c59df418b..92a20966e368aea9f9f934644b3569284a69f934 100644
--- a/src/app/commoncomponents/GeneratedMessageDelegate.qml
+++ b/src/app/commoncomponents/GeneratedMessageDelegate.qml
@@ -40,6 +40,7 @@ Column {
ColumnLayout {
width: parent.width
+ spacing: 0
TimestampInfo {
id: timestampItem
diff --git a/src/app/commoncomponents/SBSMessageBase.qml b/src/app/commoncomponents/SBSMessageBase.qml
index d806d40a767af484f84f5e2f4fed6a903a139e40..5a83596aeade198e2063a445b4fc21901ee13ceb 100644
--- a/src/app/commoncomponents/SBSMessageBase.qml
+++ b/src/app/commoncomponents/SBSMessageBase.qml
@@ -90,7 +90,7 @@ Control {
id: usernameblock
Layout.preferredHeight: (seq === MsgSeq.first || seq === MsgSeq.single) ? 10 : 0
visible: !isReply
- Layout.topMargin: (seq === MsgSeq.first || seq === MsgSeq.single) && !isOutgoing ? 20 : 0
+ Layout.topMargin: (seq === MsgSeq.first || seq === MsgSeq.single) && !isOutgoing && !root.showTime ? 20 : 0
Label {
id: username
@@ -98,7 +98,7 @@ Control {
font.bold: true
visible: (seq === MsgSeq.first || seq === MsgSeq.single) && !isOutgoing
font.pointSize: JamiTheme.smallFontSize
- color: JamiTheme.chatviewUsernameColor
+ color: JamiTheme.chatviewSecondaryInformationColor
lineHeight: JamiTheme.usernameBlockLineHeight
leftPadding: JamiTheme.usernameBlockPadding
textFormat: TextEdit.PlainText
@@ -115,7 +115,7 @@ Control {
Layout.fillWidth: true
Layout.preferredHeight: childrenRect.height
- Layout.topMargin: JamiTheme.sbsMessageBaseReplyTopMargin
+ Layout.topMargin: visible? JamiTheme.sbsMessageBaseReplyTopMargin : 0
Layout.leftMargin: isOutgoing ? undefined : JamiTheme.sbsMessageBaseReplyMargin
Layout.rightMargin: !isOutgoing ? undefined : JamiTheme.sbsMessageBaseReplyMargin
diff --git a/src/app/commoncomponents/TimestampInfo.qml b/src/app/commoncomponents/TimestampInfo.qml
index 17c28b1a08137f1c00df8f657450ab73bd794160..cc56fc50fef638a84ec01b06c2aacf540876b4e8 100644
--- a/src/app/commoncomponents/TimestampInfo.qml
+++ b/src/app/commoncomponents/TimestampInfo.qml
@@ -49,8 +49,7 @@ ColumnLayout {
Layout.preferredHeight: childrenRect.height
Layout.fillWidth: true
- Layout.topMargin: JamiTheme.dayTimestampTopMargin
- Layout.bottomMargin: formattedTimeLabel.visible ? 0 : JamiTheme.dayTimestampBottomMargin
+ Layout.topMargin: 30
Rectangle {
id: line
@@ -95,12 +94,12 @@ ColumnLayout {
id: formattedTimeLabel
text: formattedTime
- Layout.bottomMargin: JamiTheme.timestampBottomMargin
- Layout.topMargin: JamiTheme.timestampTopMargin
+ Layout.topMargin: 30
+ Layout.bottomMargin: 30
Layout.alignment: Qt.AlignHCenter | Qt.AlignBottom
color: JamiTheme.timestampColor
visible: showTime || showDay
Layout.preferredHeight: visible * implicitHeight
- font.pointSize: JamiTheme.timestampFont
+ font.pointSize: JamiTheme.smallFontSize
}
}
diff --git a/src/app/constant/JamiTheme.qml b/src/app/constant/JamiTheme.qml
index 9932952f18089ce2ec530fee79062f1e2802634d..af9b10101604a6b74b462a7e3c0a24c365423577 100644
--- a/src/app/constant/JamiTheme.qml
+++ b/src/app/constant/JamiTheme.qml
@@ -229,7 +229,7 @@ Item {
property color previewCardContainerColor: darkTheme ? blackColor : whiteColor
property color previewUrlColor: darkTheme ? "#eeeeee" : "#333"
property color messageWebViewFooterButtonImageColor: darkTheme ? "#838383" : "#656565"
- property color chatviewUsernameColor: "#A7A7A7"
+ property color chatviewSecondaryInformationColor: "#A7A7A7"
// ChatView Footer
property color chatViewFooterListColor: darkTheme ? blackColor : "#E5E5E5"
@@ -387,10 +387,6 @@ Item {
// TimestampInfo
property int timestampLinePadding: 40
- property int dayTimestampTopMargin: 8
- property int dayTimestampBottomMargin: 8
- property int timestampBottomMargin: 16
- property int timestampTopMargin: 16
property int dayTimestampHPadding: 16
property real dayTimestampVPadding: 32
property real timestampFont: calcSize(12)
diff --git a/src/app/mainview/components/MessagesResearchView.qml b/src/app/mainview/components/MessagesResearchView.qml
index 20e5cf383c770fed24f9d3c5a653712880d093aa..36f13ac23f2b75f7d03dc6617f1116ee93bce2f9 100644
--- a/src/app/mainview/components/MessagesResearchView.qml
+++ b/src/app/mainview/components/MessagesResearchView.qml
@@ -105,7 +105,7 @@ ListView {
Layout.rightMargin: 10
Layout.leftMargin: 10
font.pixelSize: 0
- color: JamiTheme.chatviewUsernameColor
+ color: JamiTheme.chatviewSecondaryInformationColor
font.bold: true
}
@@ -145,7 +145,7 @@ ListView {
id: buttonJumpText
text: JamiStrings.jumpTo
- color: buttonJumpTo.hovered ? JamiTheme.blueLinkColor : JamiTheme.chatviewUsernameColor
+ color: buttonJumpTo.hovered ? JamiTheme.blueLinkColor : JamiTheme.chatviewSecondaryInformationColor
font.underline: buttonJumpTo.hovered
anchors.centerIn: parent
font.pointSize: JamiTheme.jumpToFontSize