sprainbrains/harbour-fernschreiber
1
0
Fork 0
forked from medvedych/harbour-fernschreiber
Code Pull requests Activity

Merge pull request #316 from monich/image

Browse source 
Handle message data change in ImagePreview
This commit is contained in:
Sebastian Wolf 2021-01-13 22:49:41 +01:00 committed by GitHub
commit 3abdbe6a58
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
qml/components/ImagePreview.qml
View file

@ -26,7 +26,6 @@ Item {
property ListItem messageListItem
property MessageOverlayFlickable overlayFlickable
property var rawMessage: messageListItem ? messageListItem.myMessage : overlayFlickable.overlayMessage
property var photoData: rawMessage.content.photo
readonly property int defaultHeight: Math.round(width * 2 / 3)
property bool highlighted
@ -35,15 +34,19 @@ Item {
function clicked() {
pageStack.push(Qt.resolvedUrl("../pages/ImagePage.qml"), {
"photoData" : imagePreviewItem.photoData,
"pictureFileInformation" : imageFile.fileInformation
"photoData" : imagePreviewItem.rawMessage.content.photo
})
}
Component.onCompleted: {
if (photoData) {
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) {

42
qml/pages/ImagePage.qml
View file

@ -18,6 +18,7 @@
*/
import QtQuick 2.6
import Sailfish.Silica 1.0
import WerkWolf.Fernschreiber 1.0
import "../components"
import "../js/functions.js" as Functions
import "../js/debug.js" as Debug
@ -28,9 +29,7 @@ Page {
backNavigation: !imageOnly
property var photoData;
property var pictureFileInformation;
property string imageUrl;
property int imageWidth;
property int imageHeight;
@ -47,40 +46,31 @@ Page {
property bool imageOnly
Component.onCompleted: {
updatePicture();
}
function updatePicture() {
if (typeof photoData === "object") {
if (photoData) {
// Check first which size fits best...
var photo
for (var i = 0; i < photoData.sizes.length; i++) {
imagePage.imageWidth = photoData.sizes[i].width;
imagePage.imageHeight = photoData.sizes[i].height;
imagePage.pictureFileInformation = photoData.sizes[i].photo;
photo = photoData.sizes[i].photo
if (photoData.sizes[i].width >= imagePage.width) {
break;
}
}
if (photo) {
imageFile.fileInformation = photo
}
}
}
if (imagePage.pictureFileInformation.local.is_downloading_completed) {
imagePage.imageUrl = imagePage.pictureFileInformation.local.path;
} else {
tdLibWrapper.downloadFile(imagePage.pictureFileInformation.id);
}
}
TDLibFile {
id: imageFile
tdlib: tdLibWrapper
autoLoad: true
}
Connections {
target: tdLibWrapper
onFileUpdated: {
if (fileId === imagePage.pictureFileInformation.id) {
Debug.log("File updated, completed? ", fileInformation.local.is_downloading_completed);
if (fileInformation.local.is_downloading_completed) {
imagePage.pictureFileInformation = fileInformation;
imagePage.imageUrl = fileInformation.local.path;
}
}
}
onCopyToDownloadsSuccessful: {
appNotification.show(qsTr("Download of %1 successful.").arg(fileName), filePath);
}
@ -96,11 +86,11 @@ Page {
interactive: !imageOnly
PullDownMenu {
visible: !imageOnly && imageUrl
visible: !imageOnly && imageFile.isDownloadingCompleted && imageFile.path
MenuItem {
text: qsTr("Download Picture")
onClicked: {
tdLibWrapper.copyFileToDownloads(imagePage.imageUrl);
tdLibWrapper.copyFileToDownloads(imageFile.path);
}
}
}
@ -134,7 +124,7 @@ Page {
Image {
id: singleImage
source: imageUrl
source: imageFile.isDownloadingCompleted ? imageFile.path : ""
width: imagePage.imageWidth * imagePage.sizingFactor
height: imagePage.imageHeight * imagePage.sizingFactor
anchors.centerIn: parent