d3v1l/matrixion
1
0
Fork 0
mirror of https://github.com/Nheko-Reborn/nheko.git synced 2024-11-22 19:08:58 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #906 from LorenDB/offlineIndicator

Browse source 
Add offline indicator
This commit is contained in:
DeepBlueV7.X 2022-02-04 07:13:53 +01:00 committed by GitHub
commit 00116e8128
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 100 additions and 80 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

167
resources/qml/ChatPage.qml
View file

@ -17,111 +17,120 @@ Rectangle {
color: Nheko.colors.window color: Nheko.colors.window
AdaptiveLayout { ColumnLayout {
id: adaptiveView spacing: 0
anchors.fill: parent anchors.fill: parent
singlePageMode: communityListC.preferredWidth + roomListC.preferredWidth + timlineViewC.minimumWidth > width
pageIndex: 1
Component.onCompleted: initializePageIndex() Rectangle {
onSinglePageModeChanged: initializePageIndex() id: offlineIndicator
function initializePageIndex() { color: Nheko.theme.error
if (!singlePageMode) visible: !TimelineManager.isConnected
adaptiveView.pageIndex = 0; Layout.preferredHeight: offlineLabel.height + Nheko.paddingMedium
else if (Rooms.currentRoom || Rooms.currentRoomPreview.roomid) Layout.fillWidth: true
adaptiveView.pageIndex = 2;
else
adaptiveView.pageIndex = 1;
}
Connections { Label {
target: Rooms id: offlineLabel
function onCurrentRoomChanged() {
adaptiveView.initializePageIndex(); anchors.centerIn: parent
text: qsTr("No network connection")
} }
} }
Connections { AdaptiveLayout {
target: Communities id: adaptiveView
function onCurrentTagIdChanged() {
adaptiveView.initializePageIndex();
}
}
onPageIndexChanged: { Layout.fillWidth: true
if (adaptiveView.pageIndex == 1 && (Rooms.currentRoom || Rooms.currentRoomPreview.roomid)) { Layout.fillHeight: true
Rooms.resetCurrentRoom(); singlePageMode: communityListC.preferredWidth + roomListC.preferredWidth + timlineViewC.minimumWidth > width
} pageIndex: 1
}
AdaptiveLayoutElement { Component.onCompleted: initializePageIndex()
id: communityListC onSinglePageModeChanged: initializePageIndex()
visible: Settings.groupView function initializePageIndex() {
minimumWidth: communitiesList.avatarSize * 4 + Nheko.paddingMedium * 2 if (!singlePageMode)
collapsedWidth: communitiesList.avatarSize + 2 * Nheko.paddingMedium adaptiveView.pageIndex = 0;
preferredWidth: Settings.communityListWidth >= minimumWidth ? Settings.communityListWidth : collapsedWidth else if (Rooms.currentRoom || Rooms.currentRoomPreview.roomid)
maximumWidth: communitiesList.avatarSize * 10 + 2 * Nheko.paddingMedium adaptiveView.pageIndex = 2;
else
CommunitiesList { adaptiveView.pageIndex = 1;
id: communitiesList
collapsed: parent.collapsed
} }
Binding { Connections {
target: Settings target: Rooms
property: 'communityListWidth' function onCurrentRoomChanged() {
value: communityListC.preferredWidth adaptiveView.initializePageIndex();
when: !adaptiveView.singlePageMode }
delayed: true
restoreMode: Binding.RestoreBindingOrValue
} }
} AdaptiveLayoutElement {
id: communityListC
AdaptiveLayoutElement { visible: Settings.groupView
id: roomListC minimumWidth: communitiesList.avatarSize * 4 + Nheko.paddingMedium * 2
collapsedWidth: communitiesList.avatarSize + 2 * Nheko.paddingMedium
preferredWidth: Settings.communityListWidth >= minimumWidth ? Settings.communityListWidth : collapsedWidth
maximumWidth: communitiesList.avatarSize * 10 + 2 * Nheko.paddingMedium
minimumWidth: roomlist.avatarSize * 4 + Nheko.paddingSmall * 2 CommunitiesList {
preferredWidth: (Settings.roomListWidth == - 1) id: communitiesList
? (roomlist.avatarSize * 5 + Nheko.paddingSmall * 2)
: (Settings.roomListWidth >= minimumWidth ? Settings.roomListWidth : collapsedWidth)
maximumWidth: roomlist.avatarSize * 10 + Nheko.paddingSmall * 2
collapsedWidth: roomlist.avatarSize + 2 * Nheko.paddingMedium
RoomList { collapsed: parent.collapsed
id: roomlist }
Binding {
target: Settings
property: 'communityListWidth'
value: communityListC.preferredWidth
when: !adaptiveView.singlePageMode
delayed: true
restoreMode: Binding.RestoreBindingOrValue
}
implicitHeight: chatPage.height
collapsed: parent.collapsed
anchors.fill: parent
} }
Binding { AdaptiveLayoutElement {
target: Settings id: roomListC
property: 'roomListWidth'
value: roomListC.preferredWidth minimumWidth: roomlist.avatarSize * 4 + Nheko.paddingSmall * 2
when: !adaptiveView.singlePageMode preferredWidth: (Settings.roomListWidth == - 1)
delayed: true ? (roomlist.avatarSize * 5 + Nheko.paddingSmall * 2)
restoreMode: Binding.RestoreBindingOrValue : (Settings.roomListWidth >= minimumWidth ? Settings.roomListWidth : collapsedWidth)
maximumWidth: roomlist.avatarSize * 10 + Nheko.paddingSmall * 2
collapsedWidth: roomlist.avatarSize + 2 * Nheko.paddingMedium
RoomList {
id: roomlist
height: adaptiveView.height
collapsed: parent.collapsed
}
Binding {
target: Settings
property: 'roomListWidth'
value: roomListC.preferredWidth
when: !adaptiveView.singlePageMode
delayed: true
restoreMode: Binding.RestoreBindingOrValue
}
} }
} AdaptiveLayoutElement {
id: timlineViewC
AdaptiveLayoutElement { minimumWidth: fontMetrics.averageCharacterWidth * 40 + Nheko.avatarSize + 2 * Nheko.paddingMedium
id: timlineViewC
minimumWidth: fontMetrics.averageCharacterWidth * 40 + Nheko.avatarSize + 2 * Nheko.paddingMedium TimelineView {
id: timeline
TimelineView { showBackButton: adaptiveView.singlePageMode
id: timeline room: Rooms.currentRoom
roomPreview: Rooms.currentRoomPreview.roomid ? Rooms.currentRoomPreview : null
}
showBackButton: adaptiveView.singlePageMode
room: Rooms.currentRoom
roomPreview: Rooms.currentRoomPreview.roomid ? Rooms.currentRoomPreview : null
} }
} }

1
resources/qml/components/AdaptiveLayout.qml
View file

@ -23,7 +23,6 @@ Container {
onSinglePageModeChanged: if (!singlePageMode) pageIndex = 0 onSinglePageModeChanged: if (!singlePageMode) pageIndex = 0
anchors.fill: parent
Component.onCompleted: { Component.onCompleted: {
for (var i = 0; i < count - 1; i++) { for (var i = 0; i < count - 1; i++) {
let handle_ = handle.createObject(contentChildren[i]); let handle_ = handle.createObject(contentChildren[i]);

8
src/timeline/TimelineViewManager.cpp
View file

@ -162,6 +162,14 @@ TimelineViewManager::TimelineViewManager(CallManager *, ChatPage *parent)
&QApplication::focusWindowChanged, &QApplication::focusWindowChanged,
this, this,
&TimelineViewManager::focusChanged); &TimelineViewManager::focusChanged);
connect(parent, &ChatPage::connectionLost, this, [this] {
isConnected_ = false;
emit isConnectedChanged(false);
});
connect(parent, &ChatPage::connectionRestored, this, [this] {
isConnected_ = true;
emit isConnectedChanged(true);
});
} }
bool bool

4
src/timeline/TimelineViewManager.h
View file

@ -42,6 +42,7 @@ class TimelineViewManager : public QObject
Q_PROPERTY( Q_PROPERTY(
bool isInitialSync MEMBER isInitialSync_ READ isInitialSync NOTIFY initialSyncChanged) bool isInitialSync MEMBER isInitialSync_ READ isInitialSync NOTIFY initialSyncChanged)
Q_PROPERTY(bool isWindowFocused READ isWindowFocused NOTIFY focusChanged) Q_PROPERTY(bool isWindowFocused READ isWindowFocused NOTIFY focusChanged)
Q_PROPERTY(bool isConnected READ isConnected NOTIFY isConnectedChanged)
public: public:
TimelineViewManager(CallManager *callManager, ChatPage *parent = nullptr); TimelineViewManager(CallManager *callManager, ChatPage *parent = nullptr);
@ -54,6 +55,7 @@ public:
Q_INVOKABLE bool isInitialSync() const { return isInitialSync_; } Q_INVOKABLE bool isInitialSync() const { return isInitialSync_; }
bool isWindowFocused() const; bool isWindowFocused() const;
bool isConnected() const { return isConnected_; }
Q_INVOKABLE void openImageOverlay(TimelineModel *room, QString mxcUrl, QString eventId); Q_INVOKABLE void openImageOverlay(TimelineModel *room, QString mxcUrl, QString eventId);
Q_INVOKABLE void openImagePackSettings(QString roomid); Q_INVOKABLE void openImagePackSettings(QString roomid);
Q_INVOKABLE void saveMedia(QString mxcUrl); Q_INVOKABLE void saveMedia(QString mxcUrl);
@ -73,6 +75,7 @@ public:
signals: signals:
void activeTimelineChanged(TimelineModel *timeline); void activeTimelineChanged(TimelineModel *timeline);
void initialSyncChanged(bool isInitialSync); void initialSyncChanged(bool isInitialSync);
void isConnectedChanged(bool state);
void replyingEventChanged(QString replyingEvent); void replyingEventChanged(QString replyingEvent);
void replyClosed(); void replyClosed();
void inviteUsers(QString roomId, QStringList users); void inviteUsers(QString roomId, QStringList users);
@ -111,6 +114,7 @@ public slots:
private: private:
bool isInitialSync_ = true; bool isInitialSync_ = true;
bool isConnected_ = true;
RoomlistModel *rooms_ = nullptr; RoomlistModel *rooms_ = nullptr;
CommunitiesModel *communities_ = nullptr; CommunitiesModel *communities_ = nullptr;