2020-10-23 11:29:50 +03:00
|
|
|
/*
|
|
|
|
Copyright (C) 2020 Sebastian J. Wolf and other contributors
|
|
|
|
|
|
|
|
This file is part of Fernschreiber.
|
|
|
|
|
|
|
|
Fernschreiber is free software: you can redistribute it and/or modify
|
|
|
|
it under the terms of the GNU General Public License as published by
|
|
|
|
the Free Software Foundation, either version 3 of the License, or
|
|
|
|
(at your option) any later version.
|
|
|
|
|
|
|
|
Fernschreiber is distributed in the hope that it will be useful,
|
|
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
GNU General Public License for more details.
|
|
|
|
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
|
|
along with Fernschreiber. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
*/
|
|
|
|
|
2020-10-31 22:49:03 +03:00
|
|
|
import QtQuick 2.6
|
2020-10-23 11:29:50 +03:00
|
|
|
import Sailfish.Silica 1.0
|
2020-12-05 20:31:34 +03:00
|
|
|
import WerkWolf.Fernschreiber 1.0
|
2020-10-23 11:29:50 +03:00
|
|
|
|
|
|
|
import "../js/functions.js" as Functions
|
|
|
|
import "../js/twemoji.js" as Emoji
|
|
|
|
|
|
|
|
Item {
|
|
|
|
id: pollMessageComponent
|
|
|
|
|
Reduce ChatPage.qml jit compile time
First of all: Take all measurements I mention with a grain of salt – all of them are rough and not necessarily measured more than a few times. All times were measured on an Xperia X run via SDK.
Visiting a chat page can take a long time, especially before the qml is cached by the engine.
When opening it for the first time after application launch, it sometimes takes >1000ms from onClicked (OverviewPage) to Component.OnCompleted (Chatpage).
Subsequent activations take roughly 470-480ms.
With these changes, I was able to reduce these times to ~450ms for the first, ~100ms for subsequent activations of the ChatPage on my test device.
Things changed:
- The components for displaying extra content to a message are (mostly) gone and replaced by a single Loader. This Loader does not use sourceComponent to trade the initial compilation boost for a neglegible bit of runtime penalty.
- Connections were consolidated
- I was surprised how costly the inclusion of the RemorseItem was (compiling ~75ms, initializing up to ~20ms for every delegate). So I traded a bit for a compromise. deleteMessageRemorseItem is now defined on the appWindow level, where it gets a bit mitigated by the animations at application start. Also, only one deletion at a time is now possible. We can easily revert this change, but I thought it worthwhile despite its drawbacks.
- profileThumbnailComponent is now defined directly as sourceComponent, removing the need for its id. Probably didn't do anything.
- InReplyToRow had width: parent.width, so I removed horizontalCenter. Also probably didn't change compilation time at all.
- Another compromise I was willing to take – your opinion may differ: The PickerPages took ages (~200ms) to just parse/compile inside those Components, so I replaced them with the "string notation" of pageStack.push. Drawback: The first time a picker gets activated, you'll see how slow it is. Subsequent activations aren't that bad – also for the other pickers.
2020-10-30 22:36:32 +03:00
|
|
|
property ListItem messageListItem
|
2020-11-17 20:18:22 +03:00
|
|
|
property MessageOverlayFlickable overlayFlickable
|
2020-12-05 21:00:11 +03:00
|
|
|
readonly property var rawMessage: messageListItem ? messageListItem.myMessage : overlayFlickable.overlayMessage
|
|
|
|
readonly property string chatId: rawMessage.chat_id
|
|
|
|
readonly property bool isOwnMessage: messageListItem ? messageListItem.isOwnMessage : overlayFlickable.isOwnMessage
|
|
|
|
readonly property string messageId: rawMessage.id
|
|
|
|
readonly property bool canEdit: rawMessage.can_be_edited
|
|
|
|
readonly property var pollData: rawMessage.content.poll
|
2020-10-23 11:29:50 +03:00
|
|
|
property var chosenPollData:({})
|
|
|
|
property var chosenIndexes: []
|
2020-12-05 21:00:11 +03:00
|
|
|
readonly property bool hasAnswered: {
|
2020-10-23 11:29:50 +03:00
|
|
|
return pollData.options.filter(function(option){
|
|
|
|
return option.is_chosen
|
|
|
|
}).length > 0;
|
|
|
|
}
|
2020-12-05 21:00:11 +03:00
|
|
|
readonly property bool canAnswer: !hasAnswered && !pollData.is_closed
|
|
|
|
readonly property bool isQuiz: pollData.type['@type'] === "pollTypeQuiz"
|
2020-12-05 06:14:51 +03:00
|
|
|
property bool highlighted
|
Reduce ChatPage.qml jit compile time
First of all: Take all measurements I mention with a grain of salt – all of them are rough and not necessarily measured more than a few times. All times were measured on an Xperia X run via SDK.
Visiting a chat page can take a long time, especially before the qml is cached by the engine.
When opening it for the first time after application launch, it sometimes takes >1000ms from onClicked (OverviewPage) to Component.OnCompleted (Chatpage).
Subsequent activations take roughly 470-480ms.
With these changes, I was able to reduce these times to ~450ms for the first, ~100ms for subsequent activations of the ChatPage on my test device.
Things changed:
- The components for displaying extra content to a message are (mostly) gone and replaced by a single Loader. This Loader does not use sourceComponent to trade the initial compilation boost for a neglegible bit of runtime penalty.
- Connections were consolidated
- I was surprised how costly the inclusion of the RemorseItem was (compiling ~75ms, initializing up to ~20ms for every delegate). So I traded a bit for a compromise. deleteMessageRemorseItem is now defined on the appWindow level, where it gets a bit mitigated by the animations at application start. Also, only one deletion at a time is now possible. We can easily revert this change, but I thought it worthwhile despite its drawbacks.
- profileThumbnailComponent is now defined directly as sourceComponent, removing the need for its id. Probably didn't do anything.
- InReplyToRow had width: parent.width, so I removed horizontalCenter. Also probably didn't change compilation time at all.
- Another compromise I was willing to take – your opinion may differ: The PickerPages took ages (~200ms) to just parse/compile inside those Components, so I replaced them with the "string notation" of pageStack.push. Drawback: The first time a picker gets activated, you'll see how slow it is. Subsequent activations aren't that bad – also for the other pickers.
2020-10-30 22:36:32 +03:00
|
|
|
width: parent.width
|
2020-10-23 11:29:50 +03:00
|
|
|
height: pollColumn.height
|
2020-12-05 20:31:34 +03:00
|
|
|
property list<NamedAction> extraContextMenuItems: [
|
|
|
|
NamedAction {
|
|
|
|
visible: !pollData.is_closed && pollMessageComponent.canEdit
|
|
|
|
name: qsTr("Close Poll")
|
|
|
|
action: function () { tdLibWrapper.stopPoll(pollMessageComponent.chatId, pollMessageComponent.messageId) }
|
|
|
|
},
|
|
|
|
NamedAction {
|
|
|
|
visible: !pollData.is_closed && !pollMessageComponent.isQuiz && pollMessageComponent.hasAnswered
|
|
|
|
name: qsTr("Reset Answer")
|
|
|
|
action: function () { pollMessageComponent.resetChosen() }
|
|
|
|
}
|
|
|
|
]
|
|
|
|
|
2020-10-23 11:29:50 +03:00
|
|
|
function handleChoose(index) {
|
|
|
|
if(!pollData.type.allow_multiple_answers) {
|
|
|
|
chosenIndexes = [index];
|
|
|
|
sendResponse();
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
var indexes = chosenIndexes;
|
|
|
|
var found = indexes.indexOf(index);
|
|
|
|
if(found > -1) { // uncheck
|
|
|
|
indexes.splice(found, 1);
|
|
|
|
} else {
|
|
|
|
indexes.push(index)
|
|
|
|
}
|
|
|
|
chosenIndexes = indexes;
|
|
|
|
}
|
|
|
|
function resetChosen() {
|
|
|
|
chosenIndexes = [];
|
|
|
|
sendResponse();
|
|
|
|
}
|
|
|
|
function sendResponse() {
|
|
|
|
tdLibWrapper.setPollAnswer(chatId, messageId, chosenIndexes);
|
|
|
|
}
|
|
|
|
|
|
|
|
Column {
|
|
|
|
id: pollColumn
|
|
|
|
width: parent.width
|
|
|
|
spacing: Theme.paddingSmall
|
2020-12-05 06:14:51 +03:00
|
|
|
|
2020-10-23 11:29:50 +03:00
|
|
|
Label {
|
|
|
|
font.pixelSize: Theme.fontSizeSmall
|
|
|
|
width: parent.width
|
|
|
|
visible: text !== ""
|
|
|
|
text: Emoji.emojify(pollData.question, Theme.fontSizeSmall)
|
|
|
|
wrapMode: Text.WrapAtWordBoundaryOrAnywhere
|
2020-10-30 00:39:43 +03:00
|
|
|
textFormat: Text.StyledText
|
2020-12-05 00:47:03 +03:00
|
|
|
color: pollMessageComponent.isOwnMessage || pollMessageComponent.highlighted ? Theme.highlightColor : Theme.primaryColor
|
2020-10-23 11:29:50 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
Label {
|
|
|
|
font.pixelSize: Theme.fontSizeTiny
|
|
|
|
width: parent.width
|
|
|
|
visible: text !== ""
|
|
|
|
text: pollData.is_closed ? qsTr("Final Result:") : (pollData.type.allow_multiple_answers ? qsTr("Multiple Answers are allowed.") : "")
|
|
|
|
wrapMode: Text.WrapAtWordBoundaryOrAnywhere
|
2020-12-05 00:47:03 +03:00
|
|
|
color: pollMessageComponent.isOwnMessage || pollMessageComponent.highlighted ? Theme.secondaryHighlightColor : Theme.secondaryColor
|
2020-10-23 11:29:50 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
Item {
|
|
|
|
visible: !pollMessageComponent.canAnswer
|
2020-12-05 06:14:51 +03:00
|
|
|
width: 1
|
2020-10-23 11:29:50 +03:00
|
|
|
height: Theme.paddingSmall
|
|
|
|
}
|
|
|
|
|
|
|
|
Component {
|
|
|
|
id: canAnswerDelegate
|
|
|
|
TextSwitch {
|
|
|
|
id: optionDelegate
|
|
|
|
width: pollMessageComponent.width
|
|
|
|
automaticCheck: false
|
2020-11-22 01:56:03 +03:00
|
|
|
text: Emoji.emojify(modelData.text, Theme.fontSizeMedium)
|
2020-10-23 11:29:50 +03:00
|
|
|
checked: pollMessageComponent.chosenIndexes.indexOf(index) > -1
|
2020-12-05 00:47:03 +03:00
|
|
|
highlighted: pollMessageComponent.highlighted || down
|
2020-10-23 11:29:50 +03:00
|
|
|
onClicked: {
|
|
|
|
pollMessageComponent.handleChoose(index);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2020-12-05 06:14:51 +03:00
|
|
|
|
2020-10-23 11:29:50 +03:00
|
|
|
Component {
|
|
|
|
id: resultDelegate
|
2020-12-05 06:14:51 +03:00
|
|
|
Row {
|
2020-10-23 11:29:50 +03:00
|
|
|
id: optionDelegate
|
2020-12-05 06:14:51 +03:00
|
|
|
height: Math.max(Theme.itemSizeExtraSmall, implicitHeight)
|
2020-10-23 11:29:50 +03:00
|
|
|
|
2020-12-05 06:14:51 +03:00
|
|
|
Item {
|
2020-10-23 11:29:50 +03:00
|
|
|
height: parent.height
|
|
|
|
width: Theme.horizontalPageMargin/2
|
2020-12-05 06:14:51 +03:00
|
|
|
anchors.bottom: parent.bottom
|
|
|
|
|
|
|
|
Rectangle {
|
|
|
|
id: displayOptionChosenMarker
|
|
|
|
anchors.fill: parent
|
|
|
|
color: Theme.rgba(Theme.highlightBackgroundColor, Theme.highlightBackgroundOpacity)
|
|
|
|
visible: modelData.is_chosen
|
|
|
|
}
|
|
|
|
|
|
|
|
OpacityRampEffect {
|
|
|
|
sourceItem: displayOptionChosenMarker
|
|
|
|
direction: OpacityRamp.LeftToRight
|
|
|
|
}
|
2020-10-23 11:29:50 +03:00
|
|
|
}
|
|
|
|
|
2020-12-05 06:14:51 +03:00
|
|
|
Item {
|
|
|
|
width: Theme.paddingMedium + (pollMessageComponent.isQuiz ? Theme.iconSizeSmall : 0)
|
|
|
|
height: correctAnswerIcon.height
|
2020-10-23 11:29:50 +03:00
|
|
|
anchors {
|
2020-12-05 06:14:51 +03:00
|
|
|
bottom: parent.bottom
|
|
|
|
bottomMargin: (votePercentageBar.height - height)/2
|
2020-10-23 11:29:50 +03:00
|
|
|
}
|
|
|
|
Icon {
|
2020-12-05 06:14:51 +03:00
|
|
|
id: correctAnswerIcon
|
|
|
|
anchors.bottom: parent.bottom
|
2020-12-05 00:47:03 +03:00
|
|
|
highlighted: pollMessageComponent.isOwnMessage || pollMessageComponent.highlighted
|
2020-12-05 06:14:51 +03:00
|
|
|
readonly property bool isRight: pollMessageComponent.isQuiz && pollData.type.correct_option_id === index
|
2020-10-23 11:29:50 +03:00
|
|
|
source: "image://theme/icon-s-accept"
|
|
|
|
visible: isRight
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-12-05 06:14:51 +03:00
|
|
|
Column {
|
|
|
|
width: list.width - x
|
|
|
|
anchors.bottom: parent.bottom
|
2020-10-23 11:29:50 +03:00
|
|
|
|
2020-12-05 06:14:51 +03:00
|
|
|
Item {
|
|
|
|
width: parent.width
|
|
|
|
height: Math.max(voteTextLabel.height, votePercentageLabel.y + votePercentageLabel.height)
|
|
|
|
|
|
|
|
Label {
|
|
|
|
id: voteTextLabel
|
|
|
|
property int lastLineWidth
|
|
|
|
width: parent.width
|
|
|
|
text: Emoji.emojify(modelData.text, Theme.fontSizeMedium)
|
|
|
|
textFormat: Text.StyledText
|
|
|
|
wrapMode: Text.WrapAtWordBoundaryOrAnywhere
|
|
|
|
color: pollMessageComponent.isOwnMessage || pollMessageComponent.highlighted ? Theme.highlightColor : Theme.primaryColor
|
|
|
|
onTextChanged: lastLineWidth = 0
|
|
|
|
onLineLaidOut: {
|
|
|
|
if (line.isLast) {
|
|
|
|
lastLineWidth = line.x + line.implicitWidth
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2020-10-23 11:29:50 +03:00
|
|
|
|
2020-12-05 06:14:51 +03:00
|
|
|
Label {
|
|
|
|
id: votePercentageLabel
|
|
|
|
y: (voteTextLabel.lastLineWidth + Theme.paddingLarge) > x ? voteTextLabel.height : Math.max(0, voteTextLabel.height - height)
|
|
|
|
font.pixelSize: Theme.fontSizeTiny
|
|
|
|
text: qsTr("%Ln\%", "% of votes for option", modelData.vote_percentage)
|
|
|
|
horizontalAlignment: Text.AlignRight
|
|
|
|
anchors.right: parent.right
|
|
|
|
color: pollMessageComponent.isOwnMessage || pollMessageComponent.highlighted ? Theme.secondaryHighlightColor : Theme.secondaryColor
|
2020-10-23 11:29:50 +03:00
|
|
|
}
|
|
|
|
}
|
2020-12-05 06:14:51 +03:00
|
|
|
|
2020-10-23 11:29:50 +03:00
|
|
|
Rectangle {
|
2020-12-05 06:14:51 +03:00
|
|
|
id: votePercentageBar
|
2020-10-23 11:29:50 +03:00
|
|
|
height: Theme.paddingSmall
|
|
|
|
width: parent.width
|
2020-12-05 00:47:03 +03:00
|
|
|
color: Theme.rgba(pollMessageComponent.isOwnMessage || pollMessageComponent.highlighted ? Theme.secondaryHighlightColor : Theme.secondaryColor, 0.3)
|
2020-10-23 11:29:50 +03:00
|
|
|
radius: height/2
|
|
|
|
Rectangle {
|
|
|
|
height: parent.height
|
2020-12-05 00:47:03 +03:00
|
|
|
color: pollMessageComponent.isOwnMessage || pollMessageComponent.highlighted ? Theme.highlightColor : Theme.primaryColor
|
2020-10-23 11:29:50 +03:00
|
|
|
radius: height/2
|
|
|
|
width: parent.width * modelData.vote_percentage * 0.01
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-12-05 06:14:51 +03:00
|
|
|
ListView {
|
|
|
|
id: list
|
2020-10-23 11:29:50 +03:00
|
|
|
model: pollData.options
|
2020-12-05 06:14:51 +03:00
|
|
|
x: -Theme.horizontalPageMargin/2
|
|
|
|
width: parent.width - x
|
|
|
|
height: contentHeight
|
|
|
|
interactive: false
|
2020-10-23 11:29:50 +03:00
|
|
|
delegate: pollMessageComponent.canAnswer ? canAnswerDelegate : resultDelegate
|
|
|
|
}
|
|
|
|
|
2020-12-05 06:14:51 +03:00
|
|
|
Item {
|
|
|
|
width: 1
|
|
|
|
height: Theme.paddingSmall
|
|
|
|
}
|
2020-10-23 11:29:50 +03:00
|
|
|
|
2020-12-05 06:14:51 +03:00
|
|
|
Item {
|
|
|
|
x: -Theme.horizontalPageMargin/2
|
|
|
|
width: parent.width - x
|
|
|
|
height: Math.max(voteButtons.height, totalVoterCount.height + Theme.paddingSmall)
|
2020-10-23 11:29:50 +03:00
|
|
|
|
|
|
|
Row {
|
2020-12-05 06:14:51 +03:00
|
|
|
id: voteButtons
|
2020-10-23 11:29:50 +03:00
|
|
|
spacing: Theme.paddingSmall
|
|
|
|
width: parent.width - totalVoterCount.width - parent.spacing
|
2020-12-05 06:14:51 +03:00
|
|
|
anchors {
|
|
|
|
left: parent.left
|
|
|
|
bottom: parent.bottom
|
|
|
|
}
|
|
|
|
|
2020-10-23 11:29:50 +03:00
|
|
|
IconButton {
|
|
|
|
visible: !pollData.is_closed && pollMessageComponent.chosenIndexes.length > 0 && pollData.type.allow_multiple_answers && !pollMessageComponent.hasAnswered
|
|
|
|
opacity: visible ? 1.0 : 0.0
|
2020-10-24 20:32:21 +03:00
|
|
|
Behavior on opacity { FadeAnimation {}}
|
2020-10-23 11:29:50 +03:00
|
|
|
icon.source: "image://theme/icon-m-send"
|
|
|
|
onClicked: {
|
|
|
|
pollMessageComponent.sendResponse()
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
IconButton {
|
|
|
|
visible: !pollMessageComponent.canAnswer && !pollData.is_anonymous && pollData.total_voter_count > 0
|
|
|
|
icon.source: "image://theme/icon-m-media-artists"
|
|
|
|
onClicked: {
|
|
|
|
pageStack.push(Qt.resolvedUrl("../pages/PollResultsPage.qml"), { chatId:chatId, message:pollMessageComponent.message});
|
|
|
|
}
|
|
|
|
Icon {
|
|
|
|
opacity: 0.8
|
|
|
|
source: "image://theme/icon-s-maybe"
|
|
|
|
anchors {
|
|
|
|
right: parent.right
|
|
|
|
top: parent.top
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-12-05 06:14:51 +03:00
|
|
|
Label {
|
|
|
|
id: totalVoterCount
|
|
|
|
font.pixelSize: Theme.fontSizeTiny
|
|
|
|
anchors {
|
|
|
|
top: parent.top
|
|
|
|
right: parent.right
|
|
|
|
left: voteButtons.right
|
|
|
|
leftMargin: Theme.paddingMedium
|
|
|
|
}
|
|
|
|
text: qsTr("%Ln vote(s) total", "number of total votes", pollData.total_voter_count)
|
|
|
|
width: contentWidth
|
|
|
|
height: contentHeight
|
|
|
|
horizontalAlignment: Text.AlignRight
|
|
|
|
color: pollMessageComponent.isOwnMessage || pollMessageComponent.highlighted ? Theme.secondaryHighlightColor : Theme.secondaryColor
|
|
|
|
}
|
|
|
|
}
|
2020-10-23 11:29:50 +03:00
|
|
|
}
|
|
|
|
}
|