Merge remote-tracking branch 'origin/master' into voicenotes

2021-01-02 20:33:03 +01:00 · 2021-01-02 20:33:03 +01:00 · 7c615b5cff
commit 7c615b5cff
parent 1b83fddfe6 fd7de65c19
18 changed files with 136 additions and 61 deletions
--- a/qml/components/AudioPreview.qml
+++ b/qml/components/AudioPreview.qml
@ -444,7 +444,7 @@ Item {
                    anchors.horizontalCenter: parent.horizontalCenter
                    anchors.bottom: positionText.top
                    minimumValue: 0
-                    maximumValue: messageAudio.duration ? messageAudio.duration : 0
+                    maximumValue: messageAudio.duration ? messageAudio.duration : 0.1
                    stepSize: 1
                    value: messageAudio.position
                    enabled: messageAudio.seekable
--- a/qml/components/VideoPreview.qml
+++ b/qml/components/VideoPreview.qml
@ -482,7 +482,7 @@ Item {
                    anchors.horizontalCenter: parent.horizontalCenter
                    anchors.bottom: positionText.top
                    minimumValue: 0
-                    maximumValue: messageVideo.duration ? messageVideo.duration : 0
+                    maximumValue: messageVideo.duration ? messageVideo.duration : 0.1

                    highlighted: videoMessageComponent.highlighted || down
                    stepSize: 1
--- a/qml/pages/AboutPage.qml
+++ b/qml/pages/AboutPage.qml
@ -176,7 +176,7 @@ Page {
                        }

                        ProfileThumbnail {
-                            photoData: aboutPage.userInformation.profile_photo.small
+                            photoData: ((typeof aboutPage.userInformation.profile_photo !== "undefined") ? aboutPage.userInformation.profile_photo.small : {})
                            width: Theme.itemSizeExtraLarge
                            height: Theme.itemSizeExtraLarge
                            replacementStringHint: aboutPage.userInformation.first_name + " " + aboutPage.userInformation.last_name
--- a/qml/pages/ChatPage.qml
+++ b/qml/pages/ChatPage.qml
@ -465,7 +465,7 @@ Page {
                Debug.log("[ChatPage] Received pinned message");
                pinnedMessageItem.pinnedMessage = message;
            }
-            if (messageId === chatInformation.draft_message.reply_to_message_id) {
+            if (chatInformation.draft_message && messageId === chatInformation.draft_message.reply_to_message_id) {
                newMessageInReplyToRow.inReplyToMessage = message;
            }
        }
--- a/qml/pages/OverviewPage.qml
+++ b/qml/pages/OverviewPage.qml
@ -66,6 +66,13 @@ Page {
            overviewPage.chatListCreated = true;
            chatListView.scrollToTop();
            updateSecondaryContentTimer.start();
+            var remainingInteractionHints = appSettings.remainingInteractionHints;
+            Debug.log("Remaining interaction hints: " + remainingInteractionHints);
+            if (remainingInteractionHints > 0) {
+                interactionHintTimer.start();
+                titleInteractionHint.opacity = 1.0;
+                appSettings.remainingInteractionHints = remainingInteractionHints - 1;
+            }
        }
    }

@ -162,9 +169,8 @@ Page {

    function resetFocus() {
        if (chatSearchField.text === "") {
-            chatSearchField.visible = false;
-            pageHeader.visible = true;
-            searchChatButton.visible = overviewPage.connectionState === TelegramAPI.ConnectionReady;
+            chatSearchField.opacity = 0.0;
+            pageHeader.opacity = 1.0;
        }
        chatSearchField.focus = false;
        overviewPage.focus = true;
@ -252,9 +258,12 @@ Page {
            }
        }

-        Row {
-            id: headerRow
-            width: parent.width - Theme.horizontalPageMargin
+        PageHeader {
+            id: pageHeader
+            title: qsTr("Fernschreiber")
+            leftMargin: Theme.itemSizeMedium
+            visible: opacity > 0
+            Behavior on opacity { FadeAnimation {} }

            GlassItem {
                id: pageStatus
@ -266,39 +275,23 @@ Page {
                cache: false
            }

-            PageHeader {
-                id: pageHeader
-                title: qsTr("Fernschreiber")
-                width: visible ? ( parent.width - pageStatus.width - searchChatButton.width ) : 0
-                opacity: visible ? 1 : 0
-                Behavior on opacity { FadeAnimation {} }
-            }
-
-            IconButton {
-                id: searchChatButton
-                width: visible ? height : 0
-                opacity: visible ? 1 : 0
-                Behavior on opacity { NumberAnimation {} }
-                anchors.verticalCenter: parent.verticalCenter
-                icon {
-                    source: "image://theme/icon-m-search?" + Theme.highlightColor
-                    asynchronous: true
-                }
-                visible: overviewPage.connectionState === TelegramAPI.ConnectionReady
+            MouseArea {
+                anchors.fill: parent
                onClicked: {
                    chatSearchField.focus = true;
-                    chatSearchField.visible = true;
-                    pageHeader.visible = false;
-                    searchChatButton.visible = false;
+                    chatSearchField.opacity = 1.0;
+                    pageHeader.opacity = 0.0;
                }
            }

+        }
+
        SearchField {
            id: chatSearchField
-                visible: false
-                opacity: visible ? 1 : 0
+            visible: opacity > 0
+            opacity: 0
            Behavior on opacity { FadeAnimation {} }
-                width: visible ? ( parent.width - pageStatus.width ) : 0
+            width: parent.width
            height: pageHeader.height
            placeholderText: qsTr("Filter your chats...")
            canHide: text === ""
@ -317,12 +310,10 @@ Page {
            }
        }

-        }
-
        SilicaListView {
            id: chatListView
            anchors {
-                top: headerRow.bottom
+                top: pageHeader.bottom
                bottom: parent.bottom
                left: parent.left
                right: parent.right
@ -372,4 +363,24 @@ Page {
            }
        }
    }
+
+    Timer {
+        id: interactionHintTimer
+        running: false
+        interval: 4000
+        onTriggered: {
+            titleInteractionHint.opacity = 0.0;
+        }
+    }
+
+    InteractionHintLabel {
+        id: titleInteractionHint
+        text: qsTr("Tap on the title bar to filter your chats")
+        visible: opacity > 0
+        invert: true
+        anchors.fill: parent
+        Behavior on opacity { FadeAnimation {} }
+        opacity: 0
+    }
+
 }
--- a/src/appsettings.cpp
+++ b/src/appsettings.cpp
@ -29,6 +29,7 @@ namespace {
    const QString KEY_NOTIFICATION_TURNS_DISPLAY_ON("notificationTurnsDisplayOn");
    const QString KEY_NOTIFICATION_FEEDBACK("notificationFeedback");
    const QString KEY_STORAGE_OPTIMIZER("storageOptimizer");
+    const QString KEY_REMAINING_INTERACTION_HINTS("remainingInteractionHints");
 }

 AppSettings::AppSettings(QObject *parent) : QObject(parent), settings("harbour-fernschreiber", "settings")
@ -146,3 +147,17 @@ void AppSettings::setStorageOptimizer(bool enable)
        emit storageOptimizerChanged();
    }
 }
+
+int AppSettings::remainingInteractionHints() const
+{
+    return settings.value(KEY_REMAINING_INTERACTION_HINTS, 3).toInt();
+}
+
+void AppSettings::setRemainingInteractionHints(int remainingHints)
+{
+    if (remainingInteractionHints() != remainingHints) {
+        LOG(KEY_REMAINING_INTERACTION_HINTS << remainingHints);
+        settings.setValue(KEY_REMAINING_INTERACTION_HINTS, remainingHints);
+        emit remainingInteractionHintsChanged();
+    }
+}
--- a/src/appsettings.h
+++ b/src/appsettings.h
@ -31,6 +31,7 @@ class AppSettings : public QObject {
    Q_PROPERTY(bool notificationTurnsDisplayOn READ notificationTurnsDisplayOn WRITE setNotificationTurnsDisplayOn NOTIFY notificationTurnsDisplayOnChanged)
    Q_PROPERTY(NotificationFeedback notificationFeedback READ notificationFeedback WRITE setNotificationFeedback NOTIFY notificationFeedbackChanged)
    Q_PROPERTY(bool storageOptimizer READ storageOptimizer WRITE setStorageOptimizer NOTIFY storageOptimizerChanged)
+    Q_PROPERTY(int remainingInteractionHints READ remainingInteractionHints WRITE setRemainingInteractionHints NOTIFY remainingInteractionHintsChanged)

 public:
    enum NotificationFeedback {
@ -67,6 +68,9 @@ public:
    bool storageOptimizer() const;
    void setStorageOptimizer(bool enable);

+    int remainingInteractionHints() const;
+    void setRemainingInteractionHints(int remainingHints);
+
 signals:
    void sendByEnterChanged();
    void focusTextAreaAfterSendChanged();
@ -76,6 +80,7 @@ signals:
    void notificationTurnsDisplayOnChanged();
    void notificationFeedbackChanged();
    void storageOptimizerChanged();
+    void remainingInteractionHintsChanged();

 private:
    QSettings settings;
--- a/translations/harbour-fernschreiber-de.ts
+++ b/translations/harbour-fernschreiber-de.ts
@ -1080,6 +1080,10 @@
        <source>Download failed.</source>
        <translation>Download fehlgeschlagen.</translation>
    </message>
+    <message>
+        <source>Tap on the title bar to filter your chats</source>
+        <translation>Tippen Sie auf die Titelleiste, um Ihre Chats zu filtern</translation>
+    </message>
 </context>
 <context>
    <name>PinnedMessageItem</name>
--- a/translations/harbour-fernschreiber-en.ts
+++ b/translations/harbour-fernschreiber-en.ts
@ -1080,6 +1080,10 @@
        <source>Download failed.</source>
        <translation>Download failed.</translation>
    </message>
+    <message>
+        <source>Tap on the title bar to filter your chats</source>
+        <translation>Tap on the title bar to filter your chats</translation>
+    </message>
 </context>
 <context>
    <name>PinnedMessageItem</name>
--- a/translations/harbour-fernschreiber-es.ts
+++ b/translations/harbour-fernschreiber-es.ts
@ -1069,6 +1069,10 @@
        <source>Download failed.</source>
        <translation>Error al bajar</translation>
    </message>
+    <message>
+        <source>Tap on the title bar to filter your chats</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>PinnedMessageItem</name>
@ -1279,13 +1283,13 @@
    </message>
    <message numerus="yes">
        <source>%1 members</source>
-        <translation type="unfinished">
+        <translation>
            <numerusform>%1 miembros</numerusform>
        </translation>
    </message>
    <message numerus="yes">
        <source>%1 subscribers</source>
-        <translation type="unfinished">
+        <translation>
            <numerusform>%1 suscriptores</numerusform>
        </translation>
    </message>
@ -1378,11 +1382,11 @@
    </message>
    <message>
        <source>Focus text input area after send</source>
-        <translation type="unfinished"></translation>
+        <translation>Enfocar el área de entrada de texto después de enviar</translation>
    </message>
    <message>
        <source>Focus the text input area after sending a message</source>
-        <translation type="unfinished"></translation>
+        <translation>Enfocar el área de entrada de texto después de enviar un mensaje</translation>
    </message>
 </context>
 <context>
--- a/translations/harbour-fernschreiber-fi.ts
+++ b/translations/harbour-fernschreiber-fi.ts
@ -1081,6 +1081,10 @@
        <source>Download failed.</source>
        <translation type="unfinished">Lataus epäonnistui.</translation>
    </message>
+    <message>
+        <source>Tap on the title bar to filter your chats</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>PinnedMessageItem</name>
--- a/translations/harbour-fernschreiber-hu.ts
+++ b/translations/harbour-fernschreiber-hu.ts
@ -1069,6 +1069,10 @@
        <source>Download failed.</source>
        <translation type="unfinished">A letöltés nem sikerült.</translation>
    </message>
+    <message>
+        <source>Tap on the title bar to filter your chats</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>PinnedMessageItem</name>
--- a/translations/harbour-fernschreiber-it.ts
+++ b/translations/harbour-fernschreiber-it.ts
@ -1080,6 +1080,10 @@
        <source>Download failed.</source>
        <translation type="unfinished">Download non riuscito.</translation>
    </message>
+    <message>
+        <source>Tap on the title bar to filter your chats</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>PinnedMessageItem</name>
--- a/translations/harbour-fernschreiber-pl.ts
+++ b/translations/harbour-fernschreiber-pl.ts
@ -1091,6 +1091,10 @@
        <source>Download failed.</source>
        <translation type="unfinished"></translation>
    </message>
+    <message>
+        <source>Tap on the title bar to filter your chats</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>PinnedMessageItem</name>
--- a/translations/harbour-fernschreiber-ru.ts
+++ b/translations/harbour-fernschreiber-ru.ts
@ -1091,6 +1091,10 @@
        <source>Download failed.</source>
        <translation type="unfinished">Ошибка скачивания.</translation>
    </message>
+    <message>
+        <source>Tap on the title bar to filter your chats</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>PinnedMessageItem</name>
--- a/translations/harbour-fernschreiber-sv.ts
+++ b/translations/harbour-fernschreiber-sv.ts
@ -1080,6 +1080,10 @@
        <source>Download failed.</source>
        <translation>Nerladdning misslyckades.</translation>
    </message>
+    <message>
+        <source>Tap on the title bar to filter your chats</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>PinnedMessageItem</name>
--- a/translations/harbour-fernschreiber-zh_CN.ts
+++ b/translations/harbour-fernschreiber-zh_CN.ts
@ -1069,6 +1069,10 @@
        <source>Download failed.</source>
        <translation>下载失败。</translation>
    </message>
+    <message>
+        <source>Tap on the title bar to filter your chats</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>PinnedMessageItem</name>
--- a/translations/harbour-fernschreiber.ts
+++ b/translations/harbour-fernschreiber.ts
@ -1080,6 +1080,10 @@
        <source>Download failed.</source>
        <translation type="unfinished">Download failed.</translation>
    </message>
+    <message>
+        <source>Tap on the title bar to filter your chats</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>PinnedMessageItem</name>