From b58e33b2a43e2d9244b1da26e9ce003b83771d52 Mon Sep 17 00:00:00 2001 From: John Gibbon Date: Mon, 28 Sep 2020 22:58:11 +0200 Subject: [PATCH] Handle display of messageLocation resolves #36 --- harbour-fernschreiber.pro | 3 + qml/components/LocationPreview.qml | 120 ++++++++++++++++++++ qml/pages/ChatPage.qml | 19 ++++ src/harbour-fernschreiber.cpp | 4 + src/processlauncher.cpp | 18 +++ src/processlauncher.h | 22 ++++ src/tdlibwrapper.cpp | 23 ++++ src/tdlibwrapper.h | 1 + translations/harbour-fernschreiber-de.ts | 7 ++ translations/harbour-fernschreiber-es.ts | 7 ++ translations/harbour-fernschreiber-hu.ts | 7 ++ translations/harbour-fernschreiber-pl.ts | 7 ++ translations/harbour-fernschreiber-zh_CN.ts | 7 ++ translations/harbour-fernschreiber.ts | 7 ++ 14 files changed, 252 insertions(+) create mode 100644 qml/components/LocationPreview.qml create mode 100644 src/processlauncher.cpp create mode 100644 src/processlauncher.h diff --git a/harbour-fernschreiber.pro b/harbour-fernschreiber.pro index cb06c1b..a3056dc 100644 --- a/harbour-fernschreiber.pro +++ b/harbour-fernschreiber.pro @@ -24,6 +24,7 @@ SOURCES += src/harbour-fernschreiber.cpp \ src/dbusadaptor.cpp \ src/dbusinterface.cpp \ src/notificationmanager.cpp \ + src/processlauncher.cpp \ src/tdlibreceiver.cpp \ src/tdlibwrapper.cpp @@ -32,6 +33,7 @@ DISTFILES += qml/harbour-fernschreiber.qml \ qml/components/DocumentPreview.qml \ qml/components/ImagePreview.qml \ qml/components/InReplyToRow.qml \ + qml/components/LocationPreview.qml \ qml/components/WebPagePreview.qml \ qml/js/functions.js \ qml/pages/ChatPage.qml \ @@ -99,6 +101,7 @@ HEADERS += \ src/dbusadaptor.h \ src/dbusinterface.h \ src/notificationmanager.h \ + src/processlauncher.h \ src/tdlibreceiver.h \ src/tdlibsecrets.h \ src/tdlibwrapper.h diff --git a/qml/components/LocationPreview.qml b/qml/components/LocationPreview.qml new file mode 100644 index 0000000..f2882a5 --- /dev/null +++ b/qml/components/LocationPreview.qml @@ -0,0 +1,120 @@ +/* + Copyright (C) 2020 Sebastian J. Wolf + + 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.5 +import QtGraphicalEffects 1.0 +import Sailfish.Silica 1.0 + +Item { + + id: imagePreviewItem + property variant locationData; + property int chatId; + property variant pictureFileInformation; + + Component.onCompleted: { + updatePicture(); + } + + function updatePicture() { + if (locationData) { + tdLibWrapper.getMapThumbnailFile(chatId, locationData.latitude, locationData.longitude, Math.round(imagePreviewItem.width), Math.round(imagePreviewItem.height)); + } + } + + Connections { + target: tdLibWrapper + onFileUpdated: { + // we do not have a way of knowing if this is the correct file, so we have to guess the first new one should be right. + if(!imagePreviewItem.pictureFileInformation) { + imagePreviewItem.pictureFileInformation = fileInformation; + tdLibWrapper.downloadFile(imagePreviewItem.pictureFileInformation.id); + } else if(imagePreviewItem.pictureFileInformation && fileInformation.id === imagePreviewItem.pictureFileInformation.id) { + imagePreviewItem.pictureFileInformation = fileInformation; + singleImage.source = fileInformation.local.path; + } + } + } + + 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 {} } + Item { + anchors.centerIn: parent + width: markerImage.width + height: markerImage.height * 1.75 // 0.875 (vertical pin point) * 2 + Image { + id: markerImage + source: 'image://theme/icon-m-location' + } + + DropShadow { + anchors.fill: markerImage + horizontalOffset: 3 + verticalOffset: 3 + radius: 8.0 + samples: 17 + color: Theme.colorScheme ? Theme.lightPrimaryColor : Theme.darkPrimaryColor + source: markerImage + } + } + + MouseArea { + anchors.fill: parent + onClicked: { + if(!processLauncher.launchProgram('harbour-pure-maps', ["geo:"+locationData.latitude+","+locationData.longitude])) { + imageNotification.show(qsTr("Install Pure Maps to inspect this location.")); + } + } + Rectangle { + anchors.fill: parent + color: Theme.rgba(Theme.highlightBackgroundColor, Theme.highlightBackgroundOpacity) + opacity: parent.pressed ? 1.0 : 0.0 + } + } + } + + Image { + id: imageLoadingBackgroundImage + source: "../../images/background-" + ( Theme.colorScheme ? "black" : "white" ) + "-small.png" + anchors { + centerIn: parent + } + width: parent.width - Theme.paddingMedium + height: parent.height - Theme.paddingMedium + visible: singleImage.status !== Image.Ready + asynchronous: true + + fillMode: Image.PreserveAspectFit + opacity: 0.15 + } + +} diff --git a/qml/pages/ChatPage.qml b/qml/pages/ChatPage.qml index d898247..4e40703 100644 --- a/qml/pages/ChatPage.qml +++ b/qml/pages/ChatPage.qml @@ -484,6 +484,7 @@ Page { videoPreviewLoader.active = (( display.content['@type'] === "messageVideo" ) || ( display.content['@type'] === "messageAnimation" )); audioPreviewLoader.active = (( display.content['@type'] === "messageVoiceNote" ) || ( display.content['@type'] === "messageAudio" )); documentPreviewLoader.active = ( display.content['@type'] === "messageDocument" ); + locationPreviewLoader.active = ( display.content['@type'] === "messageLocation" ) } } @@ -716,7 +717,25 @@ Page { width: parent.width sourceComponent: documentPreviewComponent } + Component { + id: locationPreviewComponent + LocationPreview { + id: messageLocationPreview + width: parent.width + height: parent.width * 2 / 3 + chatId: display.id + locationData: ( display.content['@type'] === "messageLocation" ) ? display.content.location : "" + visible: display.content['@type'] === "messageLocation" + } + } + Loader { + id: locationPreviewLoader + active: false + asynchronous: true + width: parent.width + sourceComponent: locationPreviewComponent + } Timer { id: messageDateUpdater interval: 60000 diff --git a/src/harbour-fernschreiber.cpp b/src/harbour-fernschreiber.cpp index e91aa74..9b2a402 100644 --- a/src/harbour-fernschreiber.cpp +++ b/src/harbour-fernschreiber.cpp @@ -34,6 +34,7 @@ #include "chatmodel.h" #include "notificationmanager.h" #include "dbusadaptor.h" +#include "processlauncher.h" int main(int argc, char *argv[]) { @@ -58,6 +59,9 @@ int main(int argc, char *argv[]) NotificationManager notificationManager(tdLibWrapper); context->setContextProperty("notificationManager", ¬ificationManager); + ProcessLauncher processLauncher; + context->setContextProperty("processLauncher", &processLauncher); + view->setSource(SailfishApp::pathTo("qml/harbour-fernschreiber.qml")); view->show(); return app->exec(); diff --git a/src/processlauncher.cpp b/src/processlauncher.cpp new file mode 100644 index 0000000..b2f9b5f --- /dev/null +++ b/src/processlauncher.cpp @@ -0,0 +1,18 @@ +#include "processlauncher.h" + +#define LOG(x) qDebug() << "[ProcessLauncher]" << x + +ProcessLauncher::ProcessLauncher(QObject *parent) : QObject(parent) +{ + +} +bool ProcessLauncher::launchProgram(const QString &program, const QStringList &arguments) +{ + QString executablePath = QStandardPaths::findExecutable(program); + if(executablePath == "") { + LOG("[ProcessLauncher] Program " + program + "not found"); + return false; + } + QProcess *externalProcess = new QProcess(this); + return externalProcess->startDetached(program, arguments); +} diff --git a/src/processlauncher.h b/src/processlauncher.h new file mode 100644 index 0000000..5583637 --- /dev/null +++ b/src/processlauncher.h @@ -0,0 +1,22 @@ +#ifndef PROCESSLAUNCHER_H +#define PROCESSLAUNCHER_H + +#include +#include +#include +#include + +class ProcessLauncher : public QObject +{ + Q_OBJECT +public: + explicit ProcessLauncher(QObject *parent = nullptr); + + Q_INVOKABLE bool launchProgram(const QString &program, const QStringList &arguments); + +signals: + +public slots: +}; + +#endif // PROCESSLAUNCHER_H diff --git a/src/tdlibwrapper.cpp b/src/tdlibwrapper.cpp index 80efde8..42909ca 100644 --- a/src/tdlibwrapper.cpp +++ b/src/tdlibwrapper.cpp @@ -360,6 +360,29 @@ void TDLibWrapper::deleteMessages(const QString &chatId, const QVariantList mess this->sendRequest(requestObject); } +void TDLibWrapper::getMapThumbnailFile(const QString &chatId, const double &latitude, const double &longitude, const int &width, const int &height) +{ + qDebug() << "[TDLibWrapper] getting Map Thumbnail File " << chatId; + QVariantMap location; + location.insert("latitude", latitude); + location.insert("longitude", longitude); + + // ensure dimensions are in bounds (16 - 1024) + int boundsWidth = std::min(std::max(width, 16), 1024); + int boundsHeight = std::min(std::max(height, 16), 1024); + + QVariantMap requestObject; + requestObject.insert("@type", "getMapThumbnailFile"); + requestObject.insert("location", location); + requestObject.insert("zoom", 17); //13-20 + requestObject.insert("width", boundsWidth); + requestObject.insert("height", boundsHeight); + requestObject.insert("scale", 1); // 1-3 + requestObject.insert("chat_id", chatId); + + this->sendRequest(requestObject); +} + QVariantMap TDLibWrapper::getUserInformation() { return this->userInformation; diff --git a/src/tdlibwrapper.h b/src/tdlibwrapper.h index bb4c233..96cfd08 100644 --- a/src/tdlibwrapper.h +++ b/src/tdlibwrapper.h @@ -99,6 +99,7 @@ public: Q_INVOKABLE void setChatNotificationSettings(const QString &chatId, const QVariantMap ¬ificationSettings); Q_INVOKABLE void editMessageText(const QString &chatId, const QString &messageId, const QString &message); Q_INVOKABLE void deleteMessages(const QString &chatId, const QVariantList messageIds); + Q_INVOKABLE void getMapThumbnailFile(const QString &chatId, const double &latitude, const double &longitude, const int &width, const int &height); signals: void versionDetected(const QString &version); diff --git a/translations/harbour-fernschreiber-de.ts b/translations/harbour-fernschreiber-de.ts index 560695c..d22a46f 100644 --- a/translations/harbour-fernschreiber-de.ts +++ b/translations/harbour-fernschreiber-de.ts @@ -289,6 +289,13 @@ Bitte geben Sie Ihr Passwort ein: + + LocationPreview + + Install Pure Maps to inspect this location. + Installieren Sie Pure Maps, um diesen Ort zu erkunden + + NotificationManager diff --git a/translations/harbour-fernschreiber-es.ts b/translations/harbour-fernschreiber-es.ts index f6cb2f5..bfb8826 100644 --- a/translations/harbour-fernschreiber-es.ts +++ b/translations/harbour-fernschreiber-es.ts @@ -289,6 +289,13 @@ Por favor, introducir el código: + + LocationPreview + + Install Pure Maps to inspect this location. + + + NotificationManager diff --git a/translations/harbour-fernschreiber-hu.ts b/translations/harbour-fernschreiber-hu.ts index 5550932..ba6bb16 100644 --- a/translations/harbour-fernschreiber-hu.ts +++ b/translations/harbour-fernschreiber-hu.ts @@ -289,6 +289,13 @@ Kérlek add meg a jelszavad: + + LocationPreview + + Install Pure Maps to inspect this location. + + + NotificationManager diff --git a/translations/harbour-fernschreiber-pl.ts b/translations/harbour-fernschreiber-pl.ts index 65db071..8c048d8 100644 --- a/translations/harbour-fernschreiber-pl.ts +++ b/translations/harbour-fernschreiber-pl.ts @@ -289,6 +289,13 @@ Wprowadź hasło: + + LocationPreview + + Install Pure Maps to inspect this location. + + + NotificationManager diff --git a/translations/harbour-fernschreiber-zh_CN.ts b/translations/harbour-fernschreiber-zh_CN.ts index bebb602..b966bb8 100644 --- a/translations/harbour-fernschreiber-zh_CN.ts +++ b/translations/harbour-fernschreiber-zh_CN.ts @@ -289,6 +289,13 @@ 请输入你的密码： + + LocationPreview + + Install Pure Maps to inspect this location. + + + NotificationManager diff --git a/translations/harbour-fernschreiber.ts b/translations/harbour-fernschreiber.ts index 98601f0..6bffa4a 100644 --- a/translations/harbour-fernschreiber.ts +++ b/translations/harbour-fernschreiber.ts @@ -289,6 +289,13 @@ + + LocationPreview + + Install Pure Maps to inspect this location. + + + NotificationManager