qml runtime optimizations
This commit is contained in:
parent
5127b8ae02
commit
c3ccaa069d
5 changed files with 152 additions and 113 deletions
|
@ -13,7 +13,7 @@ PhotoTextsListItem {
|
||||||
property url emojiBase: "../js/emoji/"
|
property url emojiBase: "../js/emoji/"
|
||||||
|
|
||||||
// chat title
|
// chat title
|
||||||
primaryText.text: title ? Emoji.emojify(title, Theme.fontSizeMedium, emojiBase) + ( display.notification_settings.mute_for > 0 ? Emoji.emojify(" 🔇", Theme.fontSizeMedium) : "" ) : qsTr("Unknown")
|
primaryText.text: title ? Emoji.emojify(title + ( display.notification_settings.mute_for > 0 ? " 🔇" : "" ), Theme.fontSizeMedium, emojiBase) : qsTr("Unknown")
|
||||||
// last user
|
// last user
|
||||||
prologSecondaryText.text: is_channel ? "" : ( last_message_sender_id ? ( last_message_sender_id !== ownUserId ? Emoji.emojify(Functions.getUserName(tdLibWrapper.getUserInformation(last_message_sender_id)), primaryText.font.pixelSize) : qsTr("You") ) : qsTr("Unknown") )
|
prologSecondaryText.text: is_channel ? "" : ( last_message_sender_id ? ( last_message_sender_id !== ownUserId ? Emoji.emojify(Functions.getUserName(tdLibWrapper.getUserInformation(last_message_sender_id)), primaryText.font.pixelSize) : qsTr("You") ) : qsTr("Unknown") )
|
||||||
// last message
|
// last message
|
||||||
|
|
|
@ -20,76 +20,97 @@ import QtQuick 2.6
|
||||||
import Sailfish.Silica 1.0
|
import Sailfish.Silica 1.0
|
||||||
import "../js/twemoji.js" as Emoji
|
import "../js/twemoji.js" as Emoji
|
||||||
import "../js/functions.js" as Functions
|
import "../js/functions.js" as Functions
|
||||||
|
import QtQml.Models 2.3
|
||||||
|
|
||||||
ListItem {
|
ListItem {
|
||||||
id: messageListItem
|
id: messageListItem
|
||||||
contentHeight: messageBackground.height + Theme.paddingMedium
|
contentHeight: messageBackground.height + Theme.paddingMedium
|
||||||
property var myMessage: display
|
property var myMessage: display
|
||||||
property var userInformation: tdLibWrapper.getUserInformation(display.sender_user_id)
|
property var userInformation: tdLibWrapper.getUserInformation(myMessage.sender_user_id)
|
||||||
property Page page: chatPage
|
property QtObject precalculatedValues: ListView.view.precalculatedValues
|
||||||
|
property color textColor: isOwnMessage ? Theme.highlightColor : Theme.primaryColor
|
||||||
|
property int textAlign: isOwnMessage ? Text.AlignRight : Text.AlignLeft
|
||||||
|
property Page page: precalculatedValues.page
|
||||||
|
|
||||||
property bool isOwnMessage: chatPage.myUserId === display.sender_user_id
|
property bool isOwnMessage: page.myUserId === myMessage.sender_user_id
|
||||||
property string extraContentComponentName: typeof display.content !== "undefined"
|
property string extraContentComponentName: typeof myMessage.content !== "undefined"
|
||||||
&& chatView.contentComponentNames.hasOwnProperty(display.content['@type']) ?
|
&& typeof chatView.contentComponentNames[myMessage.content['@type']] !== "undefined" ?
|
||||||
chatView.contentComponentNames[display.content['@type']] : ""
|
chatView.contentComponentNames[myMessage.content['@type']] : ""
|
||||||
menu: ContextMenu {
|
|
||||||
MenuItem {
|
property ObjectModel additionalContextItems: ObjectModel {}
|
||||||
onClicked: {
|
|
||||||
newMessageInReplyToRow.inReplyToMessage = display;
|
onPressAndHold: {
|
||||||
newMessageTextField.focus = true;
|
contextMenuLoader.active = true;
|
||||||
|
}
|
||||||
|
Loader {
|
||||||
|
id: contextMenuLoader
|
||||||
|
active: false
|
||||||
|
asynchronous: true
|
||||||
|
onStatusChanged: {
|
||||||
|
if(status === Loader.Ready) {
|
||||||
|
messageListItem.menu = item;
|
||||||
|
messageListItem.openMenu();
|
||||||
}
|
}
|
||||||
text: qsTr("Reply to Message")
|
|
||||||
}
|
}
|
||||||
MenuItem {
|
sourceComponent: Component {
|
||||||
onClicked: {
|
ContextMenu {
|
||||||
newMessageColumn.editMessageId = display.id;
|
Repeater {
|
||||||
newMessageTextField.text = Functions.getMessageText(display, false, false);
|
model: messageListItem.additionalContextItems
|
||||||
newMessageTextField.focus = true;
|
}
|
||||||
|
|
||||||
|
MenuItem {
|
||||||
|
onClicked: {
|
||||||
|
newMessageInReplyToRow.inReplyToMessage = myMessage;
|
||||||
|
newMessageTextField.focus = true;
|
||||||
|
}
|
||||||
|
text: qsTr("Reply to Message")
|
||||||
|
}
|
||||||
|
MenuItem {
|
||||||
|
onClicked: {
|
||||||
|
newMessageColumn.editMessageId = myMessage.id;
|
||||||
|
newMessageTextField.text = Functions.getMessageText(myMessage, false, false);
|
||||||
|
newMessageTextField.focus = true;
|
||||||
|
}
|
||||||
|
text: qsTr("Edit Message")
|
||||||
|
visible: myMessage.can_be_edited
|
||||||
|
}
|
||||||
|
MenuItem {
|
||||||
|
onClicked: {
|
||||||
|
Clipboard.text = Functions.getMessageText(myMessage, true, false);
|
||||||
|
}
|
||||||
|
text: qsTr("Copy Message to Clipboard")
|
||||||
|
}
|
||||||
|
MenuItem {
|
||||||
|
onClicked: {
|
||||||
|
var chatId = page.chatInformation.id;
|
||||||
|
var messageId = myMessage.id;
|
||||||
|
Remorse.itemAction(messageListItem, qsTr("Message deleted"), function() { tdLibWrapper.deleteMessages(chatId, [ messageId]); })
|
||||||
|
}
|
||||||
|
text: qsTr("Delete Message")
|
||||||
|
visible: myMessage.can_be_deleted_for_all_users || (myMessage.can_be_deleted_only_for_self && myMessage.chat_id === page.myUserId)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
text: qsTr("Edit Message")
|
|
||||||
visible: display.can_be_edited
|
|
||||||
}
|
|
||||||
MenuItem {
|
|
||||||
onClicked: {
|
|
||||||
Clipboard.text = Functions.getMessageText(display, true, false);
|
|
||||||
}
|
|
||||||
text: qsTr("Copy Message to Clipboard")
|
|
||||||
}
|
|
||||||
MenuItem {
|
|
||||||
onClicked: {
|
|
||||||
var chatId = chatInformation.id;
|
|
||||||
var messageId = display.id;
|
|
||||||
Remorse.itemAction(messageListItem, qsTr("Message deleted"), function() { tdLibWrapper.deleteMessages(chatId, [ messageId]); })
|
|
||||||
}
|
|
||||||
text: qsTr("Delete Message")
|
|
||||||
visible: display.can_be_deleted_for_all_users || (display.can_be_deleted_only_for_self && display.chat_id === chatPage.myUserId)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Connections {
|
Connections {
|
||||||
target: chatModel
|
target: chatModel
|
||||||
onUnreadCountUpdated: {
|
onUnreadCountUpdated: {
|
||||||
messageBackground.color = index > ( chatView.count - unreadCount - 1 ) ? Theme.secondaryHighlightColor : Theme.secondaryColor;
|
messageBackground.isUnread = index > ( chatView.count - unreadCount - 1 );
|
||||||
messageBackground.opacity = index > ( chatView.count - unreadCount - 1 ) ? 0.5 : 0.2;
|
|
||||||
}
|
}
|
||||||
onNewMessageReceived: {
|
onNewMessageReceived: {
|
||||||
messageBackground.color = index > ( chatView.count - chatInformation.unreadCount - 1 ) ? Theme.secondaryHighlightColor : Theme.secondaryColor;
|
messageBackground.isUnread = index > ( chatView.count - page.chatInformation.unread_count - 1 );
|
||||||
messageBackground.opacity = index > ( chatView.count - chatInformation.unreadCount - 1 ) ? 0.5 : 0.2;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
onLastReadSentMessageUpdated: {
|
onLastReadSentMessageUpdated: {
|
||||||
console.log("[ChatModel] Messages in this chat were read, new last read: " + lastReadSentIndex + ", updating description for index " + index + ", status: " + (index <= lastReadSentIndex));
|
console.log("[ChatModel] Messages in this chat were read, new last read: " + lastReadSentIndex + ", updating description for index " + index + ", status: " + (index <= lastReadSentIndex));
|
||||||
messageDateText.text = getMessageStatusText(display, index, lastReadSentIndex, messageDateText.useElapsed);
|
messageDateText.text = getMessageStatusText(myMessage, index, lastReadSentIndex, messageDateText.useElapsed);
|
||||||
}
|
}
|
||||||
onMessageUpdated: {
|
onMessageUpdated: {
|
||||||
if (index === modelIndex) {
|
if (index === modelIndex) {
|
||||||
console.log("[ChatModel] This message was updated, index " + index + ", updating content...");
|
console.log("[ChatModel] This message was updated, index " + index + ", updating content...");
|
||||||
messageDateText.text = getMessageStatusText(display, index, chatView.lastReadSentIndex, messageDateText.useElapsed);
|
messageDateText.text = getMessageStatusText(myMessage, index, chatView.lastReadSentIndex, messageDateText.useElapsed);
|
||||||
messageText.text = Emoji.emojify(Functions.getMessageText(display, false, messageListItem.isOwnMessage), messageText.font.pixelSize);
|
messageText.text = Emoji.emojify(Functions.getMessageText(myMessage, false, messageListItem.isOwnMessage), messageText.font.pixelSize);
|
||||||
if(locationPreviewLoader.active && locationPreviewLoader.status === Loader.Ready) {
|
|
||||||
locationPreviewLoader.item.locationData = display.content.location;
|
|
||||||
locationPreviewLoader.item.updatePicture()
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -97,15 +118,18 @@ ListItem {
|
||||||
Connections {
|
Connections {
|
||||||
target: tdLibWrapper
|
target: tdLibWrapper
|
||||||
onReceivedMessage: {
|
onReceivedMessage: {
|
||||||
if (messageId === display.reply_to_message_id.toString()) {
|
if (messageId === myMessage.reply_to_message_id.toString()) {
|
||||||
messageInReplyToRow.inReplyToMessage = message;
|
messageInReplyToLoader.inReplyToMessage = message;
|
||||||
messageInReplyToRow.visible = true;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Component.onCompleted: {
|
Component.onCompleted: {
|
||||||
delegateComponentLoadingTimer.start();
|
delegateComponentLoadingTimer.start();
|
||||||
|
|
||||||
|
if (myMessage.reply_to_message_id !== 0) {
|
||||||
|
tdLibWrapper.getMessage(page.chatInformation.id, myMessage.reply_to_message_id);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Timer {
|
Timer {
|
||||||
|
@ -114,7 +138,7 @@ ListItem {
|
||||||
repeat: false
|
repeat: false
|
||||||
running: false
|
running: false
|
||||||
onTriggered: {
|
onTriggered: {
|
||||||
if (typeof display.content !== "undefined") {
|
if (typeof myMessage.content !== "undefined") {
|
||||||
if (messageListItem.extraContentComponentName !== "") {
|
if (messageListItem.extraContentComponentName !== "") {
|
||||||
extraContentLoader.setSource(
|
extraContentLoader.setSource(
|
||||||
"../components/" +messageListItem.extraContentComponentName +".qml",
|
"../components/" +messageListItem.extraContentComponentName +".qml",
|
||||||
|
@ -122,7 +146,7 @@ ListItem {
|
||||||
messageListItem: messageListItem
|
messageListItem: messageListItem
|
||||||
})
|
})
|
||||||
} else {
|
} else {
|
||||||
if (typeof display.content.web_page !== "undefined") { // only in messageText
|
if (typeof myMessage.content.web_page !== "undefined") { // only in messageText
|
||||||
webPagePreviewLoader.active = true;
|
webPagePreviewLoader.active = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -133,16 +157,15 @@ ListItem {
|
||||||
Row {
|
Row {
|
||||||
id: messageTextRow
|
id: messageTextRow
|
||||||
spacing: Theme.paddingSmall
|
spacing: Theme.paddingSmall
|
||||||
width: parent.width - ( 2 * Theme.horizontalPageMargin )
|
width: precalculatedValues.entryWidth
|
||||||
anchors.horizontalCenter: parent.horizontalCenter
|
anchors.centerIn: parent
|
||||||
anchors.verticalCenter: parent.verticalCenter
|
|
||||||
|
|
||||||
Loader {
|
Loader {
|
||||||
id: profileThumbnailLoader
|
id: profileThumbnailLoader
|
||||||
active: (( chatPage.isBasicGroup || chatPage.isSuperGroup ) && !chatPage.isChannel)
|
active: precalculatedValues.showUserInfo
|
||||||
asynchronous: true
|
asynchronous: true
|
||||||
width: active ? Theme.itemSizeSmall : 0
|
width: precalculatedValues.profileThumbnailDimensions
|
||||||
height: active ? Theme.itemSizeSmall : 0
|
height: width
|
||||||
anchors.bottom: parent.bottom
|
anchors.bottom: parent.bottom
|
||||||
anchors.bottomMargin: Theme.paddingSmall
|
anchors.bottomMargin: Theme.paddingSmall
|
||||||
sourceComponent: Component {
|
sourceComponent: Component {
|
||||||
|
@ -150,9 +173,9 @@ ListItem {
|
||||||
id: messagePictureThumbnail
|
id: messagePictureThumbnail
|
||||||
photoData: (typeof messageListItem.userInformation.profile_photo !== "undefined") ? messageListItem.userInformation.profile_photo.small : ""
|
photoData: (typeof messageListItem.userInformation.profile_photo !== "undefined") ? messageListItem.userInformation.profile_photo.small : ""
|
||||||
replacementStringHint: userText.text
|
replacementStringHint: userText.text
|
||||||
width: visible ? Theme.itemSizeSmall : 0
|
width: Theme.itemSizeSmall
|
||||||
height: visible ? Theme.itemSizeSmall : 0
|
height: Theme.itemSizeSmall
|
||||||
visible: ( chatPage.isBasicGroup || chatPage.isSuperGroup ) && !chatPage.isChannel
|
visible: precalculatedValues.showUserInfo
|
||||||
MouseArea {
|
MouseArea {
|
||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
onClicked: {
|
onClicked: {
|
||||||
|
@ -166,24 +189,23 @@ ListItem {
|
||||||
Item {
|
Item {
|
||||||
id: messageTextItem
|
id: messageTextItem
|
||||||
|
|
||||||
width: parent.width - profileThumbnailLoader.width - Theme.paddingSmall
|
width: precalculatedValues.textItemWidth
|
||||||
height: messageBackground.height
|
height: messageBackground.height
|
||||||
|
|
||||||
Rectangle {
|
Rectangle {
|
||||||
id: messageBackground
|
id: messageBackground
|
||||||
anchors {
|
anchors {
|
||||||
left: parent.left
|
left: parent.left
|
||||||
leftMargin: messageListItem.isOwnMessage ? 2 * Theme.horizontalPageMargin : 0
|
leftMargin: messageListItem.isOwnMessage ? precalculatedValues.pageMarginDouble : 0
|
||||||
right: parent.right
|
|
||||||
rightMargin: messageListItem.isOwnMessage ? 0 : 2 * Theme.horizontalPageMargin
|
|
||||||
verticalCenter: parent.verticalCenter
|
verticalCenter: parent.verticalCenter
|
||||||
}
|
}
|
||||||
height: messageTextColumn.height + ( 2 * Theme.paddingMedium )
|
height: messageTextColumn.height + precalculatedValues.paddingMediumDouble
|
||||||
|
width: precalculatedValues.backgroundWidth
|
||||||
color: index > ( chatView.count - chatInformation.unread_count - 1 ) ? Theme.secondaryHighlightColor : Theme.secondaryColor
|
property bool isUnread: index > ( chatView.count - page.chatInformation.unread_count - 1 )
|
||||||
|
color: isUnread ? Theme.secondaryHighlightColor : Theme.secondaryColor
|
||||||
radius: parent.width / 50
|
radius: parent.width / 50
|
||||||
opacity: index > ( chatView.count - chatInformation.unread_count - 1 ) ? 0.5 : 0.2
|
opacity: isUnread ? 0.5 : 0.2
|
||||||
visible: appSettings.showStickersAsImages || display.content['@type'] !== "messageSticker"
|
visible: appSettings.showStickersAsImages || myMessage.content['@type'] !== "messageSticker"
|
||||||
Behavior on color { ColorAnimation { duration: 200 } }
|
Behavior on color { ColorAnimation { duration: 200 } }
|
||||||
Behavior on opacity { FadeAnimation {} }
|
Behavior on opacity { FadeAnimation {} }
|
||||||
}
|
}
|
||||||
|
@ -193,29 +215,23 @@ ListItem {
|
||||||
|
|
||||||
spacing: Theme.paddingSmall
|
spacing: Theme.paddingSmall
|
||||||
|
|
||||||
width: messageBackground.width - Theme.horizontalPageMargin
|
width: precalculatedValues.textColumnWidth
|
||||||
anchors.centerIn: messageBackground
|
anchors.centerIn: messageBackground
|
||||||
|
|
||||||
Component.onCompleted: {
|
|
||||||
if (display.reply_to_message_id !== 0) {
|
|
||||||
tdLibWrapper.getMessage(chatInformation.id, display.reply_to_message_id);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
Text {
|
Text {
|
||||||
id: userText
|
id: userText
|
||||||
|
|
||||||
width: parent.width
|
width: parent.width
|
||||||
text: !messageListItem.isOwnMessage ? Emoji.emojify(Functions.getUserName(messageListItem.userInformation), font.pixelSize) : qsTr("You")
|
text: messageListItem.isOwnMessage ? qsTr("You") : Emoji.emojify(Functions.getUserName(messageListItem.userInformation), font.pixelSize)
|
||||||
font.pixelSize: Theme.fontSizeExtraSmall
|
font.pixelSize: Theme.fontSizeExtraSmall
|
||||||
font.weight: Font.ExtraBold
|
font.weight: Font.ExtraBold
|
||||||
color: messageListItem.isOwnMessage ? Theme.highlightColor : Theme.primaryColor
|
color: messageListItem.textColor
|
||||||
maximumLineCount: 1
|
maximumLineCount: 1
|
||||||
elide: Text.ElideRight
|
elide: Text.ElideRight
|
||||||
textFormat: Text.StyledText
|
textFormat: Text.StyledText
|
||||||
horizontalAlignment: messageListItem.isOwnMessage ? Text.AlignRight : Text.AlignLeft
|
horizontalAlignment: messageListItem.textAlign
|
||||||
visible: ( chatPage.isBasicGroup || chatPage.isSuperGroup ) && !chatPage.isChannel
|
visible: precalculatedValues.showUserInfo
|
||||||
MouseArea {
|
MouseArea {
|
||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
onClicked: {
|
onClicked: {
|
||||||
|
@ -224,18 +240,29 @@ ListItem {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
InReplyToRow {
|
Loader {
|
||||||
id: messageInReplyToRow
|
id: messageInReplyToLoader
|
||||||
myUserId: chatPage.myUserId
|
active: myMessage.reply_to_message_id !== 0
|
||||||
visible: false
|
width: parent.width
|
||||||
|
// text height ~= 1,28*font.pixelSize
|
||||||
|
height: active ? precalculatedValues.messageInReplyToHeight : 0
|
||||||
|
property var inReplyToMessage;
|
||||||
|
sourceComponent: Component {
|
||||||
|
InReplyToRow {
|
||||||
|
id: messageInReplyToRow
|
||||||
|
myUserId: page.myUserId
|
||||||
|
visible: true
|
||||||
|
inReplyToMessage: messageInReplyToLoader.inReplyToMessage
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Loader {
|
Loader {
|
||||||
id: forwardedInformationLoader
|
id: forwardedInformationLoader
|
||||||
active: typeof display.forward_info !== "undefined"
|
active: typeof myMessage.forward_info !== "undefined"
|
||||||
asynchronous: true
|
asynchronous: true
|
||||||
width: parent.width
|
width: parent.width
|
||||||
// height: active ? ( item ? item.height : Theme.itemSizeExtraSmall ) : 0
|
height: active ? ( item ? item.height : Theme.itemSizeExtraSmall ) : 0
|
||||||
sourceComponent: Component {
|
sourceComponent: Component {
|
||||||
Row {
|
Row {
|
||||||
id: forwardedMessageInformationRow
|
id: forwardedMessageInformationRow
|
||||||
|
@ -243,17 +270,17 @@ ListItem {
|
||||||
width: parent.width
|
width: parent.width
|
||||||
|
|
||||||
Component.onCompleted: {
|
Component.onCompleted: {
|
||||||
if (display.forward_info.origin["@type"] === "messageForwardOriginChannel") {
|
if (myMessage.forward_info.origin["@type"] === "messageForwardOriginChannel") {
|
||||||
var otherChatInformation = tdLibWrapper.getChat(display.forward_info.origin.chat_id);
|
var otherChatInformation = tdLibWrapper.getChat(myMessage.forward_info.origin.chat_id);
|
||||||
forwardedThumbnail.photoData = (typeof otherChatInformation.photo !== "undefined") ? otherChatInformation.photo.small : "";
|
forwardedThumbnail.photoData = (typeof otherChatInformation.photo !== "undefined") ? otherChatInformation.photo.small : "";
|
||||||
forwardedChannelText.text = Emoji.emojify(otherChatInformation.title, Theme.fontSizeExtraSmall);
|
forwardedChannelText.text = Emoji.emojify(otherChatInformation.title, Theme.fontSizeExtraSmall);
|
||||||
} else if (display.forward_info.origin["@type"] === "messageForwardOriginUser") {
|
} else if (myMessage.forward_info.origin["@type"] === "messageForwardOriginUser") {
|
||||||
var otherUserInformation = tdLibWrapper.getUserInformation(display.forward_info.origin.sender_user_id);
|
var otherUserInformation = tdLibWrapper.getUserInformation(myMessage.forward_info.origin.sender_user_id);
|
||||||
forwardedThumbnail.photoData = (typeof otherUserInformation.profile_photo !== "undefined") ? otherUserInformation.profile_photo.small : "";
|
forwardedThumbnail.photoData = (typeof otherUserInformation.profile_photo !== "undefined") ? otherUserInformation.profile_photo.small : "";
|
||||||
forwardedChannelText.text = Emoji.emojify(Functions.getUserName(otherUserInformation), Theme.fontSizeExtraSmall);
|
forwardedChannelText.text = Emoji.emojify(Functions.getUserName(otherUserInformation), Theme.fontSizeExtraSmall);
|
||||||
} else {
|
} else {
|
||||||
forwardedThumbnail.photoData = "";
|
forwardedThumbnail.photoData = "";
|
||||||
forwardedChannelText.text = Emoji.emojify(display.forward_info.origin.sender_user_name, Theme.fontSizeExtraSmall);
|
forwardedChannelText.text = Emoji.emojify(myMessage.forward_info.origin.sender_user_name, Theme.fontSizeExtraSmall);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -310,15 +337,15 @@ ListItem {
|
||||||
Text {
|
Text {
|
||||||
id: messageText
|
id: messageText
|
||||||
width: parent.width
|
width: parent.width
|
||||||
text: Emoji.emojify(Functions.getMessageText(display, false, messageListItem.isOwnMessage), font.pixelSize)
|
text: Emoji.emojify(Functions.getMessageText(myMessage, false, messageListItem.isOwnMessage), font.pixelSize)
|
||||||
font.pixelSize: Theme.fontSizeSmall
|
font.pixelSize: Theme.fontSizeSmall
|
||||||
color: messageListItem.isOwnMessage ? Theme.highlightColor : Theme.primaryColor
|
color: messageListItem.textColor
|
||||||
wrapMode: Text.Wrap
|
wrapMode: Text.Wrap
|
||||||
textFormat: Text.StyledText
|
textFormat: Text.StyledText
|
||||||
onLinkActivated: {
|
onLinkActivated: {
|
||||||
Functions.handleLink(link);
|
Functions.handleLink(link);
|
||||||
}
|
}
|
||||||
horizontalAlignment: messageListItem.isOwnMessage ? Text.AlignRight : Text.AlignLeft
|
horizontalAlignment: messageListItem.textAlign
|
||||||
linkColor: Theme.highlightColor
|
linkColor: Theme.highlightColor
|
||||||
visible: (text !== "")
|
visible: (text !== "")
|
||||||
}
|
}
|
||||||
|
@ -328,7 +355,7 @@ ListItem {
|
||||||
active: false
|
active: false
|
||||||
asynchronous: true
|
asynchronous: true
|
||||||
width: parent.width
|
width: parent.width
|
||||||
height: typeof display.content.web_page !== "undefined" ? ( (parent.width * 2 / 3) + (6 * Theme.fontSizeExtraSmall) + ( 7 * Theme.paddingSmall) ) : 0
|
height: typeof myMessage.content.web_page !== "undefined" ? precalculatedValues.webPagePreviewHeight : 0
|
||||||
|
|
||||||
sourceComponent: Component {
|
sourceComponent: Component {
|
||||||
id: webPagePreviewComponent
|
id: webPagePreviewComponent
|
||||||
|
@ -339,7 +366,7 @@ ListItem {
|
||||||
webPagePreviewLoader.height = webPagePreview.implicitHeight;
|
webPagePreviewLoader.height = webPagePreview.implicitHeight;
|
||||||
}
|
}
|
||||||
|
|
||||||
webPageData: display.content.web_page
|
webPageData: myMessage.content.web_page
|
||||||
width: parent.width
|
width: parent.width
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -348,8 +375,7 @@ ListItem {
|
||||||
id: extraContentLoader
|
id: extraContentLoader
|
||||||
width: parent.width
|
width: parent.width
|
||||||
asynchronous: true
|
asynchronous: true
|
||||||
property int heightPreset: messageListItem.extraContentComponentName !== "" ? chatView.getContentComponentHeight(messageListItem.extraContentComponentName, display.content, width) : 0
|
height: item ? item.height : (messageListItem.extraContentComponentName !== "" ? chatView.getContentComponentHeight(messageListItem.extraContentComponentName, myMessage.content, width) : 0)
|
||||||
height: item ? item.height : heightPreset
|
|
||||||
}
|
}
|
||||||
|
|
||||||
Timer {
|
Timer {
|
||||||
|
@ -358,7 +384,7 @@ ListItem {
|
||||||
running: true
|
running: true
|
||||||
repeat: true
|
repeat: true
|
||||||
onTriggered: {
|
onTriggered: {
|
||||||
messageDateText.text = getMessageStatusText(display, index, chatView.lastReadSentIndex, messageDateText.useElapsed);
|
messageDateText.text = getMessageStatusText(myMessage, index, chatView.lastReadSentIndex, messageDateText.useElapsed);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -371,13 +397,13 @@ ListItem {
|
||||||
id: messageDateText
|
id: messageDateText
|
||||||
font.pixelSize: Theme.fontSizeTiny
|
font.pixelSize: Theme.fontSizeTiny
|
||||||
color: messageListItem.isOwnMessage ? Theme.secondaryHighlightColor : Theme.secondaryColor
|
color: messageListItem.isOwnMessage ? Theme.secondaryHighlightColor : Theme.secondaryColor
|
||||||
horizontalAlignment: messageListItem.isOwnMessage ? Text.AlignRight : Text.AlignLeft
|
horizontalAlignment: messageListItem.textAlign
|
||||||
text: getMessageStatusText(display, index, chatView.lastReadSentIndex, messageDateText.useElapsed)
|
text: getMessageStatusText(myMessage, index, chatView.lastReadSentIndex, messageDateText.useElapsed)
|
||||||
MouseArea {
|
MouseArea {
|
||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
onClicked: {
|
onClicked: {
|
||||||
messageDateText.useElapsed = !messageDateText.useElapsed;
|
messageDateText.useElapsed = !messageDateText.useElapsed;
|
||||||
messageDateText.text = getMessageStatusText(display, index, chatView.lastReadSentIndex, messageDateText.useElapsed);
|
messageDateText.text = getMessageStatusText(myMessage, index, chatView.lastReadSentIndex, messageDateText.useElapsed);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -288,9 +288,9 @@ Item {
|
||||||
|
|
||||||
Component.onCompleted: {
|
Component.onCompleted: {
|
||||||
opacity = 1;
|
opacity = 1;
|
||||||
if(messageListItem && messageListItem.menu ) { // workaround to add menu entries
|
if(messageListItem && messageListItem.additionalContextItems ) {
|
||||||
closePollMenuItemComponent.createObject(messageListItem.menu._contentColumn);
|
messageListItem.additionalContextItems.append(closePollMenuItemComponent.createObject());
|
||||||
resetAnswerMenuItemComponent.createObject(messageListItem.menu._contentColumn);
|
messageListItem.additionalContextItems.append(resetAnswerMenuItemComponent.createObject());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -124,6 +124,8 @@ Column {
|
||||||
height: parent.height - Theme.paddingSmall
|
height: parent.height - Theme.paddingSmall
|
||||||
anchors.centerIn: parent
|
anchors.centerIn: parent
|
||||||
|
|
||||||
|
sourceSize.width: width
|
||||||
|
sourceSize.height: height
|
||||||
fillMode: Image.PreserveAspectCrop
|
fillMode: Image.PreserveAspectCrop
|
||||||
autoTransform: true
|
autoTransform: true
|
||||||
asynchronous: true
|
asynchronous: true
|
||||||
|
|
|
@ -531,13 +531,23 @@ Page {
|
||||||
clip: true
|
clip: true
|
||||||
highlightMoveDuration: 0
|
highlightMoveDuration: 0
|
||||||
highlightResizeDuration: 0
|
highlightResizeDuration: 0
|
||||||
highlightRangeMode: ListView.ApplyRange
|
|
||||||
preferredHighlightBegin: 0
|
|
||||||
preferredHighlightEnd: height
|
|
||||||
highlight: Component {Item { } }
|
|
||||||
property int lastReadSentIndex: 0
|
property int lastReadSentIndex: 0
|
||||||
property bool inCooldown: false
|
property bool inCooldown: false
|
||||||
property bool manuallyScrolledToBottom
|
property bool manuallyScrolledToBottom
|
||||||
|
property QtObject precalculatedValues: QtObject {
|
||||||
|
property alias page: chatPage
|
||||||
|
property bool showUserInfo: page.isBasicGroup || ( page.isSuperGroup && !page.isChannel)
|
||||||
|
property int profileThumbnailDimensions: showUserInfo ? Theme.itemSizeSmall : 0
|
||||||
|
property int pageMarginDouble: 2 * Theme.horizontalPageMargin
|
||||||
|
property int paddingMediumDouble: 2 * Theme.paddingMedium
|
||||||
|
property int entryWidth: chatView.width - pageMarginDouble
|
||||||
|
property int textItemWidth: entryWidth - profileThumbnailDimensions - Theme.paddingSmall
|
||||||
|
property int backgroundWidth: textItemWidth - pageMarginDouble
|
||||||
|
property int backgroundRadius: textItemWidth/50
|
||||||
|
property int textColumnWidth: backgroundWidth - Theme.horizontalPageMargin
|
||||||
|
property int messageInReplyToHeight: Theme.fontSizeExtraSmall * 2.571428571 + Theme.paddingSmall;
|
||||||
|
property int webPagePreviewHeight: ( (textColumnWidth * 2 / 3) + (6 * Theme.fontSizeExtraSmall) + ( 7 * Theme.paddingSmall) )
|
||||||
|
}
|
||||||
|
|
||||||
function handleScrollPositionChanged() {
|
function handleScrollPositionChanged() {
|
||||||
console.log("Current position: " + chatView.contentY);
|
console.log("Current position: " + chatView.contentY);
|
||||||
|
@ -552,7 +562,8 @@ Page {
|
||||||
|
|
||||||
function scrollToIndex(index) {
|
function scrollToIndex(index) {
|
||||||
if(index > 0 && index < chatView.count) {
|
if(index > 0 && index < chatView.count) {
|
||||||
currentIndex = index;
|
positionViewAtIndex(index, ListView.Contain)
|
||||||
|
// currentIndex = index;
|
||||||
if(index === chatView.count - 1) {
|
if(index === chatView.count - 1) {
|
||||||
manuallyScrolledToBottom = true;
|
manuallyScrolledToBottom = true;
|
||||||
}
|
}
|
||||||
|
@ -616,7 +627,9 @@ Page {
|
||||||
width: chatView.width
|
width: chatView.width
|
||||||
Component {
|
Component {
|
||||||
id: messageListViewItemComponent
|
id: messageListViewItemComponent
|
||||||
MessageListViewItem {}
|
MessageListViewItem {
|
||||||
|
precalculatedValues: chatView.precalculatedValues
|
||||||
|
}
|
||||||
}
|
}
|
||||||
Component {
|
Component {
|
||||||
id: messageListViewItemSimpleComponent
|
id: messageListViewItemSimpleComponent
|
||||||
|
@ -663,8 +676,6 @@ Page {
|
||||||
anchors.rightMargin: Theme.paddingMedium
|
anchors.rightMargin: Theme.paddingMedium
|
||||||
anchors.bottom: parent.bottom
|
anchors.bottom: parent.bottom
|
||||||
anchors.bottomMargin: Theme.paddingMedium
|
anchors.bottomMargin: Theme.paddingMedium
|
||||||
opacity: viewMessageTimer.running ? 0.5 : 1.0
|
|
||||||
Behavior on opacity { FadeAnimation {} }
|
|
||||||
Rectangle {
|
Rectangle {
|
||||||
id: chatUnreadMessagesCountBackground
|
id: chatUnreadMessagesCountBackground
|
||||||
color: Theme.highlightBackgroundColor
|
color: Theme.highlightBackgroundColor
|
||||||
|
|
Loading…
Reference in a new issue