Merge pull request #263 from Wunderfitz/lean-overview

Remove magnifying glass, reorganize title bar, introduce interaction hint
This commit is contained in:
Sebastian Wolf 2021-01-02 20:30:04 +01:00 committed by GitHub
commit fd7de65c19
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
14 changed files with 128 additions and 53 deletions

View file

@ -66,6 +66,13 @@ Page {
overviewPage.chatListCreated = true; overviewPage.chatListCreated = true;
chatListView.scrollToTop(); chatListView.scrollToTop();
updateSecondaryContentTimer.start(); 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() { function resetFocus() {
if (chatSearchField.text === "") { if (chatSearchField.text === "") {
chatSearchField.visible = false; chatSearchField.opacity = 0.0;
pageHeader.visible = true; pageHeader.opacity = 1.0;
searchChatButton.visible = overviewPage.connectionState === TelegramAPI.ConnectionReady;
} }
chatSearchField.focus = false; chatSearchField.focus = false;
overviewPage.focus = true; overviewPage.focus = true;
@ -252,9 +258,12 @@ Page {
} }
} }
Row { PageHeader {
id: headerRow id: pageHeader
width: parent.width - Theme.horizontalPageMargin title: qsTr("Fernschreiber")
leftMargin: Theme.itemSizeMedium
visible: opacity > 0
Behavior on opacity { FadeAnimation {} }
GlassItem { GlassItem {
id: pageStatus id: pageStatus
@ -266,39 +275,23 @@ Page {
cache: false cache: false
} }
PageHeader { MouseArea {
id: pageHeader anchors.fill: parent
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
onClicked: { onClicked: {
chatSearchField.focus = true; chatSearchField.focus = true;
chatSearchField.visible = true; chatSearchField.opacity = 1.0;
pageHeader.visible = false; pageHeader.opacity = 0.0;
searchChatButton.visible = false;
} }
} }
}
SearchField { SearchField {
id: chatSearchField id: chatSearchField
visible: false visible: opacity > 0
opacity: visible ? 1 : 0 opacity: 0
Behavior on opacity { FadeAnimation {} } Behavior on opacity { FadeAnimation {} }
width: visible ? ( parent.width - pageStatus.width ) : 0 width: parent.width
height: pageHeader.height height: pageHeader.height
placeholderText: qsTr("Filter your chats...") placeholderText: qsTr("Filter your chats...")
canHide: text === "" canHide: text === ""
@ -317,12 +310,10 @@ Page {
} }
} }
}
SilicaListView { SilicaListView {
id: chatListView id: chatListView
anchors { anchors {
top: headerRow.bottom top: pageHeader.bottom
bottom: parent.bottom bottom: parent.bottom
left: parent.left left: parent.left
right: parent.right 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
}
} }

View file

@ -29,6 +29,7 @@ namespace {
const QString KEY_NOTIFICATION_TURNS_DISPLAY_ON("notificationTurnsDisplayOn"); const QString KEY_NOTIFICATION_TURNS_DISPLAY_ON("notificationTurnsDisplayOn");
const QString KEY_NOTIFICATION_FEEDBACK("notificationFeedback"); const QString KEY_NOTIFICATION_FEEDBACK("notificationFeedback");
const QString KEY_STORAGE_OPTIMIZER("storageOptimizer"); const QString KEY_STORAGE_OPTIMIZER("storageOptimizer");
const QString KEY_REMAINING_INTERACTION_HINTS("remainingInteractionHints");
} }
AppSettings::AppSettings(QObject *parent) : QObject(parent), settings("harbour-fernschreiber", "settings") AppSettings::AppSettings(QObject *parent) : QObject(parent), settings("harbour-fernschreiber", "settings")
@ -146,3 +147,17 @@ void AppSettings::setStorageOptimizer(bool enable)
emit storageOptimizerChanged(); 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();
}
}

View file

@ -31,6 +31,7 @@ class AppSettings : public QObject {
Q_PROPERTY(bool notificationTurnsDisplayOn READ notificationTurnsDisplayOn WRITE setNotificationTurnsDisplayOn NOTIFY notificationTurnsDisplayOnChanged) Q_PROPERTY(bool notificationTurnsDisplayOn READ notificationTurnsDisplayOn WRITE setNotificationTurnsDisplayOn NOTIFY notificationTurnsDisplayOnChanged)
Q_PROPERTY(NotificationFeedback notificationFeedback READ notificationFeedback WRITE setNotificationFeedback NOTIFY notificationFeedbackChanged) Q_PROPERTY(NotificationFeedback notificationFeedback READ notificationFeedback WRITE setNotificationFeedback NOTIFY notificationFeedbackChanged)
Q_PROPERTY(bool storageOptimizer READ storageOptimizer WRITE setStorageOptimizer NOTIFY storageOptimizerChanged) Q_PROPERTY(bool storageOptimizer READ storageOptimizer WRITE setStorageOptimizer NOTIFY storageOptimizerChanged)
Q_PROPERTY(int remainingInteractionHints READ remainingInteractionHints WRITE setRemainingInteractionHints NOTIFY remainingInteractionHintsChanged)
public: public:
enum NotificationFeedback { enum NotificationFeedback {
@ -67,6 +68,9 @@ public:
bool storageOptimizer() const; bool storageOptimizer() const;
void setStorageOptimizer(bool enable); void setStorageOptimizer(bool enable);
int remainingInteractionHints() const;
void setRemainingInteractionHints(int remainingHints);
signals: signals:
void sendByEnterChanged(); void sendByEnterChanged();
void focusTextAreaAfterSendChanged(); void focusTextAreaAfterSendChanged();
@ -76,6 +80,7 @@ signals:
void notificationTurnsDisplayOnChanged(); void notificationTurnsDisplayOnChanged();
void notificationFeedbackChanged(); void notificationFeedbackChanged();
void storageOptimizerChanged(); void storageOptimizerChanged();
void remainingInteractionHintsChanged();
private: private:
QSettings settings; QSettings settings;

View file

@ -1080,6 +1080,10 @@
<source>Download failed.</source> <source>Download failed.</source>
<translation>Download fehlgeschlagen.</translation> <translation>Download fehlgeschlagen.</translation>
</message> </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>
<context> <context>
<name>PinnedMessageItem</name> <name>PinnedMessageItem</name>

View file

@ -1080,6 +1080,10 @@
<source>Download failed.</source> <source>Download failed.</source>
<translation>Download failed.</translation> <translation>Download failed.</translation>
</message> </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>
<context> <context>
<name>PinnedMessageItem</name> <name>PinnedMessageItem</name>

View file

@ -1069,6 +1069,10 @@
<source>Download failed.</source> <source>Download failed.</source>
<translation>Error al bajar</translation> <translation>Error al bajar</translation>
</message> </message>
<message>
<source>Tap on the title bar to filter your chats</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>PinnedMessageItem</name> <name>PinnedMessageItem</name>

View file

@ -1081,6 +1081,10 @@
<source>Download failed.</source> <source>Download failed.</source>
<translation type="unfinished">Lataus epäonnistui.</translation> <translation type="unfinished">Lataus epäonnistui.</translation>
</message> </message>
<message>
<source>Tap on the title bar to filter your chats</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>PinnedMessageItem</name> <name>PinnedMessageItem</name>

View file

@ -1069,6 +1069,10 @@
<source>Download failed.</source> <source>Download failed.</source>
<translation type="unfinished">A letöltés nem sikerült.</translation> <translation type="unfinished">A letöltés nem sikerült.</translation>
</message> </message>
<message>
<source>Tap on the title bar to filter your chats</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>PinnedMessageItem</name> <name>PinnedMessageItem</name>

View file

@ -1080,6 +1080,10 @@
<source>Download failed.</source> <source>Download failed.</source>
<translation type="unfinished">Download non riuscito.</translation> <translation type="unfinished">Download non riuscito.</translation>
</message> </message>
<message>
<source>Tap on the title bar to filter your chats</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>PinnedMessageItem</name> <name>PinnedMessageItem</name>

View file

@ -1091,6 +1091,10 @@
<source>Download failed.</source> <source>Download failed.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>Tap on the title bar to filter your chats</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>PinnedMessageItem</name> <name>PinnedMessageItem</name>

View file

@ -1091,6 +1091,10 @@
<source>Download failed.</source> <source>Download failed.</source>
<translation type="unfinished">Ошибка скачивания.</translation> <translation type="unfinished">Ошибка скачивания.</translation>
</message> </message>
<message>
<source>Tap on the title bar to filter your chats</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>PinnedMessageItem</name> <name>PinnedMessageItem</name>

View file

@ -1080,6 +1080,10 @@
<source>Download failed.</source> <source>Download failed.</source>
<translation>Nerladdning misslyckades.</translation> <translation>Nerladdning misslyckades.</translation>
</message> </message>
<message>
<source>Tap on the title bar to filter your chats</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>PinnedMessageItem</name> <name>PinnedMessageItem</name>

View file

@ -1069,6 +1069,10 @@
<source>Download failed.</source> <source>Download failed.</source>
<translation></translation> <translation></translation>
</message> </message>
<message>
<source>Tap on the title bar to filter your chats</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>PinnedMessageItem</name> <name>PinnedMessageItem</name>

View file

@ -1080,6 +1080,10 @@
<source>Download failed.</source> <source>Download failed.</source>
<translation type="unfinished">Download failed.</translation> <translation type="unfinished">Download failed.</translation>
</message> </message>
<message>
<source>Tap on the title bar to filter your chats</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>PinnedMessageItem</name> <name>PinnedMessageItem</name>