Working dark mode && more drawer specific changes.

This commit is contained in:
Black Hat
2018-11-17 20:52:17 +08:00
parent 08ce01473a
commit a7f62c13b0
18 changed files with 829 additions and 452 deletions

View File

@@ -1,6 +1,7 @@
import QtQuick 2.9
import QtQuick.Controls 2.2
import QtQuick.Layouts 1.3
import QtQuick.Controls.Material 2.2
import Spectral.Setting 0.1
import Spectral.Font 0.1
@@ -10,7 +11,7 @@ Text {
id: materialLabel
color: MSettings.darkTheme ? "white" : "dark"
color: Material.foreground
font.pointSize: 16
font.family: MaterialFont.name
horizontalAlignment: Text.AlignHCenter

View File

@@ -1,25 +0,0 @@
import QtQuick 2.9
import QtQuick.Controls 2.2
import QtQuick.Layouts 1.3
import QtQuick.Controls.Material 2.2
import "qrc:/js/util.js" as Util
ItemDelegate {
property var page
property bool selected: stackView.currentItem === page
property color highlightColor: Material.accent
Rectangle {
width: selected ? 4 : 0
height: parent.height
color: highlightColor
Behavior on width {
PropertyAnimation { easing.type: Easing.InOutCubic; duration: 200 }
}
}
onClicked: Util.pushToStack(stackView, page)
}

View File

@@ -41,6 +41,7 @@ import QtQuick 2.9
import QtQuick.Controls 2.2
import QtQuick.Layouts 1.3
import QtQuick.Window 2.1
import Spectral.Setting 0.1
Item {
id: root
@@ -64,7 +65,7 @@ Item {
property Component handleDelegate: Rectangle {
width: 1
height: 1
color: "#E1E1E1"
color: MSettings.darkTheme ? "#424242" : "#E1E1E1"
}
/*!

View File

@@ -74,24 +74,6 @@ RowLayout {
spacing: 0
// TimelineLabel {
// Layout.fillWidth: true
// id: authorLabel
// visible: messageRow.avatarVisible
// text: author.displayName
// Material.foreground: Material.accent
// coloredBackground: highlighted
// font.bold: true
// MouseArea {
// anchors.fill: parent
// cursorShape: Qt.PointingHandCursor
// onClicked: roomPanelInput.insert(author.displayName)
// }
// }
TextEdit {
Layout.fillWidth: true
@@ -134,54 +116,6 @@ RowLayout {
active: eventType === "image" || eventType === "file" || eventType === "audio"
}
// Row {
// Layout.alignment: Qt.AlignRight
// spacing: 4
// TimelineLabel {
// visible: userMarker.length > 5
// text: userMarker.length - 5 + "+"
// coloredBackground: highlighted
// Material.foreground: "grey"
// font.pointSize: 8
// }
// Repeater {
// model: userMarker.length > 5 ? userMarker.slice(0, 5) : userMarker
// ImageItem {
// width: parent.height
// height: parent.height
// hint: modelData.displayName
// source: modelData.paintable
// MouseArea {
// anchors.fill: parent
// cursorShape: Qt.PointingHandCursor
// onClicked: {
// readMarkerDialog.listModel = userMarker
// readMarkerDialog.open()
// }
// }
// }
// }
// TimelineLabel {
// id: timeLabel
// visible: Math.abs(time - aboveTime) > 600000 || index == 0
// text: Qt.formatTime(time, "hh:mm")
// coloredBackground: highlighted
// Material.foreground: "grey"
// font.pointSize: 8
// }
// }
}
Component {

View File

@@ -3,7 +3,6 @@ import QtQuick.Controls 2.2
Label {
text: section + " • " + Qt.formatTime(time, "hh:mm")
color: "#1D333E"
font.pointSize: 9.75
font.weight: Font.Medium
font.capitalization: Font.AllUppercase