Reorganize title bar, introduce interaction hint

2021-01-02 16:10:01 +01:00 · 2021-01-02 16:10:01 +01:00 · 473c603451
commit 473c603451
parent 2c078307dc
14 changed files with 109 additions and 30 deletions
--- 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.visible = true;
+                appSettings.remainingInteractionHints = remainingInteractionHints - 1;
+            }
        }
    }

@ -164,7 +171,6 @@ Page {
        if (chatSearchField.text === "") {
            chatSearchField.visible = false;
            pageHeader.visible = true;
-            searchChatButton.visible = overviewPage.connectionState === TelegramAPI.ConnectionReady;
        }
        chatSearchField.focus = false;
        overviewPage.focus = true;
@ -254,43 +260,34 @@ Page {

        Row {
            id: headerRow
-            width: parent.width - Theme.horizontalPageMargin
-
-            GlassItem {
-                id: pageStatus
-                width: Theme.itemSizeMedium
-                height: Theme.itemSizeMedium
-                color: "red"
-                falloffRadius: 0.1
-                radius: 0.2
-                cache: false
-            }
+            width: parent.width

            PageHeader {
                id: pageHeader
                title: qsTr("Fernschreiber")
-                width: visible ? ( parent.width - pageStatus.width - searchChatButton.width ) : 0
+                leftMargin: Theme.itemSizeMedium
                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
+                GlassItem {
+                    id: pageStatus
+                    width: Theme.itemSizeMedium
+                    height: Theme.itemSizeMedium
+                    color: "red"
+                    falloffRadius: 0.1
+                    radius: 0.2
+                    cache: false
                }
-                visible: overviewPage.connectionState === TelegramAPI.ConnectionReady
-                onClicked: {
-                    chatSearchField.focus = true;
-                    chatSearchField.visible = true;
-                    pageHeader.visible = false;
-                    searchChatButton.visible = false;
+
+                MouseArea {
+                    anchors.fill: parent
+                    onClicked: {
+                        chatSearchField.focus = true;
+                        chatSearchField.visible = true;
+                        pageHeader.visible = false;
+                    }
                }
+
            }

            SearchField {
@ -298,7 +295,7 @@ Page {
                visible: false
                opacity: visible ? 1 : 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 === ""
@ -372,4 +369,22 @@ Page {
            }
        }
    }
+
+    Timer {
+        id: interactionHintTimer
+        running: false
+        interval: 4000
+        onTriggered: {
+            titleInteractionHint.visible = false;
+        }
+    }
+
+    InteractionHintLabel {
+        id: titleInteractionHint
+        text: qsTr("Tap on the title bar to filter your chats")
+        visible: false
+        Behavior on opacity { FadeAnimation {} }
+        opacity: visible ? 1 : 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>
--- 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>