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

Add join room/create room/create direct chat && small bug fixes.

Browse Source
This commit is contained in:
Black Hat
2018-08-01 20:26:29 +08:00
parent 22ad70cc49
commit 5c606f1d5d
12 changed files with 148 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
qml/component/ImageBubble.qml
View File

@@ -21,8 +21,7 @@ AvatarContainer {
Image {
id: messageImage
z: -4
sourceSize.width: width
sourceSize.height: height
sourceSize.width: 128
source: "image://mxc/" + (content.thumbnail_url ? content.thumbnail_url : content.url)
MouseArea {

5
qml/component/ImageStatus.qml
View File

@@ -32,7 +32,6 @@ Item {
layer.enabled: true
fillMode: Image.PreserveAspectCrop
sourceSize.width: item.width
sourceSize.height: item.width
layer.effect: OpacityMask {
maskSource: Item {
@@ -74,8 +73,8 @@ Item {
hash = str.charCodeAt(i) + ((hash << 5) - hash);
}
var colour = '#';
for (var i = 0; i < 3; i++) {
var value = (hash >> (i * 8)) & 0xFF;
for (var j = 0; j < 3; j++) {
var value = (hash >> (j * 8)) & 0xFF;
colour += ('00' + value.toString(16)).substr(-2);
}
return colour;

2
qml/component/MessageBubble.qml
View File

@@ -42,7 +42,7 @@ AvatarContainer {
id: timeText
visible: Math.abs(time - aboveTime) > 600000 || index == 0
Layout.alignment: Qt.AlignRight
text: Qt.formatDateTime(time, "d MMM hh:mm")
text: Qt.formatTime(time, "hh:mm")
color: isNotice || sentByMe ? "grey" : "white"
font.pointSize: 8

28
qml/component/MessageDelegate.qml
View File

@@ -5,36 +5,24 @@ import QtQuick.Controls.Material 2.2
Item {
id: messageDelegate
readonly property bool sentByMe: author === currentRoom.localUser
readonly property bool darkTheme: Material.theme == Material.Dark
readonly property color background: darkTheme ? "#242424" : "lightgrey"
readonly property bool sentByMe: author === currentRoom.localUser
readonly property bool isState: eventType === "state" || eventType === "emote"
readonly property bool isMessage: eventType === "message" || eventType === "notice"
readonly property bool isFile: eventType === "video" || eventType === "audio" || eventType === "file" || eventType === "image"
z: -5
width: delegateLoader.width
height: delegateLoader.height
anchors.right: !(eventType === "state" || eventType === "emote") && sentByMe ? parent.right : undefined
anchors.horizontalCenter: (eventType === "state" || eventType === "emote") ? parent.horizontalCenter : undefined
anchors.right: !isState && sentByMe ? parent.right : undefined
anchors.horizontalCenter: isState ? parent.horizontalCenter : undefined
Loader {
id: delegateLoader
source: {
switch (eventType) {
case "notice":
case "message":
return "MessageBubble.qml"
case "image":
return "ImageBubble.qml"
case "emote":
case "state":
return "StateBubble.qml"
case "video":
case "audio":
case "file":
return "FileBubble.qml"
}
return ""
}
source: isMessage ? "MessageBubble.qml" : isState ? "StateBubble.qml" : isFile ? eventType === "image" ? "ImageBubble.qml" : "FileBubble.qml" : ""
}
}