From 290114f3f28b7fd0e706714bc319b3d8acf44287 Mon Sep 17 00:00:00 2001 From: John Gibbon Date: Tue, 19 Jan 2021 22:38:34 +0100 Subject: [PATCH 01/14] Extract minithumbnail into own Loader --- qml/components/TDLibMinithumbnail.qml | 56 +++++++++++++++++++ qml/components/TDLibPhoto.qml | 78 +++++++++++++++++++++++++++ qml/components/TDLibThumbnail.qml | 31 +++-------- 3 files changed, 141 insertions(+), 24 deletions(-) create mode 100644 qml/components/TDLibMinithumbnail.qml create mode 100644 qml/components/TDLibPhoto.qml diff --git a/qml/components/TDLibMinithumbnail.qml b/qml/components/TDLibMinithumbnail.qml new file mode 100644 index 0000000..50f169a --- /dev/null +++ b/qml/components/TDLibMinithumbnail.qml @@ -0,0 +1,56 @@ +/* + 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 . +*/ +import QtQuick 2.6 +import Sailfish.Silica 1.0 +import QtGraphicalEffects 1.0 + +Loader { + id: loader + property var minithumbnail + property bool highlighted + anchors.fill: parent + active: !!minithumbnail + visible: active + sourceComponent: Component { + Item { + Image { + id: minithumbnailImage + anchors.fill: parent + source: "data:image/jpg;base64,"+minithumbnail.data + asynchronous: true + fillMode: tdLibImage.fillMode + opacity: status === Image.Ready ? 1.0 : 0.0 + cache: false + visible: opacity > 0 + Behavior on opacity { FadeAnimation {} } + + layer { + enabled: loader.highlighted + effect: PressEffect { source: minithumbnailImage } + } + } + + FastBlur { + anchors.fill: parent + source: minithumbnailImage + radius: Theme.paddingLarge + } + } + } +} diff --git a/qml/components/TDLibPhoto.qml b/qml/components/TDLibPhoto.qml new file mode 100644 index 0000000..567f129 --- /dev/null +++ b/qml/components/TDLibPhoto.qml @@ -0,0 +1,78 @@ +/* + 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 . +*/ +import QtQuick 2.6 +import WerkWolf.Fernschreiber 1.0 +import Sailfish.Silica 1.0 + +Item { + id: tdLibPhoto + property var photo + property bool highlighted + readonly property alias fileInformation: tdLibImage.fileInformation + readonly property alias image: tdLibImage + + onWidthChanged: setImageFile() + onPhotoChanged: setImageFile() + + function setImageFile() { + if (photo) { + var photoSize; + for (var i = 0; i < photo.sizes.length; i++) { + photoSize = photo.sizes[i].photo; + if (photo.sizes[i].width >= width) { + break; + } + } + if (photoSize && photoSize.id !== tdLibImage.fileInformation.id) { + tdLibImage.fileInformation = photoSize; + } + } + } + + Loader { + anchors.fill: parent + active: !!tdLibPhoto.photo.minithumbnail + asynchronous: true + sourceComponent: Component { + Image { + id: minithumbnail + source: "data:image/jpg;base64,"+tdLibPhoto.photo.minithumbnail.data + asynchronous: true + fillMode: tdLibImage.fillMode + smooth: false + cache: false + + layer { + enabled: tdLibPhoto.highlighted + effect: PressEffect { source: minithumbnail } + } + } + } + } + + TDLibImage { + id: tdLibImage + width: parent.width //don't use anchors here for easier custom scaling + height: parent.height + cache: false + highlighted: parent.highlighted + } + + Component.onCompleted: setImageFile() +} diff --git a/qml/components/TDLibThumbnail.qml b/qml/components/TDLibThumbnail.qml index 8454dd7..291f507 100644 --- a/qml/components/TDLibThumbnail.qml +++ b/qml/components/TDLibThumbnail.qml @@ -50,7 +50,7 @@ Item { - video - videoNote */ - property var minithumbnail + property alias minithumbnail: minithumbnailLoader.minithumbnail property bool useBackgroundImage: true property bool highlighted @@ -65,29 +65,12 @@ Item { effect: PressEffect { source: tdlibThumbnail } } - Loader { - id: backgroundLoader - anchors.fill: parent - active: !parent.hasVisibleThumbnail - asynchronous: true - sourceComponent: !!parent.minithumbnail ? miniThumbnailComponent : parent.useBackgroundImage ? backgroundImageComponent : "" - Component { - id: backgroundImageComponent - BackgroundImage {} - } - Component { - id: miniThumbnailComponent - Image { - clip: true - asynchronous: true - fillMode: Image.PreserveAspectCrop - opacity: status === Image.Ready ? 1.0 : 0.0 - smooth: false - source: "data:image/jpg;base64," + tdlibThumbnail.miniThumbnail.data - visible: opacity > 0 - Behavior on opacity { FadeAnimation {} } - } - } + TDLibMinithumbnail { + id: minithumbnailLoader + active: !!minithumbnail && thumbnailImage.opacity < 1.0 + } + BackgroundImage { + visible: tdlibThumbnail.useBackgroundImage && thumbnailImage.opacity < 1.0 } // image thumbnail From b61bf2a46b7fbda40aa092d23925558f98117019 Mon Sep 17 00:00:00 2001 From: John Gibbon Date: Tue, 19 Jan 2021 22:38:53 +0100 Subject: [PATCH 02/14] Implement TDLibPhoto qml element --- harbour-fernschreiber.pro | 2 ++ qml/components/TDLibPhoto.qml | 28 ++++++++++------------------ 2 files changed, 12 insertions(+), 18 deletions(-) diff --git a/harbour-fernschreiber.pro b/harbour-fernschreiber.pro index 82b4a20..9112867 100644 --- a/harbour-fernschreiber.pro +++ b/harbour-fernschreiber.pro @@ -62,6 +62,8 @@ DISTFILES += qml/harbour-fernschreiber.qml \ qml/components/StickerPicker.qml \ qml/components/PhotoTextsListItem.qml \ qml/components/TDLibImage.qml \ + qml/components/TDLibMinithumbnail.qml \ + qml/components/TDLibPhoto.qml \ qml/components/TDLibThumbnail.qml \ qml/components/VoiceNoteOverlay.qml \ qml/components/chatInformationPage/ChatInformationEditArea.qml \ diff --git a/qml/components/TDLibPhoto.qml b/qml/components/TDLibPhoto.qml index 567f129..f5cb838 100644 --- a/qml/components/TDLibPhoto.qml +++ b/qml/components/TDLibPhoto.qml @@ -19,6 +19,7 @@ import QtQuick 2.6 import WerkWolf.Fernschreiber 1.0 import Sailfish.Silica 1.0 +import QtGraphicalEffects 1.0 Item { id: tdLibPhoto @@ -31,6 +32,7 @@ Item { onPhotoChanged: setImageFile() function setImageFile() { + console.log("TDLibPhoto minithumb?", !!tdLibPhoto.photo.minithumbnail, minithumbnailLoader.active) if (photo) { var photoSize; for (var i = 0; i < photo.sizes.length; i++) { @@ -45,25 +47,15 @@ Item { } } - Loader { - anchors.fill: parent - active: !!tdLibPhoto.photo.minithumbnail - asynchronous: true - sourceComponent: Component { - Image { - id: minithumbnail - source: "data:image/jpg;base64,"+tdLibPhoto.photo.minithumbnail.data - asynchronous: true - fillMode: tdLibImage.fillMode - smooth: false - cache: false + TDLibMinithumbnail { + id: minithumbnailLoader + active: !!minithumbnail && tdLibImage.opacity < 1.0 + minithumbnail: tdLibPhoto.photo.minithumbnail + highlighted: parent.highlighted + } - layer { - enabled: tdLibPhoto.highlighted - effect: PressEffect { source: minithumbnail } - } - } - } + BackgroundImage { + visible: tdLibImage.opacity < 1.0 } TDLibImage { From 5a720c1a0084c1172512470d37886c11c01d5f39 Mon Sep 17 00:00:00 2001 From: John Gibbon Date: Tue, 19 Jan 2021 22:39:46 +0100 Subject: [PATCH 03/14] Use TDLibPhoto in MessagePhoto --- .../messageContent/MessagePhoto.qml | 64 ++++--------------- qml/pages/ChatPage.qml | 7 +- 2 files changed, 16 insertions(+), 55 deletions(-) diff --git a/qml/components/messageContent/MessagePhoto.qml b/qml/components/messageContent/MessagePhoto.qml index e4e9c95..8c30e6f 100644 --- a/qml/components/messageContent/MessagePhoto.qml +++ b/qml/components/messageContent/MessagePhoto.qml @@ -18,68 +18,26 @@ */ import QtQuick 2.6 import Sailfish.Silica 1.0 -import WerkWolf.Fernschreiber 1.0 import "../" MessageContentBase { - id: imagePreviewItem - - readonly property int defaultHeight: Math.round(width * 2 / 3) - - height: singleImage.visible ? Math.min(defaultHeight, singleImage.bestHeight + Theme.paddingSmall) : defaultHeight + height: Math.max(Theme.itemSizeExtraSmall, Math.min(defaultHeight, width / (biggest.width/biggest.height))) + readonly property int defaultHeight: Math.round(width * 0.66666666) + readonly property var biggest: rawMessage.content.photo.sizes[rawMessage.content.photo.sizes.length - 1]; onClicked: { pageStack.push(Qt.resolvedUrl("../../pages/ImagePage.qml"), { - "photoData" : imagePreviewItem.rawMessage.content.photo + "photoData" : photo.photo, +// "pictureFileInformation" : photo.fileInformation }) } - - Component.onCompleted: updateImage() - - onRawMessageChanged: updateImage() - - function updateImage() { - if (rawMessage.content.photo) { - // Check first which size fits best... - var photo - var photoData = rawMessage.content.photo - for (var i = 0; i < photoData.sizes.length; i++) { - photo = photoData.sizes[i].photo - if (photoData.sizes[i].width >= imagePreviewItem.width) { - break - } - } - if (photo) { - imageFile.fileInformation = photo - } - } + TDLibPhoto { + id: photo + anchors.fill: parent + photo: rawMessage.content.photo + highlighted: parent.highlighted } - - TDLibFile { - id: imageFile - tdlib: tdLibWrapper - autoLoad: true - } - - Image { - id: singleImage - width: parent.width - Theme.paddingSmall - height: parent.height - Theme.paddingSmall - readonly property int bestHeight: (status === Image.Ready) ? Math.round(implicitHeight * width / implicitWidth) : 0 - anchors.centerIn: parent - - fillMode: Image.PreserveAspectCrop - autoTransform: true - asynchronous: true - source: imageFile.isDownloadingCompleted ? imageFile.path : "" - visible: status === Image.Ready - opacity: visible ? 1 : 0 - Behavior on opacity { FadeAnimation {} } - layer.enabled: imagePreviewItem.highlighted - layer.effect: PressEffect { source: singleImage } - } - BackgroundImage { - visible: singleImage.status !== Image.Ready + visible: !rawMessage.content.photo.minithumbnail && photo.image.status !== Image.Ready } } diff --git a/qml/pages/ChatPage.qml b/qml/pages/ChatPage.qml index b297805..69735f7 100644 --- a/qml/pages/ChatPage.qml +++ b/qml/pages/ChatPage.qml @@ -1059,7 +1059,7 @@ Page { function getContentComponentHeight(contentType, content, parentWidth) { switch(contentType) { case "messageAnimation": - return Functions.getVideoHeight(parentWidth, content.video); + return Functions.getVideoHeight(parentWidth, content.animation); case "messageAudio": case "messageVoiceNote": case "messageDocument": @@ -1067,9 +1067,12 @@ Page { case "messageGame": return parentWidth * 0.66666666 + Theme.itemSizeLarge; // 2 / 3; case "messageLocation": - case "messagePhoto": case "messageVenue": return parentWidth * 0.66666666; // 2 / 3; + case "messagePhoto": + var biggest = content.photo.sizes[content.photo.sizes.length - 1]; + var aspectRatio = biggest.width/biggest.height; + return Math.max(Theme.itemSizeExtraSmall, Math.min(parentWidth * 0.66666666, parentWidth / aspectRatio)); case "messagePoll": return Theme.itemSizeSmall * (4 + content.poll.options); case "messageSticker": From 710254dc0f1f79169671d3f8386de2c9d497c024 Mon Sep 17 00:00:00 2001 From: John Gibbon Date: Tue, 19 Jan 2021 22:40:28 +0100 Subject: [PATCH 04/14] Use TDLibPhoto in inline query result --- .../InlineQueryResultPhoto.qml | 43 +------------------ 1 file changed, 2 insertions(+), 41 deletions(-) diff --git a/qml/components/inlineQueryResults/InlineQueryResultPhoto.qml b/qml/components/inlineQueryResults/InlineQueryResultPhoto.qml index f278b76..e9e995d 100644 --- a/qml/components/inlineQueryResults/InlineQueryResultPhoto.qml +++ b/qml/components/inlineQueryResults/InlineQueryResultPhoto.qml @@ -17,52 +17,13 @@ along with Fernschreiber. If not, see . */ import QtQuick 2.6 -import Sailfish.Silica 1.0 -import QtMultimedia 5.6 -import WerkWolf.Fernschreiber 1.0 import "../" InlineQueryResult { id: queryResultItem - - TDLibFile { - id: file - tdlib: tdLibWrapper - autoLoad: true - } - - Loader { - asynchronous: true - active: file.isDownloadingCompleted + TDLibPhoto { anchors.fill: parent - opacity: item && item.status === Image.Ready ? 1.0 : 0.0 - Behavior on opacity { FadeAnimation {} } - sourceComponent: Component { - Image { - id: image - source: file.path - asynchronous: true - clip: true - fillMode: Image.PreserveAspectCrop - layer.enabled: queryResultItem.pressed - layer.effect: PressEffect { source: image } - } - } - } - Component.onCompleted: { - if (model.photo) { - // Check first which size fits best... - var photo - for (var i = 0; i < model.photo.sizes.length; i++) { - photo = model.photo.sizes[i].photo - if (model.photo.sizes[i].width >= queryResultItem.width) { - break - } - } - if (photo) { - file.fileInformation = photo - } - } + photo: model.photo } } From bba5bf94b86fdb2820604d6979a6883da6abbb32 Mon Sep 17 00:00:00 2001 From: John Gibbon Date: Tue, 19 Jan 2021 22:41:06 +0100 Subject: [PATCH 05/14] Use TDLibImage in location content --- .../messageContent/MessageLocation.qml | 63 +++++++------------ .../messageContent/MessageVenue.qml | 5 +- 2 files changed, 26 insertions(+), 42 deletions(-) diff --git a/qml/components/messageContent/MessageLocation.qml b/qml/components/messageContent/MessageLocation.qml index 1b26e18..2804ceb 100644 --- a/qml/components/messageContent/MessageLocation.qml +++ b/qml/components/messageContent/MessageLocation.qml @@ -22,72 +22,50 @@ import Sailfish.Silica 1.0 import "../" MessageContentBase { - - id: imagePreviewItem - - property var locationData : ( rawMessage.content['@type'] === "messageLocation" ) ? rawMessage.content.location : ( ( rawMessage.content['@type'] === "messageVenue" ) ? rawMessage.content.venue.location : "" ) - - property string chatId: rawMessage.chat_id - property var pictureFileInformation; + id: contentItem height: width * 0.66666666; - property string fileExtra - Component.onCompleted: { - updatePicture(); - } + property var locationData : rawMessage.content.location + property string fileExtra; + onClicked: { if(!processLauncher.launchProgram('harbour-pure-maps', ["geo:"+locationData.latitude+","+locationData.longitude])) { imageNotification.show(qsTr("Install Pure Maps to inspect this location.")); } } + onLocationDataChanged: updatePicture() + onWidthChanged: updatePicture() + function updatePicture() { - imagePreviewItem.pictureFileInformation = null; if (locationData) { - fileExtra = "location:" + locationData.latitude + ":" + locationData.longitude + ":" + Math.round(imagePreviewItem.width) + ":" + Math.round(imagePreviewItem.height); - tdLibWrapper.getMapThumbnailFile(chatId, locationData.latitude, locationData.longitude, Math.round(imagePreviewItem.width), Math.round(imagePreviewItem.height), fileExtra); + fileExtra = "location:" + locationData.latitude + ":" + locationData.longitude + ":" + Math.round(contentItem.width) + ":" + Math.round(contentItem.height); + tdLibWrapper.getMapThumbnailFile(rawMessage.chat_id, locationData.latitude, locationData.longitude, Math.round(contentItem.width), Math.round(contentItem.height), fileExtra); } } Connections { target: tdLibWrapper onFileUpdated: { - if(fileInformation["@extra"] !== imagePreviewItem.fileExtra && (!imagePreviewItem.pictureFileInformation || imagePreviewItem.pictureFileInformation.id !== fileInformation.id)) { - return; + if(fileInformation["@extra"] === contentItem.fileExtra) { + if(fileInformation.id !== image.file.fileId) { + image.fileInformation = fileInformation + } } - if(fileInformation.local.is_downloading_completed) { - singleImage.source = fileInformation.local.path; - } else if(fileInformation.local.can_be_downloaded && !fileInformation.local.is_downloading_active) { - tdLibWrapper.downloadFile(fileInformation.id); - } - - imagePreviewItem.pictureFileInformation = fileInformation; } } AppNotification { id: imageNotification } - - Image { - id: singleImage - width: parent.width - Theme.paddingSmall - height: parent.height - Theme.paddingSmall - anchors.centerIn: parent - - fillMode: Image.PreserveAspectCrop - autoTransform: true - asynchronous: true - visible: status === Image.Ready - opacity: status === Image.Ready ? 1 : 0 - Behavior on opacity { NumberAnimation {} } - - layer.enabled: imagePreviewItem.highlighted - layer.effect: PressEffect { source: singleImage } + TDLibImage { + id: image + anchors.fill: parent + cache: false Item { anchors.centerIn: parent width: markerImage.width height: markerImage.height * 1.75 // 0.875 (vertical pin point) * 2 - Image { + Icon { id: markerImage source: 'image://theme/icon-m-location' } @@ -105,7 +83,10 @@ MessageContentBase { } BackgroundImage { - visible: singleImage.status !== Image.Ready + visible: image.status !== Image.Ready } + Component.onCompleted: { + updatePicture(); + } } diff --git a/qml/components/messageContent/MessageVenue.qml b/qml/components/messageContent/MessageVenue.qml index 9c04ae9..bd833d6 100644 --- a/qml/components/messageContent/MessageVenue.qml +++ b/qml/components/messageContent/MessageVenue.qml @@ -16,6 +16,9 @@ You should have received a copy of the GNU General Public License along with Fernschreiber. If not, see . */ + import QtQuick 2.6 -MessageLocation {} +MessageLocation { + locationData: rawMessage.content.venue.location +} From 117e7e9310b628ab06ad9728674b609fd0624b58 Mon Sep 17 00:00:00 2001 From: John Gibbon Date: Tue, 19 Jan 2021 22:42:53 +0100 Subject: [PATCH 06/14] Use biggest image for detail page --- qml/pages/ImagePage.qml | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/qml/pages/ImagePage.qml b/qml/pages/ImagePage.qml index 9b057b5..b691867 100644 --- a/qml/pages/ImagePage.qml +++ b/qml/pages/ImagePage.qml @@ -47,18 +47,16 @@ Page { Component.onCompleted: { if (photoData) { - // Check first which size fits best... - var photo + var biggestIndex = -1 for (var i = 0; i < photoData.sizes.length; i++) { - imagePage.imageWidth = photoData.sizes[i].width; - imagePage.imageHeight = photoData.sizes[i].height; - photo = photoData.sizes[i].photo - if (photoData.sizes[i].width >= imagePage.width) { - break; + if (biggestIndex === -1 || photoData.sizes[i].width > photoData.sizes[biggestIndex].width) { + biggestIndex = i; } } - if (photo) { - imageFile.fileInformation = photo + if (biggestIndex > -1) { + imagePage.imageWidth = photoData.sizes[biggestIndex].width; + imagePage.imageHeight = photoData.sizes[biggestIndex].height; + singleImage.fileInformation = photoData.sizes[biggestIndex].photo } } } @@ -122,9 +120,8 @@ Page { imageFlickable.returnToBounds() } - Image { + TDLibImage { id: singleImage - source: imageFile.isDownloadingCompleted ? imageFile.path : "" width: imagePage.imageWidth * imagePage.sizingFactor height: imagePage.imageHeight * imagePage.sizingFactor anchors.centerIn: parent From b6468ec9246af98a6ed4af5b70efed4d70245e97 Mon Sep 17 00:00:00 2001 From: John Gibbon Date: Tue, 19 Jan 2021 22:43:12 +0100 Subject: [PATCH 07/14] Remove useless output --- qml/components/TDLibPhoto.qml | 1 - 1 file changed, 1 deletion(-) diff --git a/qml/components/TDLibPhoto.qml b/qml/components/TDLibPhoto.qml index f5cb838..4de80a5 100644 --- a/qml/components/TDLibPhoto.qml +++ b/qml/components/TDLibPhoto.qml @@ -32,7 +32,6 @@ Item { onPhotoChanged: setImageFile() function setImageFile() { - console.log("TDLibPhoto minithumb?", !!tdLibPhoto.photo.minithumbnail, minithumbnailLoader.active) if (photo) { var photoSize; for (var i = 0; i < photo.sizes.length; i++) { From 844498ee4656494f8c7e2e12cbf6da98206bb101 Mon Sep 17 00:00:00 2001 From: John Gibbon Date: Tue, 19 Jan 2021 22:52:49 +0100 Subject: [PATCH 08/14] Remove unused TDLibFile from image page --- qml/pages/ImagePage.qml | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/qml/pages/ImagePage.qml b/qml/pages/ImagePage.qml index b691867..6b48252 100644 --- a/qml/pages/ImagePage.qml +++ b/qml/pages/ImagePage.qml @@ -61,12 +61,6 @@ Page { } } - TDLibFile { - id: imageFile - tdlib: tdLibWrapper - autoLoad: true - } - Connections { target: tdLibWrapper onCopyToDownloadsSuccessful: { @@ -84,11 +78,11 @@ Page { interactive: !imageOnly PullDownMenu { - visible: !imageOnly && imageFile.isDownloadingCompleted && imageFile.path + visible: !imageOnly && singleImage.file.isDownloadingCompleted MenuItem { text: qsTr("Download Picture") onClicked: { - tdLibWrapper.copyFileToDownloads(imageFile.path); + tdLibWrapper.copyFileToDownloads(singleImage.file.path); } } } From 6eaea9221ba2e200cda8b7388d17f4ba1bf84724 Mon Sep 17 00:00:00 2001 From: John Gibbon Date: Wed, 20 Jan 2021 00:57:31 +0100 Subject: [PATCH 09/14] Add highlight to location images --- qml/components/messageContent/MessageLocation.qml | 1 + 1 file changed, 1 insertion(+) diff --git a/qml/components/messageContent/MessageLocation.qml b/qml/components/messageContent/MessageLocation.qml index 2804ceb..845f4f0 100644 --- a/qml/components/messageContent/MessageLocation.qml +++ b/qml/components/messageContent/MessageLocation.qml @@ -61,6 +61,7 @@ MessageContentBase { id: image anchors.fill: parent cache: false + highlighted: contentItem.highlighted Item { anchors.centerIn: parent width: markerImage.width From 741ad786020f2f9c22f89000f0f6b9cf925e3da4 Mon Sep 17 00:00:00 2001 From: Sebastian Wolf Date: Thu, 21 Jan 2021 23:33:54 +0100 Subject: [PATCH 10/14] Sometimes images don't come with a proper width/height --- qml/components/messageContent/MessagePhoto.qml | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/qml/components/messageContent/MessagePhoto.qml b/qml/components/messageContent/MessagePhoto.qml index 8c30e6f..beb2381 100644 --- a/qml/components/messageContent/MessagePhoto.qml +++ b/qml/components/messageContent/MessagePhoto.qml @@ -21,9 +21,23 @@ import Sailfish.Silica 1.0 import "../" MessageContentBase { + + function calculateBiggest() { + var candidateBiggest = rawMessage.content.photo.sizes[rawMessage.content.photo.sizes.length - 1]; + if (candidateBiggest.width === 0 && rawMessage.content.photo.sizes.length > 1) { + for (var i = (rawMessage.content.photo.sizes.length - 2); i >= 0; i--) { + candidateBiggest = rawMessage.content.photo.sizes[i]; + if (candidateBiggest.width > 0) { + break; + } + } + } + return candidateBiggest; + } + height: Math.max(Theme.itemSizeExtraSmall, Math.min(defaultHeight, width / (biggest.width/biggest.height))) readonly property int defaultHeight: Math.round(width * 0.66666666) - readonly property var biggest: rawMessage.content.photo.sizes[rawMessage.content.photo.sizes.length - 1]; + readonly property var biggest: calculateBiggest(); onClicked: { pageStack.push(Qt.resolvedUrl("../../pages/ImagePage.qml"), { From c5640ec13f4d9b7c40565f61dfd8da200c7d302e Mon Sep 17 00:00:00 2001 From: John Gibbon Date: Fri, 22 Jan 2021 10:02:32 +0100 Subject: [PATCH 11/14] Fix poll results page fixes #331 --- qml/components/messageContent/MessagePoll.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qml/components/messageContent/MessagePoll.qml b/qml/components/messageContent/MessagePoll.qml index d41e9ae..0aba733 100644 --- a/qml/components/messageContent/MessagePoll.qml +++ b/qml/components/messageContent/MessagePoll.qml @@ -259,7 +259,7 @@ MessageContentBase { 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}); + pageStack.push(Qt.resolvedUrl("../../pages/PollResultsPage.qml"), { chatId:chatId, message:pollMessageComponent.rawMessage}); } Icon { opacity: 0.8 From e6e63622e5577244a7d1a2aa305f013891d9ce12 Mon Sep 17 00:00:00 2001 From: John Gibbon Date: Fri, 22 Jan 2021 11:12:12 +0100 Subject: [PATCH 12/14] Implement sending Quiz explanations TDLib 1.7 feature --- qml/pages/PollCreationPage.qml | 25 ++++++++++++++++++++- src/tdlibwrapper.cpp | 7 +++++- src/tdlibwrapper.h | 2 +- translations/harbour-fernschreiber-de.ts | 14 +++++++++++- translations/harbour-fernschreiber-en.ts | 14 +++++++++++- translations/harbour-fernschreiber-es.ts | 12 ++++++++++ translations/harbour-fernschreiber-fi.ts | 12 ++++++++++ translations/harbour-fernschreiber-hu.ts | 12 ++++++++++ translations/harbour-fernschreiber-it.ts | 12 ++++++++++ translations/harbour-fernschreiber-pl.ts | 12 ++++++++++ translations/harbour-fernschreiber-ru.ts | 12 ++++++++++ translations/harbour-fernschreiber-sv.ts | 12 ++++++++++ translations/harbour-fernschreiber-zh_CN.ts | 12 ++++++++++ translations/harbour-fernschreiber.ts | 12 ++++++++++ 14 files changed, 165 insertions(+), 5 deletions(-) diff --git a/qml/pages/PollCreationPage.qml b/qml/pages/PollCreationPage.qml index 029ef34..9fb8f89 100644 --- a/qml/pages/PollCreationPage.qml +++ b/qml/pages/PollCreationPage.qml @@ -39,6 +39,7 @@ Dialog { property alias quiz: quizSwitch.checked property alias multiple: multipleSwitch.checked property string replyToMessageId: "0" + property alias quizExplanation: quizExplanationTextArea.text // poll request data end canAccept: validationErrors.length === 0 @@ -81,6 +82,9 @@ Dialog { if(quiz && (correctOption < 0 || correctOption > options.count - 1)) { errors.push(qsTr("To send a quiz, you have to specify the right answer.")); } + if(quiz && quizExplanationTextArea.hasError) { + errors.push(qsTr("An explanation can be up to 200 characters long.")); + } if(errors.length === 0) { validationErrorsVisible = false; } @@ -333,6 +337,25 @@ Dialog { } description: qsTr("Quizzes have one correct answer. Participants can't revoke their responses.") } + TextArea { + id: quizExplanationTextArea + width: parent.width + opacity: pollCreationPage.quiz ? 1.0 : 0.0 + Behavior on opacity { FadeAnimation {} } + height: pollCreationPage.quiz ? implicitHeight : 0 + Behavior on height { NumberAnimation { duration: quizExplanationTextArea.focus ? 0 : 200 } } + visible: opacity > 0 + + placeholderText: qsTr("Enter an optional explanation") + property int charactersLeft: 200 - text.length + property bool hasError: charactersLeft < 0 + color: hasError ? Theme.errorColor : Theme.highlightColor + label: qsTr("Shown when the user selects a wrong answer.") + wrapMode: TextEdit.Wrap + onFocusChanged: { + validate(); + } + } } } @@ -342,7 +365,7 @@ Dialog { optionsArr.push(options.get(i).text); } - tdLibWrapper.sendPollMessage(chatId, pollQuestion, optionsArr, anonymous, quiz ? correctOption : -1, multiple, "0"); + tdLibWrapper.sendPollMessage(chatId, pollQuestion, optionsArr, anonymous, quiz ? correctOption : -1, multiple, quizExplanation, "0"); } diff --git a/src/tdlibwrapper.cpp b/src/tdlibwrapper.cpp index 5446f7e..32cd4a8 100644 --- a/src/tdlibwrapper.cpp +++ b/src/tdlibwrapper.cpp @@ -569,7 +569,7 @@ void TDLibWrapper::sendStickerMessage(const QString &chatId, const QString &file this->sendRequest(requestObject); } -void TDLibWrapper::sendPollMessage(const QString &chatId, const QString &question, const QVariantList &options, bool anonymous, int correctOption, bool multiple, const QString &replyToMessageId) +void TDLibWrapper::sendPollMessage(const QString &chatId, const QString &question, const QVariantList &options, bool anonymous, int correctOption, bool multiple, const QString &explanation, const QString &replyToMessageId) { LOG("Sending poll message" << chatId << question << replyToMessageId); QVariantMap requestObject; @@ -585,6 +585,11 @@ void TDLibWrapper::sendPollMessage(const QString &chatId, const QString &questio if(correctOption > -1) { pollType.insert(_TYPE, "pollTypeQuiz"); pollType.insert("correct_option_id", correctOption); + if(!explanation.isEmpty()) { + QVariantMap formattedExplanation; + formattedExplanation.insert("text", explanation); + pollType.insert("explanation", formattedExplanation); + } } else { pollType.insert(_TYPE, "pollTypeRegular"); pollType.insert("allow_multiple_answers", multiple); diff --git a/src/tdlibwrapper.h b/src/tdlibwrapper.h index 8b1ce90..3e824b7 100644 --- a/src/tdlibwrapper.h +++ b/src/tdlibwrapper.h @@ -145,7 +145,7 @@ public: Q_INVOKABLE void sendVoiceNoteMessage(const QString &chatId, const QString &filePath, const QString &message, const QString &replyToMessageId = "0"); Q_INVOKABLE void sendLocationMessage(const QString &chatId, double latitude, double longitude, double horizontalAccuracy, const QString &replyToMessageId = "0"); Q_INVOKABLE void sendStickerMessage(const QString &chatId, const QString &fileId, const QString &replyToMessageId = "0"); - Q_INVOKABLE void sendPollMessage(const QString &chatId, const QString &question, const QVariantList &options, bool anonymous, int correctOption, bool multiple, const QString &replyToMessageId = "0"); + Q_INVOKABLE void sendPollMessage(const QString &chatId, const QString &question, const QVariantList &options, bool anonymous, int correctOption, bool multiple, const QString &explanation, const QString &replyToMessageId = "0"); Q_INVOKABLE void forwardMessages(const QString &chatId, const QString &fromChatId, const QVariantList &messageIds, bool sendCopy, bool removeCaption); Q_INVOKABLE void getMessage(qlonglong chatId, qlonglong messageId); Q_INVOKABLE void getCallbackQueryAnswer(const QString &chatId, const QString &messageId, const QVariantMap &payload); diff --git a/translations/harbour-fernschreiber-de.ts b/translations/harbour-fernschreiber-de.ts index 28add57..f9e1625 100644 --- a/translations/harbour-fernschreiber-de.ts +++ b/translations/harbour-fernschreiber-de.ts @@ -1064,7 +1064,7 @@ MessageVoiceNote Voice Note - + Sprachnotiz @@ -1298,6 +1298,18 @@ Quizzes have one correct answer. Participants can't revoke their responses. Quizze haben eine korrekte Antwort. Teilnehmer können ihre Antwort nicht zurückziehen. + + Enter an optional explanation + Geben Sie eine optionale Erklärung ein + + + Shown when the user selects a wrong answer. + Wird bei Auswahl einer falschen Antwort gezeigt. + + + An explanation can be up to 200 characters long. + Eine Erklärung kann bis zu 200 Zeichen lang sein. + PollResultsPage diff --git a/translations/harbour-fernschreiber-en.ts b/translations/harbour-fernschreiber-en.ts index 3d0fcce..1549fa9 100644 --- a/translations/harbour-fernschreiber-en.ts +++ b/translations/harbour-fernschreiber-en.ts @@ -1064,7 +1064,7 @@ MessageVoiceNote Voice Note - + Voice Note @@ -1298,6 +1298,18 @@ Quizzes have one correct answer. Participants can't revoke their responses. Quizzes have one correct answer. Participants can't revoke their responses. + + Enter an optional explanation + Enter an optional explanation + + + Shown when the user selects a wrong answer. + Shown when the user selects a wrong answer. + + + An explanation can be up to 200 characters long. + An explanation can be up to 200 characters long. + PollResultsPage diff --git a/translations/harbour-fernschreiber-es.ts b/translations/harbour-fernschreiber-es.ts index 6bd0ef7..884a257 100644 --- a/translations/harbour-fernschreiber-es.ts +++ b/translations/harbour-fernschreiber-es.ts @@ -1298,6 +1298,18 @@ Quizzes have one correct answer. Participants can't revoke their responses. Los interrogatorios tienen una respuesta correcta. Los participantes no pueden revocar sus respuestas. + + Enter an optional explanation + + + + Shown when the user selects a wrong answer. + + + + An explanation can be up to 200 characters long. + + PollResultsPage diff --git a/translations/harbour-fernschreiber-fi.ts b/translations/harbour-fernschreiber-fi.ts index f1595d0..fea6a48 100644 --- a/translations/harbour-fernschreiber-fi.ts +++ b/translations/harbour-fernschreiber-fi.ts @@ -1299,6 +1299,18 @@ Quizzes have one correct answer. Participants can't revoke their responses. Visoilla on yksi oikea vastaus. Osallistujat eivät voi kumota vastaustaan. + + Enter an optional explanation + + + + Shown when the user selects a wrong answer. + + + + An explanation can be up to 200 characters long. + + PollResultsPage diff --git a/translations/harbour-fernschreiber-hu.ts b/translations/harbour-fernschreiber-hu.ts index e289d2a..da3c21f 100644 --- a/translations/harbour-fernschreiber-hu.ts +++ b/translations/harbour-fernschreiber-hu.ts @@ -1279,6 +1279,18 @@ Quizzes have one correct answer. Participants can't revoke their responses. + + Enter an optional explanation + + + + Shown when the user selects a wrong answer. + + + + An explanation can be up to 200 characters long. + + PollResultsPage diff --git a/translations/harbour-fernschreiber-it.ts b/translations/harbour-fernschreiber-it.ts index 3feba91..074670b 100644 --- a/translations/harbour-fernschreiber-it.ts +++ b/translations/harbour-fernschreiber-it.ts @@ -1298,6 +1298,18 @@ Quizzes have one correct answer. Participants can't revoke their responses. I quiz hanno una sola risposta corretta. I partecipanti non possono revocare le risposte. + + Enter an optional explanation + + + + Shown when the user selects a wrong answer. + + + + An explanation can be up to 200 characters long. + + PollResultsPage diff --git a/translations/harbour-fernschreiber-pl.ts b/translations/harbour-fernschreiber-pl.ts index 23e0666..f2dfcab 100644 --- a/translations/harbour-fernschreiber-pl.ts +++ b/translations/harbour-fernschreiber-pl.ts @@ -1317,6 +1317,18 @@ Quizzes have one correct answer. Participants can't revoke their responses. Quizy mają jedną poprawną odpowiedź. Uczestnicy nie mogą odwołać swoich odpowiedzi. + + Enter an optional explanation + + + + Shown when the user selects a wrong answer. + + + + An explanation can be up to 200 characters long. + + PollResultsPage diff --git a/translations/harbour-fernschreiber-ru.ts b/translations/harbour-fernschreiber-ru.ts index 23bfce7..64287e8 100644 --- a/translations/harbour-fernschreiber-ru.ts +++ b/translations/harbour-fernschreiber-ru.ts @@ -1317,6 +1317,18 @@ Quizzes have one correct answer. Participants can't revoke their responses. Тесты имеют один правильный ответ. Участники не могут отозвать свои ответы. + + Enter an optional explanation + + + + Shown when the user selects a wrong answer. + + + + An explanation can be up to 200 characters long. + + PollResultsPage diff --git a/translations/harbour-fernschreiber-sv.ts b/translations/harbour-fernschreiber-sv.ts index 48a27cd..7074f30 100644 --- a/translations/harbour-fernschreiber-sv.ts +++ b/translations/harbour-fernschreiber-sv.ts @@ -1298,6 +1298,18 @@ Quizzes have one correct answer. Participants can't revoke their responses. Frågor har ett (1) korrekt svar. Deltagarna kan inte återkalla sina svar. + + Enter an optional explanation + + + + Shown when the user selects a wrong answer. + + + + An explanation can be up to 200 characters long. + + PollResultsPage diff --git a/translations/harbour-fernschreiber-zh_CN.ts b/translations/harbour-fernschreiber-zh_CN.ts index 40bcda9..8eba51f 100644 --- a/translations/harbour-fernschreiber-zh_CN.ts +++ b/translations/harbour-fernschreiber-zh_CN.ts @@ -1279,6 +1279,18 @@ Quizzes have one correct answer. Participants can't revoke their responses. Quiz 拥有一个正确选项，参与者无法撤销回答。 + + Enter an optional explanation + + + + Shown when the user selects a wrong answer. + + + + An explanation can be up to 200 characters long. + + PollResultsPage diff --git a/translations/harbour-fernschreiber.ts b/translations/harbour-fernschreiber.ts index bfdd7b4..3e65ed4 100644 --- a/translations/harbour-fernschreiber.ts +++ b/translations/harbour-fernschreiber.ts @@ -1298,6 +1298,18 @@ Quizzes have one correct answer. Participants can't revoke their responses. Quizzes have one correct answer. Participants can't revoke their responses. + + Enter an optional explanation + + + + Shown when the user selects a wrong answer. + + + + An explanation can be up to 200 characters long. + + PollResultsPage From 2ed3bacd9841574f92773a47a776cf60967493a0 Mon Sep 17 00:00:00 2001 From: John Gibbon Date: Fri, 22 Jan 2021 11:14:45 +0100 Subject: [PATCH 13/14] Implement viewing Quiz explanations TDLib 1.7 feature --- qml/components/messageContent/MessagePoll.qml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/qml/components/messageContent/MessagePoll.qml b/qml/components/messageContent/MessagePoll.qml index 0aba733..392e09e 100644 --- a/qml/components/messageContent/MessagePoll.qml +++ b/qml/components/messageContent/MessagePoll.qml @@ -230,6 +230,24 @@ MessageContentBase { width: 1 height: Theme.paddingSmall } + Label { + width: parent.width + wrapMode: Text.Wrap + visible: isQuiz && text.length > 0 + text: Emoji.emojify(Functions.enhanceMessageText(pollData.type.explanation) || "", font.pixelSize) + textFormat: Text.StyledText + color: pollMessageComponent.isOwnMessage || pollMessageComponent.highlighted ? Theme.highlightColor : Theme.primaryColor + font.pixelSize: Theme.fontSizeExtraSmall + leftPadding: Theme.iconSizeSmall + bottomPadding: Theme.paddingSmall + Icon { + source: "image://theme/icon-s-high-importance" + asynchronous: true + width: Theme.iconSizeExtraSmall + height: Theme.iconSizeExtraSmall + anchors.verticalCenter: parent.verticalCenter + } + } Item { x: -Theme.horizontalPageMargin/2 From e7c075edb77c84e1514946a18f53a584d8257c67 Mon Sep 17 00:00:00 2001 From: Sebastian Wolf Date: Fri, 22 Jan 2021 22:05:32 +0100 Subject: [PATCH 14/14] Video notes text on chat list was missing --- src/fernschreiberutils.cpp | 3 +++ translations/harbour-fernschreiber-de.ts | 11 ++++++++++- translations/harbour-fernschreiber-en.ts | 9 +++++++++ translations/harbour-fernschreiber-es.ts | 9 +++++++++ translations/harbour-fernschreiber-fi.ts | 9 +++++++++ translations/harbour-fernschreiber-hu.ts | 9 +++++++++ translations/harbour-fernschreiber-it.ts | 9 +++++++++ translations/harbour-fernschreiber-pl.ts | 9 +++++++++ translations/harbour-fernschreiber-ru.ts | 9 +++++++++ translations/harbour-fernschreiber-sv.ts | 9 +++++++++ translations/harbour-fernschreiber-zh_CN.ts | 9 +++++++++ translations/harbour-fernschreiber.ts | 9 +++++++++ 12 files changed, 103 insertions(+), 1 deletion(-) diff --git a/src/fernschreiberutils.cpp b/src/fernschreiberutils.cpp index 57a07e7..b7d9af9 100644 --- a/src/fernschreiberutils.cpp +++ b/src/fernschreiberutils.cpp @@ -93,6 +93,9 @@ QString FernschreiberUtils::getMessageShortText(TDLibWrapper *tdLibWrapper, cons if (contentType == "messageVideo") { return myself ? tr("sent a video", "myself") : tr("sent a video"); } + if (contentType == "messageVideoNote") { + return myself ? tr("sent a video note", "myself") : tr("sent a video note"); + } if (contentType == "messageAnimation") { return myself ? tr("sent an animation", "myself") : tr("sent an animation"); } diff --git a/translations/harbour-fernschreiber-de.ts b/translations/harbour-fernschreiber-de.ts index f9e1625..f8c6223 100644 --- a/translations/harbour-fernschreiber-de.ts +++ b/translations/harbour-fernschreiber-de.ts @@ -840,6 +840,15 @@ sent a game hat ein Spiel gesendet + + sent a video note + myself + haben eine Videonachricht geschickt + + + sent a video note + hat eine Videonachricht geschickt + ImagePage @@ -1951,7 +1960,7 @@ sent a video note myself - haben eine Videonachricht geschicht + haben eine Videonachricht geschickt sent a video note diff --git a/translations/harbour-fernschreiber-en.ts b/translations/harbour-fernschreiber-en.ts index 1549fa9..f3ca3ca 100644 --- a/translations/harbour-fernschreiber-en.ts +++ b/translations/harbour-fernschreiber-en.ts @@ -840,6 +840,15 @@ sent a game sent a game + + sent a video note + myself + sent a video note + + + sent a video note + sent a video note + ImagePage diff --git a/translations/harbour-fernschreiber-es.ts b/translations/harbour-fernschreiber-es.ts index 884a257..8729c23 100644 --- a/translations/harbour-fernschreiber-es.ts +++ b/translations/harbour-fernschreiber-es.ts @@ -840,6 +840,15 @@ sent a game + + sent a video note + myself + envió una nota de video + + + sent a video note + envió una nota de video + ImagePage diff --git a/translations/harbour-fernschreiber-fi.ts b/translations/harbour-fernschreiber-fi.ts index fea6a48..e11937c 100644 --- a/translations/harbour-fernschreiber-fi.ts +++ b/translations/harbour-fernschreiber-fi.ts @@ -841,6 +841,15 @@ sent a game + + sent a video note + myself + + + + sent a video note + + ImagePage diff --git a/translations/harbour-fernschreiber-hu.ts b/translations/harbour-fernschreiber-hu.ts index da3c21f..adc071f 100644 --- a/translations/harbour-fernschreiber-hu.ts +++ b/translations/harbour-fernschreiber-hu.ts @@ -828,6 +828,15 @@ sent a game + + sent a video note + myself + + + + sent a video note + + ImagePage diff --git a/translations/harbour-fernschreiber-it.ts b/translations/harbour-fernschreiber-it.ts index 074670b..351d784 100644 --- a/translations/harbour-fernschreiber-it.ts +++ b/translations/harbour-fernschreiber-it.ts @@ -840,6 +840,15 @@ sent a game + + sent a video note + myself + + + + sent a video note + + ImagePage diff --git a/translations/harbour-fernschreiber-pl.ts b/translations/harbour-fernschreiber-pl.ts index f2dfcab..f614eef 100644 --- a/translations/harbour-fernschreiber-pl.ts +++ b/translations/harbour-fernschreiber-pl.ts @@ -852,6 +852,15 @@ sent a game + + sent a video note + myself + + + + sent a video note + + ImagePage diff --git a/translations/harbour-fernschreiber-ru.ts b/translations/harbour-fernschreiber-ru.ts index 64287e8..7289901 100644 --- a/translations/harbour-fernschreiber-ru.ts +++ b/translations/harbour-fernschreiber-ru.ts @@ -852,6 +852,15 @@ sent a game + + sent a video note + myself + отправлена видео заметка + + + sent a video note + отправлена видео заметка + ImagePage diff --git a/translations/harbour-fernschreiber-sv.ts b/translations/harbour-fernschreiber-sv.ts index 7074f30..9104f4e 100644 --- a/translations/harbour-fernschreiber-sv.ts +++ b/translations/harbour-fernschreiber-sv.ts @@ -840,6 +840,15 @@ sent a game + + sent a video note + myself + skickade ett videomeddelande + + + sent a video note + skickade ett videomeddelande + ImagePage diff --git a/translations/harbour-fernschreiber-zh_CN.ts b/translations/harbour-fernschreiber-zh_CN.ts index 8eba51f..dd00fc7 100644 --- a/translations/harbour-fernschreiber-zh_CN.ts +++ b/translations/harbour-fernschreiber-zh_CN.ts @@ -828,6 +828,15 @@ sent a game 发送游戏 + + sent a video note + myself + 发送视频消息 + + + sent a video note + 发送视频消息 + ImagePage diff --git a/translations/harbour-fernschreiber.ts b/translations/harbour-fernschreiber.ts index 3e65ed4..897816e 100644 --- a/translations/harbour-fernschreiber.ts +++ b/translations/harbour-fernschreiber.ts @@ -840,6 +840,15 @@ sent a game + + sent a video note + myself + sent a video note + + + sent a video note + sent a video note + ImagePage