Tweaked poll/quiz layout
Made it slightly more compact.
This commit is contained in:
Slava Monich
parent
633f765c80
commit
782561273f
1 changed files with 99 additions and 79 deletions
|
|
@ -26,7 +26,6 @@ import "../js/twemoji.js" as Emoji
|
|||
Item {
|
||||
id: pollMessageComponent
|
||||
|
||||
|
||||
property ListItem messageListItem
|
||||
property MessageOverlayFlickable overlayFlickable
|
||||
property var rawMessage: messageListItem ? messageListItem.myMessage : overlayFlickable.overlayMessage
|
||||
|
|
@ -46,7 +45,7 @@ Item {
|
|||
}
|
||||
property bool canAnswer: !hasAnswered && !pollData.is_closed
|
||||
property bool isQuiz: pollData.type['@type'] === "pollTypeQuiz"
|
||||
property bool highlighted;
|
||||
property bool highlighted
|
||||
width: parent.width
|
||||
height: pollColumn.height
|
||||
opacity: 0
|
||||
|
|
@ -78,6 +77,7 @@ Item {
|
|||
id: pollColumn
|
||||
width: parent.width
|
||||
spacing: Theme.paddingSmall
|
||||
|
||||
Label {
|
||||
font.pixelSize: Theme.fontSizeSmall
|
||||
width: parent.width
|
||||
|
|
@ -99,7 +99,7 @@ Item {
|
|||
|
||||
Item {
|
||||
visible: !pollMessageComponent.canAnswer
|
||||
width: parent.width
|
||||
width: 1
|
||||
height: Theme.paddingSmall
|
||||
}
|
||||
|
||||
|
|
@ -117,88 +117,89 @@ Item {
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
Component {
|
||||
id: resultDelegate
|
||||
Item {
|
||||
Row {
|
||||
id: optionDelegate
|
||||
width: pollMessageComponent.width
|
||||
height: displayOptionLabel.height + displayOptionStatistics.height
|
||||
height: Math.max(Theme.itemSizeExtraSmall, implicitHeight)
|
||||
|
||||
Item {
|
||||
height: parent.height
|
||||
width: Theme.horizontalPageMargin/2
|
||||
anchors.bottom: parent.bottom
|
||||
|
||||
Rectangle {
|
||||
id: displayOptionChosenMarker
|
||||
height: parent.height
|
||||
width: Theme.horizontalPageMargin/2
|
||||
anchors.fill: parent
|
||||
color: Theme.rgba(Theme.highlightBackgroundColor, Theme.highlightBackgroundOpacity)
|
||||
visible: modelData.is_chosen
|
||||
x: -width
|
||||
}
|
||||
|
||||
OpacityRampEffect {
|
||||
sourceItem: displayOptionChosenMarker
|
||||
direction: OpacityRamp.LeftToRight
|
||||
}
|
||||
Column {
|
||||
id: iconsColumn
|
||||
width: pollMessageComponent.isQuiz ?Theme.iconSizeSmall + Theme.paddingMedium : Theme.paddingMedium
|
||||
|
||||
anchors {
|
||||
left: parent.left
|
||||
verticalCenter: parent.verticalCenter
|
||||
}
|
||||
|
||||
Item {
|
||||
width: Theme.paddingMedium + (pollMessageComponent.isQuiz ? Theme.iconSizeSmall : 0)
|
||||
height: correctAnswerIcon.height
|
||||
anchors {
|
||||
bottom: parent.bottom
|
||||
bottomMargin: (votePercentageBar.height - height)/2
|
||||
}
|
||||
Icon {
|
||||
id: correctAnswerIcon
|
||||
anchors.bottom: parent.bottom
|
||||
highlighted: pollMessageComponent.isOwnMessage || pollMessageComponent.highlighted
|
||||
property bool isRight: pollMessageComponent.isQuiz && pollData.type.correct_option_id === index
|
||||
readonly property bool isRight: pollMessageComponent.isQuiz && pollData.type.correct_option_id === index
|
||||
source: "image://theme/icon-s-accept"
|
||||
visible: isRight
|
||||
}
|
||||
}
|
||||
|
||||
Column {
|
||||
width: list.width - x
|
||||
anchors.bottom: parent.bottom
|
||||
|
||||
Item {
|
||||
width: parent.width
|
||||
height: Math.max(voteTextLabel.height, votePercentageLabel.y + votePercentageLabel.height)
|
||||
|
||||
Label {
|
||||
id: displayOptionLabel
|
||||
id: voteTextLabel
|
||||
property int lastLineWidth
|
||||
width: parent.width
|
||||
text: Emoji.emojify(modelData.text, Theme.fontSizeMedium)
|
||||
textFormat: Text.StyledText
|
||||
|
||||
wrapMode: Text.WrapAtWordBoundaryOrAnywhere
|
||||
anchors {
|
||||
left: iconsColumn.right
|
||||
top: parent.top
|
||||
right: parent.right
|
||||
}
|
||||
color: pollMessageComponent.isOwnMessage || pollMessageComponent.highlighted ? Theme.highlightColor : Theme.primaryColor
|
||||
onTextChanged: lastLineWidth = 0
|
||||
onLineLaidOut: {
|
||||
if (line.isLast) {
|
||||
lastLineWidth = line.x + line.implicitWidth
|
||||
}
|
||||
}
|
||||
Item {
|
||||
id: displayOptionStatistics
|
||||
height: optionVoterPercentage.height + optionVoterPercentageBar.height
|
||||
anchors {
|
||||
top: displayOptionLabel.bottom
|
||||
left: iconsColumn.right
|
||||
right: parent.right
|
||||
}
|
||||
|
||||
Label {
|
||||
id: optionVoterPercentage
|
||||
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
|
||||
left: parent.horizontalCenter
|
||||
leftMargin: Theme.paddingSmall
|
||||
}
|
||||
anchors.right: parent.right
|
||||
color: pollMessageComponent.isOwnMessage || pollMessageComponent.highlighted ? Theme.secondaryHighlightColor : Theme.secondaryColor
|
||||
}
|
||||
Rectangle {
|
||||
id: optionVoterPercentageBar
|
||||
height: Theme.paddingSmall
|
||||
width: parent.width
|
||||
|
||||
color: Theme.rgba(pollMessageComponent.isOwnMessage || pollMessageComponent.highlighted ? Theme.secondaryHighlightColor : Theme.secondaryColor, 0.3)
|
||||
radius: height/2
|
||||
anchors {
|
||||
left: parent.left
|
||||
bottom: parent.bottom
|
||||
}
|
||||
|
||||
Rectangle {
|
||||
id: votePercentageBar
|
||||
height: Theme.paddingSmall
|
||||
width: parent.width
|
||||
color: Theme.rgba(pollMessageComponent.isOwnMessage || pollMessageComponent.highlighted ? Theme.secondaryHighlightColor : Theme.secondaryColor, 0.3)
|
||||
radius: height/2
|
||||
Rectangle {
|
||||
height: parent.height
|
||||
color: pollMessageComponent.isOwnMessage || pollMessageComponent.highlighted ? Theme.highlightColor : Theme.primaryColor
|
||||
|
|
@ -210,32 +211,35 @@ Item {
|
|||
}
|
||||
}
|
||||
|
||||
Repeater {
|
||||
ListView {
|
||||
id: list
|
||||
model: pollData.options
|
||||
x: -Theme.horizontalPageMargin/2
|
||||
width: parent.width - x
|
||||
height: contentHeight
|
||||
interactive: false
|
||||
delegate: pollMessageComponent.canAnswer ? canAnswerDelegate : resultDelegate
|
||||
}
|
||||
|
||||
Row {
|
||||
layoutDirection: Qt.RightToLeft
|
||||
width: parent.width
|
||||
spacing: Theme.paddingMedium
|
||||
Behavior on height { NumberAnimation {}}
|
||||
|
||||
|
||||
Label {
|
||||
id: totalVoterCount
|
||||
font.pixelSize: Theme.fontSizeTiny
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
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
|
||||
Item {
|
||||
width: 1
|
||||
height: Theme.paddingSmall
|
||||
}
|
||||
|
||||
Item {
|
||||
x: -Theme.horizontalPageMargin/2
|
||||
width: parent.width - x
|
||||
height: Math.max(voteButtons.height, totalVoterCount.height + Theme.paddingSmall)
|
||||
|
||||
Row {
|
||||
id: voteButtons
|
||||
spacing: Theme.paddingSmall
|
||||
width: parent.width - totalVoterCount.width - parent.spacing
|
||||
anchors {
|
||||
left: parent.left
|
||||
bottom: parent.bottom
|
||||
}
|
||||
|
||||
IconButton {
|
||||
visible: !pollData.is_closed && pollMessageComponent.chosenIndexes.length > 0 && pollData.type.allow_multiple_answers && !pollMessageComponent.hasAnswered
|
||||
opacity: visible ? 1.0 : 0.0
|
||||
|
|
@ -246,7 +250,6 @@ Item {
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
IconButton {
|
||||
visible: !pollMessageComponent.canAnswer && !pollData.is_anonymous && pollData.total_voter_count > 0
|
||||
icon.source: "image://theme/icon-m-media-artists"
|
||||
|
|
@ -263,9 +266,25 @@ Item {
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
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
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
Component {
|
||||
id: closePollMenuItemComponent
|
||||
MenuItem {
|
||||
|
|
@ -276,6 +295,7 @@ Item {
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
Component {
|
||||
id: resetAnswerMenuItemComponent
|
||||
MenuItem {
|
||||
|
|
|
|||
Loading…
Reference in a new issue