Add typing notification.

This commit is contained in:
Black Hat 2018-12-23 11:24:01 +08:00
parent e5fbdc15ff
commit 316d1429fa
4 changed files with 333 additions and 278 deletions

View File

@ -69,12 +69,19 @@ Item {
onClicked: roomDrawer.open() onClicked: roomDrawer.open()
} }
AutoListView { ColumnLayout {
Layout.fillWidth: true Layout.fillWidth: true
Layout.maximumWidth: 960
Layout.fillHeight: true Layout.fillHeight: true
Layout.maximumWidth: 960
Layout.leftMargin: 16 Layout.leftMargin: 16
Layout.rightMargin: 16 Layout.rightMargin: 16
Layout.bottomMargin: 16
spacing: 16
AutoListView {
Layout.fillWidth: true
Layout.fillHeight: true
Layout.alignment: Qt.AlignHCenter Layout.alignment: Qt.AlignHCenter
id: messageListView id: messageListView
@ -363,15 +370,69 @@ Item {
} }
} }
Control {
Layout.maximumWidth: parent.width * 0.8
visible: currentRoom && currentRoom.hasUsersTyping
padding: 8
contentItem: RowLayout {
spacing: 8
Repeater {
model: currentRoom && currentRoom.hasUsersTyping ? currentRoom.usersTyping : null
delegate: Avatar {
Layout.preferredWidth: 24
Layout.preferredHeight: 24
source: modelData.avatarUrl
hint: modelData.displayName
}
}
Rectangle {
Layout.preferredWidth: 6
Layout.preferredHeight: 6
Layout.alignment: Qt.AlignCenter
color: MPalette.accent
radius: height / 2
}
Rectangle {
Layout.preferredWidth: 6
Layout.preferredHeight: 6
Layout.alignment: Qt.AlignCenter
color: MPalette.accent
radius: height / 2
}
Rectangle {
Layout.preferredWidth: 6
Layout.preferredHeight: 6
Layout.alignment: Qt.AlignCenter
color: MPalette.accent
radius: height / 2
}
}
background: Rectangle {
color: MPalette.banner
radius: height / 2
}
}
RoomPanelInput { RoomPanelInput {
Layout.fillWidth: true Layout.fillWidth: true
Layout.margins: 16
Layout.maximumWidth: 960
Layout.alignment: Qt.AlignHCenter Layout.alignment: Qt.AlignHCenter
id: roomPanelInput id: roomPanelInput
} }
} }
}
function goToEvent(eventID) { function goToEvent(eventID) {
var index = messageEventModel.eventIDToIndex(eventID) var index = messageEventModel.eventIDToIndex(eventID)

View File

@ -220,8 +220,7 @@ Control {
text: currentRoom != null ? currentRoom.cachedInput : "" text: currentRoom != null ? currentRoom.cachedInput : ""
background: Item { background: Item {}
}
Rectangle { Rectangle {
width: currentRoom && currentRoom.hasFileUploading ? parent.width * currentRoom.fileUploadingProgress / 100 : 0 width: currentRoom && currentRoom.hasFileUploading ? parent.width * currentRoom.fileUploadingProgress / 100 : 0
@ -251,9 +250,6 @@ Control {
onTriggered: currentRoom.sendTypingNotification(true) onTriggered: currentRoom.sendTypingNotification(true)
} }
ToolTip.visible: currentRoom && currentRoom.hasUsersTyping
ToolTip.text: currentRoom ? currentRoom.usersTyping : ""
Keys.onReturnPressed: { Keys.onReturnPressed: {
if (event.modifiers & Qt.ShiftModifier) { if (event.modifiers & Qt.ShiftModifier) {
insert(cursorPosition, "\n") insert(cursorPosition, "\n")

View File

@ -118,16 +118,14 @@ bool SpectralRoom::hasUsersTyping() {
return count != 0; return count != 0;
} }
QString SpectralRoom::getUsersTyping() { QVariantList SpectralRoom::getUsersTyping() {
QString usersTypingStr;
QList<User*> users = usersTyping(); QList<User*> users = usersTyping();
users.removeOne(localUser()); users.removeOne(localUser());
QVariantList out;
for (User* user : users) { for (User* user : users) {
usersTypingStr += user->displayname() + " "; out.append(QVariant::fromValue(user));
} }
usersTypingStr += users.count() < 2 ? "is" : "are"; return out;
usersTypingStr += " typing.";
return usersTypingStr;
} }
void SpectralRoom::sendTypingNotification(bool isTyping) { void SpectralRoom::sendTypingNotification(bool isTyping) {

View File

@ -13,7 +13,7 @@ using namespace QMatrixClient;
class SpectralRoom : public Room { class SpectralRoom : public Room {
Q_OBJECT Q_OBJECT
Q_PROPERTY(bool hasUsersTyping READ hasUsersTyping NOTIFY typingChanged) Q_PROPERTY(bool hasUsersTyping READ hasUsersTyping NOTIFY typingChanged)
Q_PROPERTY(QString usersTyping READ getUsersTyping NOTIFY typingChanged) Q_PROPERTY(QVariantList usersTyping READ getUsersTyping NOTIFY typingChanged)
Q_PROPERTY(QString cachedInput READ cachedInput WRITE setCachedInput NOTIFY Q_PROPERTY(QString cachedInput READ cachedInput WRITE setCachedInput NOTIFY
cachedInputChanged) cachedInputChanged)
Q_PROPERTY(bool hasFileUploading READ hasFileUploading NOTIFY Q_PROPERTY(bool hasFileUploading READ hasFileUploading NOTIFY
@ -43,7 +43,7 @@ class SpectralRoom : public Room {
} }
bool hasUsersTyping(); bool hasUsersTyping();
QString getUsersTyping(); QVariantList getUsersTyping();
QString lastEvent(); QString lastEvent();
bool isEventHighlighted(const QMatrixClient::RoomEvent* e) const; bool isEventHighlighted(const QMatrixClient::RoomEvent* e) const;