Merge pull request #2 from Wunderfitz/master

Syncing my fork to the original repository

README.md

@@ -12,6 +12,9 @@ Fernschreiber wouldn't be the same without all the people helping in making it b
 - Chat list model, TDLib receiver, project dependencies: [Slava Monich](https://github.com/monich)
 - Location support, app initialization/registration with Telegram, project dependencies: [jgibbon](https://github.com/jgibbon)
 
+### Logo/Icon
+- Designed by [Matteo](https://github.com/iamnomeutente)
+
 ### Translations
 - Chinese: [dashinfantry](https://github.com/dashinfantry)
 - Finnish: [jorm1s](https://github.com/jorm1s)

qml/components/StickerPicker.qml

@@ -29,6 +29,17 @@ Item {
 
     property variant recentStickers: stickerManager.getRecentStickers()
     property variant installedStickerSets: stickerManager.getInstalledStickerSets()
+    property bool pickerLoaded: false
+
+    Timer {
+        id: stickerPickerLoadedTimer
+        interval: 100
+        running: true
+        repeat: false
+        onTriggered: {
+            stickerPickerOverlayItem.pickerLoaded = true;
+        }
+    }
 
     Rectangle {
         id: stickerPickerOverlayBackground
@@ -37,10 +48,16 @@ Item {
         color: Theme.overlayBackgroundColor
         opacity: 0.7
     }
+
     Flickable {
         id: stickerPickerFlickable
         anchors.fill: parent
         anchors.margins: Theme.paddingMedium
+
+        opacity: stickerPickerOverlayItem.pickerLoaded ? 1 : 0
+        Behavior on opacity { NumberAnimation {} }
+        visible: stickerPickerOverlayItem.pickerLoaded
+
         contentHeight: stickerPickerColumn.height
         clip: true
 
@@ -78,18 +95,25 @@ Item {
                                 id: singleRecentStickerRow
                                 spacing: Theme.paddingSmall
                                 Image {
-                                    source: modelData.sticker.local.path
-                                    width: Theme.itemSizeMedium
-                                    height: Theme.itemSizeMedium
+                                    source: modelData.thumbnail.photo.local.path
+                                    width: Theme.itemSizeExtraLarge
+                                    height: Theme.itemSizeExtraLarge
+                                    asynchronous: true
+                                    onStatusChanged: {
+                                        if (status === Image.Ready) {
+                                            stickerPickerLoadedTimer.restart();
+                                        }
+                                    }
                                 }
                             }
 
                             MouseArea {
                                 anchors.fill: parent
                                 onClicked: {
-                                    tdLibWrapper.sendStickerMessage(chatInformation.id, modelData.sticker.local.path);
+                                    tdLibWrapper.sendStickerMessage(chatInformation.id, modelData.sticker.remote.id);
                                     stickerPickerOverlayItem.visible = false;
                                     attachmentOptionsRow.visible = false;
+                                    stickerPickerLoader.active = false;
                                 }
                             }
                         }
@@ -126,61 +150,69 @@ Item {
                                 model: modelData.stickers
 
                                 Item {
-                                    width: Theme.itemSizeMedium
-                                    height: Theme.itemSizeMedium
-
-                                    Component.onCompleted: {
-                                        if (!modelData.sticker.local.is_downloading_completed) {
-                                            tdLibWrapper.downloadFile(modelData.sticker.id);
-                                        }
-                                    }
-
-                                    Connections {
-                                        target: tdLibWrapper
-                                        onFileUpdated : {
-                                            if (fileInformation.local.is_downloading_completed) {
-                                                if (fileId === modelData.sticker.id) {
-                                                    singleStickerImage.source = fileInformation.local.path;
-                                                }
-                                            }
-                                        }
-                                    }
-
+                                    width: Theme.itemSizeExtraLarge
+                                    height: Theme.itemSizeExtraLarge
                                     Image {
                                         id: singleStickerImage
-                                        source: modelData.sticker.local.is_downloading_completed ? modelData.sticker.local.path : ""
+                                        source: modelData.thumbnail.photo.local.is_downloading_completed ? modelData.thumbnail.photo.local.path : ""
                                         anchors.fill: parent
-                                        visible: modelData.sticker.local.is_downloading_completed
+                                        visible: modelData.thumbnail.photo.local.is_downloading_completed
+                                        asynchronous: true
+                                        onStatusChanged: {
+                                            if (status === Image.Ready) {
+                                                stickerPickerLoadedTimer.restart();
+                                            }
+                                        }
                                     }
                                     Text {
-                                        font.pixelSize: Theme.fontSizeLarge
+                                        font.pixelSize: Theme.fontSizeHuge
                                         color: Theme.primaryColor
                                         anchors.fill: parent
                                         maximumLineCount: 1
                                         elide: Text.ElideRight
                                         text: Emoji.emojify(modelData.emoji, font.pixelSize)
-                                        visible: !modelData.sticker.local.is_downloading_completed
+                                        visible: !modelData.thumbnail.photo.local.is_downloading_completed
                                     }
 
                                     MouseArea {
                                         anchors.fill: parent
                                         onClicked: {
-                                            tdLibWrapper.sendStickerMessage(chatInformation.id, modelData.sticker.local.path);
+                                            tdLibWrapper.sendStickerMessage(chatInformation.id, modelData.sticker.remote.id);
                                             stickerPickerOverlayItem.visible = false;
                                             attachmentOptionsRow.visible = false;
+                                            stickerPickerLoader.active = false;
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
             }
         }
     }
 
+    Column {
+        anchors.centerIn: parent
+        width: parent.width
+        spacing: Theme.paddingMedium
+
+        opacity: stickerPickerOverlayItem.pickerLoaded ? 0 : 1
+        Behavior on opacity { NumberAnimation {} }
+        visible: !stickerPickerOverlayItem.pickerLoaded
+
+        InfoLabel {
+            id: loadingLabel
+            text: qsTr("Loading stickers...")
         }
+
+        BusyIndicator {
+            id: loadingBusyIndicator
+            anchors.horizontalCenter: parent.horizontalCenter
+            running: !stickerPickerOverlayItem.pickerLoaded
+            size: BusyIndicatorSize.Large
         }
     }
 
-
-                }
-            }
-
-        }
-    }
 }
 

qml/pages/ChatPage.qml

@@ -30,6 +30,7 @@ import "../js/functions.js" as Functions
 Page {
     id: chatPage
     allowedOrientations: Orientation.All
+    backNavigation: !stickerPickerLoader.active
 
     property bool loading: true;
     property bool isInitialized: false;
@@ -97,6 +98,12 @@ Page {
             isChannel = chatGroupInformation.is_channel;
             updateGroupStatusText();
         }
+        if (stickerManager.needsReload()) {
+            console.log("Stickers will be reloaded!");
+            tdLibWrapper.getRecentStickers();
+            tdLibWrapper.getInstalledStickerSets();
+            stickerManager.setNeedsReload(false);
+        }
     }
 
     function getMessageStatusText(message, listItemIndex, lastReadSentIndex) {
@@ -279,7 +286,7 @@ Page {
         anchors.fill: parent
 
         PullDownMenu {
-            visible: chatInformation.id !== chatPage.myUserId
+            visible: chatInformation.id !== chatPage.myUserId && !stickerPickerLoader.active
             MenuItem {
                 id: muteChatMenuItem
                 onClicked: {
@@ -945,10 +952,15 @@ Page {
                     }
                 }
 
-//                StickerPicker {
-//                    id: stickerPicker
-//                    visible: false
-//                }
+                Loader {
+                    id: stickerPickerLoader
+                    active: false
+                    asynchronous: true
+                    width: parent.width
+                    height: active ? parent.height : 0
+                    source: "../components/StickerPicker.qml"
+                }
+
             }
 
             Column {
@@ -1050,17 +1062,15 @@ Page {
                     }
                     HighlightImage {
                         source: "../../images/icon-m-sticker.png"
-                        width: documentAttachmentButton.width
-                        height: documentAttachmentButton.height
+                        width: Theme.itemSizeSmall
+                        height: Theme.itemSizeSmall
                         color: Theme.primaryColor
                         highlightColor: Theme.highlightColor
-                        highlighted: stickerPicker.visible
+                        highlighted: stickerPickerLoader.active
                         MouseArea {
                             anchors.fill: parent
                             onClicked: {
-                                //console.log("RECENT STICKERS: " + JSON.stringify(stickerManager.getRecentStickers()));
-                                //console.log("INSTALLED SETS: " + JSON.stringify(stickerManager.getInstalledStickerSets()));
-                                stickerPicker.visible = !stickerPicker.visible;
+                                stickerPickerLoader.active = !stickerPickerLoader.active;
                             }
                         }
                     }
@@ -1198,10 +1208,11 @@ Page {
 
                         anchors.bottom: parent.bottom
                         anchors.bottomMargin: Theme.paddingSmall
-                        enabled: !(attachmentPreviewRow.visible || stickerPicker.visible)
+                        enabled: !attachmentPreviewRow.visible
                         onClicked: {
                             if (attachmentOptionsRow.visible) {
                                 attachmentOptionsRow.visible = false;
+                                stickerPickerLoader.active = false;
                             } else {
                                 attachmentOptionsRow.visible = true;
                             }

rpm/harbour-fernschreiber.spec

@@ -12,7 +12,7 @@ Name:       harbour-fernschreiber
 
 Summary:    Fernschreiber is a Telegram client for Sailfish OS
 Version:    0.3
-Release:    1
+Release:    2
 Group:      Qt/Qt
 License:    LICENSE
 URL:        http://werkwolf.eu/

rpm/harbour-fernschreiber.yaml

@@ -1,7 +1,7 @@
 Name: harbour-fernschreiber
 Summary: Fernschreiber is a Telegram client for Sailfish OS
 Version: 0.3
-Release: 1
+Release: 2
 # The contents of the Group field should be one of the groups listed here:
 # https://github.com/mer-tools/spectacle/blob/master/data/GROUPS
 Group: Qt/Qt

src/stickermanager.cpp

@@ -50,6 +50,16 @@ QVariantList StickerManager::getInstalledStickerSets()
     return this->installedStickerSets;
 }
 
+bool StickerManager::needsReload()
+{
+    return this->reloadNeeded;
+}
+
+void StickerManager::setNeedsReload(const bool &reloadNeeded)
+{
+    this->reloadNeeded = reloadNeeded;
+}
+
 void StickerManager::handleRecentStickersUpdated(const QVariantList &stickerIds)
 {
     LOG("Receiving recent stickers...." << stickerIds);
@@ -58,7 +68,7 @@ void StickerManager::handleRecentStickersUpdated(const QVariantList &stickerIds)
 
 void StickerManager::handleStickersReceived(const QVariantList &stickers)
 {
-    LOG("Receiving stickers...." << stickers);
+    LOG("Receiving stickers....");
     QListIterator<QVariant> stickersIterator(stickers);
     while (stickersIterator.hasNext()) {
         QVariantMap newSticker = stickersIterator.next().toMap();
@@ -81,7 +91,7 @@ void StickerManager::handleInstalledStickerSetsUpdated(const QVariantList &stick
 
 void StickerManager::handleStickerSetsReceived(const QVariantList &stickerSets)
 {
-    LOG("Receiving sticker sets...." << stickerSets);
+    LOG("Receiving sticker sets....");
     QListIterator<QVariant> stickerSetsIterator(stickerSets);
     while (stickerSetsIterator.hasNext()) {
         QVariantMap newStickerSet = stickerSetsIterator.next().toMap();
@@ -102,9 +112,20 @@ void StickerManager::handleStickerSetsReceived(const QVariantList &stickerSets)
 
 void StickerManager::handleStickerSetReceived(const QVariantMap &stickerSet)
 {
-    LOG("Receiving complete sticker set...." << stickerSet);
     QString stickerSetId = stickerSet.value("id").toString();
+    LOG("Receiving complete sticker set...." << stickerSetId);
     this->stickerSets.insert(stickerSetId, stickerSet);
     int setIndex = this->stickerSetMap.value(stickerSetId).toInt();
     this->installedStickerSets.replace(setIndex, stickerSet);
+    QVariantList stickerList = stickerSet.value("stickers").toList();
+    QListIterator<QVariant> stickerIterator(stickerList);
+    while (stickerIterator.hasNext()) {
+        QVariantMap singleSticker = stickerIterator.next().toMap();
+        QVariantMap thumbnailFile = singleSticker.value("thumbnail").toMap().value("photo").toMap();
+        QVariantMap thumbnailLocalFile = thumbnailFile.value("local").toMap();
+        if (!thumbnailLocalFile.value("is_downloading_completed").toBool()) {
+            tdLibWrapper->downloadFile(thumbnailFile.value("id").toString());
+            this->reloadNeeded = true;
+        }
+    }
 }

src/stickermanager.h

@@ -35,6 +35,8 @@ public:
 
     Q_INVOKABLE QVariantList getRecentStickers();
     Q_INVOKABLE QVariantList getInstalledStickerSets();
+    Q_INVOKABLE bool needsReload();
+    Q_INVOKABLE void setNeedsReload(const bool &reloadNeeded);
 
 signals:
 
@@ -57,6 +59,7 @@ private:
     QVariantMap stickers;
     QVariantMap stickerSets;
     QVariantMap stickerSetMap;
+    bool reloadNeeded;
 
 };
 

src/tdlibwrapper.cpp

@@ -337,9 +337,9 @@ void TDLibWrapper::sendDocumentMessage(const QString &chatId, const QString &fil
     this->sendRequest(requestObject);
 }
 
-void TDLibWrapper::sendStickerMessage(const QString &chatId, const QString &filePath, const QString &replyToMessageId)
+void TDLibWrapper::sendStickerMessage(const QString &chatId, const QString &fileId, const QString &replyToMessageId)
 {
-    LOG("Sending sticker message" << chatId << filePath << replyToMessageId);
+    LOG("Sending sticker message" << chatId << fileId << replyToMessageId);
     QVariantMap requestObject;
     requestObject.insert(_TYPE, "sendMessage");
     requestObject.insert("chat_id", chatId);
@@ -350,8 +350,8 @@ void TDLibWrapper::sendStickerMessage(const QString &chatId, const QString &file
     inputMessageContent.insert(_TYPE, "inputMessageSticker");
 
     QVariantMap stickerInputFile;
-    stickerInputFile.insert(_TYPE, "inputFileLocal");
-    stickerInputFile.insert("path", filePath);
+    stickerInputFile.insert(_TYPE, "inputFileRemote");
+    stickerInputFile.insert("id", fileId);
 
     inputMessageContent.insert("sticker", stickerInputFile);
 

src/tdlibwrapper.h

@@ -118,7 +118,7 @@ public:
     Q_INVOKABLE void sendPhotoMessage(const QString &chatId, const QString &filePath, const QString &message, const QString &replyToMessageId = "0");
     Q_INVOKABLE void sendVideoMessage(const QString &chatId, const QString &filePath, const QString &message, const QString &replyToMessageId = "0");
     Q_INVOKABLE void sendDocumentMessage(const QString &chatId, const QString &filePath, const QString &message, const QString &replyToMessageId = "0");
-    Q_INVOKABLE void sendStickerMessage(const QString &chatId, const QString &filePath, const QString &replyToMessageId = "0");
+    Q_INVOKABLE void sendStickerMessage(const QString &chatId, const QString &fileId, const QString &replyToMessageId = "0");
     Q_INVOKABLE void getMessage(const QString &chatId, const QString &messageId);
     Q_INVOKABLE void setOptionInteger(const QString &optionName, const int &optionValue);
     Q_INVOKABLE void setChatNotificationSettings(const QString &chatId, const QVariantMap &notificationSettings);

translations/harbour-fernschreiber-de.ts

@@ -527,7 +527,11 @@
     <name>StickerPicker</name>
     <message>
         <source>Recently used</source>
-        <translation type="unfinished"></translation>
+        <translation>Kürzlich verwendet</translation>
+    </message>
+    <message>
+        <source>Loading stickers...</source>
+        <translation>Lade Sticker...</translation>
     </message>
 </context>
 <context>

translations/harbour-fernschreiber-es.ts

@@ -527,7 +527,11 @@
     <name>StickerPicker</name>
     <message>
         <source>Recently used</source>
-        <translation type="unfinished"></translation>
+        <translation>Usado recientemente</translation>
+    </message>
+    <message>
+        <source>Loading stickers...</source>
+        <translation>Cargando pegatinas...</translation>
     </message>
 </context>
 <context>

translations/harbour-fernschreiber-fi.ts

@@ -529,6 +529,10 @@
         <source>Recently used</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Loading stickers...</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>VideoPage</name>

translations/harbour-fernschreiber-hu.ts

@@ -529,6 +529,10 @@
         <source>Recently used</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Loading stickers...</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>VideoPage</name>

translations/harbour-fernschreiber-it.ts

@@ -529,6 +529,10 @@
         <source>Recently used</source>
         <translation>Usati di recente</translation>
     </message>
+    <message>
+        <source>Loading stickers...</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>VideoPage</name>

translations/harbour-fernschreiber-pl.ts

@@ -529,6 +529,10 @@
         <source>Recently used</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Loading stickers...</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>VideoPage</name>

translations/harbour-fernschreiber-ru.ts

@@ -529,6 +529,10 @@
         <source>Recently used</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Loading stickers...</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>VideoPage</name>

translations/harbour-fernschreiber-zh_CN.ts

@@ -529,6 +529,10 @@
         <source>Recently used</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Loading stickers...</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>VideoPage</name>

translations/harbour-fernschreiber.ts

@@ -529,6 +529,10 @@
         <source>Recently used</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Loading stickers...</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>VideoPage</name>