From 723105382d3e03f2bdfde56e9e5e7cde0d5a9ded Mon Sep 17 00:00:00 2001 From: Denis Fedoseev Date: Sun, 9 Jul 2023 15:16:06 +0300 Subject: [PATCH 1/4] remove own id from messages title --- qml/components/ChatListViewItem.qml | 1 + qml/components/MessageListViewItem.qml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/qml/components/ChatListViewItem.qml b/qml/components/ChatListViewItem.qml index 8df67f8..72fa0e7 100644 --- a/qml/components/ChatListViewItem.qml +++ b/qml/components/ChatListViewItem.qml @@ -19,6 +19,7 @@ PhotoTextsListItem { primaryText.text: title ? Emoji.emojify(title, Theme.fontSizeMedium) : qsTr("Unknown") // last user prologSecondaryText.text: showDraft ? ""+qsTr("Draft")+"" : (is_channel ? "" : ( last_message_sender_id ? ( last_message_sender_id !== ownUserId ? Emoji.emojify(Functions.getUserName(tdLibWrapper.getUserInformation(last_message_sender_id)), Theme.fontSizeExtraSmall) : qsTr("You") ) : "" )) +// prologSecondaryText.text: showDraft ? ""+qsTr("Draft")+"" : (is_channel ? "" : ( last_message_sender_id ? ( last_message_sender_id !== ownUserId ? Emoji.emojify(Functions.getUserName(tdLibWrapper.getUserInformation(last_message_sender_id)), Theme.fontSizeExtraSmall) : "" ) : "" )) // last message secondaryText.text: previewText ? Emoji.emojify(Functions.enhanceHtmlEntities(previewText), Theme.fontSizeExtraSmall) : "" + qsTr("No message in this chat.") + "" // message date diff --git a/qml/components/MessageListViewItem.qml b/qml/components/MessageListViewItem.qml index 98f6c59..c185a5d 100644 --- a/qml/components/MessageListViewItem.qml +++ b/qml/components/MessageListViewItem.qml @@ -398,7 +398,7 @@ ListItem { truncationMode: TruncationMode.Fade textFormat: Text.StyledText horizontalAlignment: messageListItem.textAlign - visible: precalculatedValues.showUserInfo || myMessage['@type'] === "sponsoredMessage" + visible: messageListItem.isOwnMessage ? false : (precalculatedValues.showUserInfo || myMessage['@type'] === "sponsoredMessage") MouseArea { anchors.fill: parent enabled: !(messageListItem.precalculatedValues.pageIsSelecting || messageListItem.isAnonymous) From 0d26167ee3303aa6b87bbc3ee55fa334a156c4d2 Mon Sep 17 00:00:00 2001 From: Denis Fedoseev Date: Mon, 10 Jul 2023 01:29:00 +0300 Subject: [PATCH 2/4] remove left margin on own messages --- qml/components/ChatListViewItem.qml | 1 - qml/components/MessageListViewItem.qml | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qml/components/ChatListViewItem.qml b/qml/components/ChatListViewItem.qml index 72fa0e7..8df67f8 100644 --- a/qml/components/ChatListViewItem.qml +++ b/qml/components/ChatListViewItem.qml @@ -19,7 +19,6 @@ PhotoTextsListItem { primaryText.text: title ? Emoji.emojify(title, Theme.fontSizeMedium) : qsTr("Unknown") // last user prologSecondaryText.text: showDraft ? ""+qsTr("Draft")+"" : (is_channel ? "" : ( last_message_sender_id ? ( last_message_sender_id !== ownUserId ? Emoji.emojify(Functions.getUserName(tdLibWrapper.getUserInformation(last_message_sender_id)), Theme.fontSizeExtraSmall) : qsTr("You") ) : "" )) -// prologSecondaryText.text: showDraft ? ""+qsTr("Draft")+"" : (is_channel ? "" : ( last_message_sender_id ? ( last_message_sender_id !== ownUserId ? Emoji.emojify(Functions.getUserName(tdLibWrapper.getUserInformation(last_message_sender_id)), Theme.fontSizeExtraSmall) : "" ) : "" )) // last message secondaryText.text: previewText ? Emoji.emojify(Functions.enhanceHtmlEntities(previewText), Theme.fontSizeExtraSmall) : "" + qsTr("No message in this chat.") + "" // message date diff --git a/qml/components/MessageListViewItem.qml b/qml/components/MessageListViewItem.qml index c185a5d..9a0c86a 100644 --- a/qml/components/MessageListViewItem.qml +++ b/qml/components/MessageListViewItem.qml @@ -363,7 +363,8 @@ ListItem { anchors { left: parent.left - leftMargin: messageListItem.isOwnMessage ? precalculatedValues.pageMarginDouble : 0 +// leftMargin: messageListItem.isOwnMessage ? precalculatedValues.pageMarginDouble : 0 + leftMargin: 0 verticalCenter: parent.verticalCenter } height: messageTextColumn.height + precalculatedValues.paddingMediumDouble From 22930628aeb0ec648606978502e5d6f722c12b1b Mon Sep 17 00:00:00 2001 From: Denis Fedoseev Date: Wed, 12 Jul 2023 01:12:53 +0300 Subject: [PATCH 3/4] wide message without left margin --- qml/components/MessageListViewItem.qml | 5 +++-- qml/pages/ChatPage.qml | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/qml/components/MessageListViewItem.qml b/qml/components/MessageListViewItem.qml index 9a0c86a..b2f62af 100644 --- a/qml/components/MessageListViewItem.qml +++ b/qml/components/MessageListViewItem.qml @@ -363,14 +363,15 @@ ListItem { anchors { left: parent.left -// leftMargin: messageListItem.isOwnMessage ? precalculatedValues.pageMarginDouble : 0 leftMargin: 0 +// leftMargin: messageListItem.isOwnMessage ? precalculatedValues.pageMarginDouble : 0 +// leftMargin: precalculatedValues.showUserInfo ? (messageListItem.isOwnMessage ? precalculatedValues.pageMarginDouble : 0) : 0 verticalCenter: parent.verticalCenter } height: messageTextColumn.height + precalculatedValues.paddingMediumDouble width: precalculatedValues.backgroundWidth property bool isUnread: index > chatModel.getLastReadMessageIndex() && myMessage['@type'] !== "sponsoredMessage" - color: Theme.colorScheme === Theme.LightOnDark ? (isUnread ? Theme.secondaryHighlightColor : Theme.secondaryColor) : (isUnread ? Theme.backgroundGlowColor : Theme.overlayBackgroundColor) + color: Theme.colorScheme === Theme.LightOnDark ? (isOwnMessage ? Theme.highlightBackgroundColor : (isUnread ? Theme.secondaryHighlightColor : Theme.secondaryColor)) : (isOwnMessage ? Theme.highlightBackgroundColor : (isUnread ? Theme.backgroundGlowColor : Theme.overlayBackgroundColor)) radius: parent.width / 50 opacity: isUnread ? 0.5 : 0.2 visible: appSettings.showStickersAsImages || (myMessage.content['@type'] !== "messageSticker" && myMessage.content['@type'] !== "messageAnimatedEmoji") diff --git a/qml/pages/ChatPage.qml b/qml/pages/ChatPage.qml index acfec79..3f2c720 100644 --- a/qml/pages/ChatPage.qml +++ b/qml/pages/ChatPage.qml @@ -1170,9 +1170,10 @@ Page { readonly property int profileThumbnailDimensions: showUserInfo ? Theme.itemSizeSmall : 0 readonly property int pageMarginDouble: 2 * Theme.horizontalPageMargin readonly property int paddingMediumDouble: 2 * Theme.paddingMedium - readonly property int entryWidth: chatView.width - pageMarginDouble + readonly property int entryWidth: chatView.width - pageMarginDouble //ширина полной строки сообщения вместе с аватаркой readonly property int textItemWidth: entryWidth - profileThumbnailDimensions - Theme.paddingSmall - readonly property int backgroundWidth: page.isChannel ? textItemWidth : textItemWidth - pageMarginDouble +// readonly property int backgroundWidth: page.isChannel ? textItemWidth : textItemWidth - pageMarginDouble //ширина бэкграунда для канала/обычного чата + readonly property int backgroundWidth: textItemWidth //ширина бэкграунда для канала/обычного чата readonly property int backgroundRadius: textItemWidth/50 readonly property int textColumnWidth: backgroundWidth - Theme.horizontalPageMargin readonly property int messageInReplyToHeight: Theme.fontSizeExtraSmall * 2.571428571 + Theme.paddingSmall; From 656e8ccfe735ada2c3ef368a164cfa1640b16c39 Mon Sep 17 00:00:00 2001 From: Denis Fedoseev Date: Wed, 12 Jul 2023 01:27:18 +0300 Subject: [PATCH 4/4] left margin for own messages in private chats --- qml/components/MessageListViewItem.qml | 4 +--- qml/pages/ChatPage.qml | 3 +-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/qml/components/MessageListViewItem.qml b/qml/components/MessageListViewItem.qml index b2f62af..7ff49e9 100644 --- a/qml/components/MessageListViewItem.qml +++ b/qml/components/MessageListViewItem.qml @@ -363,9 +363,7 @@ ListItem { anchors { left: parent.left - leftMargin: 0 -// leftMargin: messageListItem.isOwnMessage ? precalculatedValues.pageMarginDouble : 0 -// leftMargin: precalculatedValues.showUserInfo ? (messageListItem.isOwnMessage ? precalculatedValues.pageMarginDouble : 0) : 0 + leftMargin: page.isPrivateChat ? (messageListItem.isOwnMessage ? precalculatedValues.pageMarginDouble : 0) : 0 //левый марджин для собственных сообщений в приватных чатах. В остальных на полную ширину verticalCenter: parent.verticalCenter } height: messageTextColumn.height + precalculatedValues.paddingMediumDouble diff --git a/qml/pages/ChatPage.qml b/qml/pages/ChatPage.qml index 3f2c720..b8310b3 100644 --- a/qml/pages/ChatPage.qml +++ b/qml/pages/ChatPage.qml @@ -1172,8 +1172,7 @@ Page { readonly property int paddingMediumDouble: 2 * Theme.paddingMedium readonly property int entryWidth: chatView.width - pageMarginDouble //ширина полной строки сообщения вместе с аватаркой readonly property int textItemWidth: entryWidth - profileThumbnailDimensions - Theme.paddingSmall -// readonly property int backgroundWidth: page.isChannel ? textItemWidth : textItemWidth - pageMarginDouble //ширина бэкграунда для канала/обычного чата - readonly property int backgroundWidth: textItemWidth //ширина бэкграунда для канала/обычного чата + readonly property int backgroundWidth: page.isPrivateChat ? textItemWidth - pageMarginDouble : textItemWidth //уменьшенная ширина сообщений для приватных чатов readonly property int backgroundRadius: textItemWidth/50 readonly property int textColumnWidth: backgroundWidth - Theme.horizontalPageMargin readonly property int messageInReplyToHeight: Theme.fontSizeExtraSmall * 2.571428571 + Theme.paddingSmall;