ESCA111/neochat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Init UserListModel.

Browse Source 
Another model from Quaternion.
Also UI tweaks in RoomListModel.
This commit is contained in:
Black Hat
2018-08-26 13:17:12 +08:00
parent 8c4ef9ad01
commit 0ad9ed7b5d
9 changed files with 287 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
qml/Login.qml
View File

@@ -6,7 +6,7 @@ import QtQuick.Controls.Material 2.2
import Qt.labs.settings 1.0
import Matrique.Settings 0.1
import "qrc:/qml/component"
import "component"
Page {
property var controller

2
qml/Room.qml
View File

@@ -4,7 +4,7 @@ import QtQuick.Layouts 1.3
import Matrique 0.1
import Matrique.Settings 0.1
import "qrc:/qml/form"
import "form"
Page {
property alias connection: roomListModel.connection

4
qml/component/ImageStatus.qml
View File

@@ -56,7 +56,9 @@ Item {
function getInitials(text) {
if (!text) return "N"
return text.toUpperCase().replace(/[^a-zA-Z- ]/g, "").match(/\b\w/g);
var initial = text.toUpperCase().replace(/[^a-zA-Z- ]/g, "").match(/\b\w/g);
if (!initial) return "N"
return initial
}
function stringToColor(str) {

128
qml/form/RoomForm.qml
View File

@@ -7,7 +7,7 @@ import QtGraphicalEffects 1.0
import Matrique 0.1
import Matrique.Settings 0.1
import "qrc:/qml/component"
import "../component"
import "qrc:/js/md.js" as Markdown
Item {
@@ -15,6 +15,12 @@ Item {
id: item
UserListModel {
id: userListModel
room: currentRoom
}
Drawer {
id: roomDrawer
@@ -30,34 +36,34 @@ Item {
onClicked: roomDrawer.close()
}
Column {
ColumnLayout {
anchors.fill: parent
anchors.margins: 32
spacing: 16
ImageStatus {
width: 64
height: 64
anchors.horizontalCenter: parent.horizontalCenter
Layout.preferredWidth: 64
Layout.preferredHeight: 64
Layout.alignment: Qt.AlignHCenter
source: currentRoom && currentRoom.avatarUrl != "" ? "image://mxc/" + currentRoom.avatarUrl : null
displayText: currentRoom ? currentRoom.displayName : ""
}
Label {
width: parent.width
Layout.fillWidth: true
horizontalAlignment: Text.AlignHCenter
text: currentRoom && currentRoom.id ? currentRoom.id : ""
}
Label {
width: parent.width
Layout.fillWidth: true
horizontalAlignment: Text.AlignHCenter
text: currentRoom && currentRoom.canonicalAlias ? currentRoom.canonicalAlias : "No Canonical Alias"
}
RowLayout {
width: parent.width
Layout.fillWidth: true
TextField {
id: roomNameField
@@ -67,7 +73,7 @@ Item {
ItemDelegate {
Layout.preferredWidth: height
Layout.fillHeight: true
Layout.preferredHeight: parent.height
contentItem: MaterialIcon { icon: "\ue5ca" }
@@ -76,7 +82,7 @@ Item {
}
RowLayout {
width: parent.width
Layout.fillWidth: true
TextField {
id: roomTopicField
@@ -87,13 +93,51 @@ Item {
ItemDelegate {
Layout.preferredWidth: height
Layout.fillHeight: true
Layout.preferredHeight: parent.height
contentItem: MaterialIcon { icon: "\ue5ca" }
onClicked: currentRoom.setTopic(roomTopicField.text)
}
}
ListView {
Layout.fillWidth: true
Layout.fillHeight: true
clip: true
boundsBehavior: Flickable.DragOverBounds
delegate: ItemDelegate {
width: parent.width
height: 48
RowLayout {
anchors.fill: parent
anchors.margins: 8
spacing: 16
ImageStatus {
Layout.preferredWidth: height
Layout.fillHeight: true
source: avatar != "" ? "image://mxc/" + avatar : ""
displayText: name
}
Label {
Layout.fillWidth: true
text: name
}
}
}
model: userListModel
ScrollBar.vertical: ScrollBar {}
}
}
}
@@ -119,49 +163,49 @@ Item {
color: MSettings.darkTheme ? "#242424" : "#eaeaea"
MouseArea {
ItemDelegate {
anchors.fill: parent
onClicked: roomDrawer.open()
}
RowLayout {
anchors.fill: parent
anchors.margins: 16
RowLayout {
anchors.fill: parent
anchors.margins: 16
spacing: 16
spacing: 16
ImageStatus {
Layout.preferredWidth: height
Layout.fillHeight: true
source: currentRoom && currentRoom.avatarUrl != "" ? "image://mxc/" + currentRoom.avatarUrl : null
displayText: currentRoom ? currentRoom.displayName : ""
}
ColumnLayout {
Layout.fillWidth: true
Layout.fillHeight: true
Layout.alignment: Qt.AlignHCenter
visible: parent.width > 80
Label {
Layout.fillWidth: true
ImageStatus {
Layout.preferredWidth: height
Layout.fillHeight: true
text: currentRoom ? currentRoom.displayName : ""
font.pointSize: 16
elide: Text.ElideRight
wrapMode: Text.NoWrap
source: currentRoom && currentRoom.avatarUrl != "" ? "image://mxc/" + currentRoom.avatarUrl : null
displayText: currentRoom ? currentRoom.displayName : ""
}
Label {
ColumnLayout {
Layout.fillWidth: true
Layout.fillHeight: true
Layout.alignment: Qt.AlignHCenter
text: currentRoom ? currentRoom.topic : ""
elide: Text.ElideRight
wrapMode: Text.NoWrap
visible: parent.width > 80
Label {
Layout.fillWidth: true
Layout.fillHeight: true
text: currentRoom ? currentRoom.displayName : ""
font.pointSize: 16
elide: Text.ElideRight
wrapMode: Text.NoWrap
}
Label {
Layout.fillWidth: true
Layout.fillHeight: true
text: currentRoom ? currentRoom.topic : ""
elide: Text.ElideRight
wrapMode: Text.NoWrap
}
}
}
}

8
qml/form/RoomListForm.qml
View File

@@ -8,7 +8,7 @@ import Matrique 0.1
import SortFilterProxyModel 0.2
import Matrique.Settings 0.1
import "qrc:/qml/component"
import "../component"
Item {
property alias listModel: roomListProxyModel.sourceModel
@@ -115,11 +115,13 @@ Item {
ScrollBar.vertical: ScrollBar { id: scrollBar }
delegate: Rectangle {
readonly property bool highlighted: currentRoom === enteredRoom
id: swipeDelegate
width: parent.width
height: 80
color: currentRoom === enteredRoom ? Material.background : "transparent"
color: highlighted ? Material.background : "transparent"
AutoMouseArea {
anchors.fill: parent
@@ -137,7 +139,7 @@ Item {
width: 4
height: parent.height
color: Qt.tint(Material.accent, "#20FFFFFF")
visible: unreadCount > 0
visible: unreadCount > 0 || highlighted
}
RowLayout {