This commit is contained in:
end-4
2025-04-10 02:06:15 +02:00
parent 179be02e0d
commit 91cef5700a
5 changed files with 119 additions and 13 deletions
+21 -7
View File
@@ -22,17 +22,31 @@ Scope {
// Middle section // Middle section
RowLayout { RowLayout {
anchors.top: parent.top
anchors.bottom: parent.top
anchors.centerIn: parent anchors.centerIn: parent
implicitWidth: 500
// Rectangle { RowLayout {
Layout.fillWidth: true
Layout.fillHeight: true
}
// } RowLayout {
Layout.fillWidth: true
Layout.fillHeight: true
}
// ClockWidget { RowLayout {
// Layout.fillHeight: true Layout.fillWidth: true
// } Layout.fillHeight: true
ClockWidget {
Layout.alignment: Qt.AlignVCenter
}
UtilButtons {
Layout.alignment: Qt.AlignVCenter
}
}
} }
+41 -3
View File
@@ -1,6 +1,44 @@
import QtQuick
import "../common" import "../common"
import QtQuick
import QtQuick.Layouts
Rectangle {
implicitWidth: 200
implicitHeight: 32
color: Appearance.colors.colLayer1
radius: Appearance.rounding.small
RowLayout {
spacing: 4
anchors.centerIn: parent
Text {
renderType: Text.NativeRendering
verticalAlignment: Text.AlignVCenter
font.family: Appearance.font.family.title
font.pointSize: Appearance.font.pointSize.large
text: DateTime.time
color: Appearance.colors.colOnLayer1
}
Text {
renderType: Text.NativeRendering
verticalAlignment: Text.AlignVCenter
font.family: Appearance.font.family.main
font.pointSize: Appearance.font.pointSize.small
text: "•"
color: Appearance.colors.colOnLayer1
}
Text {
renderType: Text.NativeRendering
verticalAlignment: Text.AlignVCenter
font.family: Appearance.font.family.main
font.pointSize: Appearance.font.pointSize.small
text: DateTime.date
color: Appearance.colors.colOnLayer1
}
}
Text {
text: DateTime.time
} }
@@ -0,0 +1,19 @@
import "../common"
import QtQuick
import QtQuick.Layouts
Rectangle {
implicitWidth: 200
implicitHeight: 32
color: Appearance.colors.colLayer1
radius: Appearance.rounding.small
RowLayout {
spacing: 4
anchors.centerIn: parent
}
}
@@ -5,11 +5,13 @@ pragma Singleton
Singleton { Singleton {
property QtObject m3colors property QtObject m3colors
property QtObject colors property QtObject colors
property QtObject rounding
property QtObject font
function mix(color1, color2, percentage) { function mix(color1, color2, percentage) {
var c1 = Qt.color(color1); var c1 = Qt.color(color1);
var c2 = Qt.color(color2); var c2 = Qt.color(color2);
return Qt.rgba((1 - percentage) * c1.r + percentage * c2.r, (1 - percentage) * c1.g + percentage * c2.g, (1 - percentage) * c1.b + percentage * c2.b, (1 - percentage) * c1.a + percentage * c2.a); return Qt.rgba(percentage * c1.r + (1 - percentage) * c2.r, percentage * c1.g + (1 - percentage) * c2.g, percentage * c1.b + (1 - percentage) * c2.b, percentage * c1.a + (1 - percentage) * c2.a);
} }
m3colors: QtObject { m3colors: QtObject {
@@ -96,6 +98,40 @@ Singleton {
property color colOnLayer0: m3colors.m3onBackground property color colOnLayer0: m3colors.m3onBackground
property color colLayer0Hover: mix(colLayer0, colOnLayer0, 0.85) property color colLayer0Hover: mix(colLayer0, colOnLayer0, 0.85)
property color colLayer0Active: m3colors.m3surfaceContainerHigh property color colLayer0Active: m3colors.m3surfaceContainerHigh
property color colLayer1: m3colors.m3surfaceContainerLow;
property color colOnLayer1: m3colors.m3onSurfaceVariant;
property color colOnLayer1Inactive: mix(colOnLayer1, colLayer1, 0.45);
property color colLayer2: mix(m3colors.m3surfaceContainer, m3colors.m3surfaceContainerHigh, 0.55);
property color colOnLayer2: m3colors.m3onSurface;
property color colLayer3: mix(m3colors.m3surfaceContainerHigh, m3colors.m3onSurface, 0.96);
property color colOnLayer3: m3colors.m3onSurface;
}
rounding: QtObject {
property int unsharpen: 2
property int verysmall: 8
property int small: 12
property int normal: 17
property int large: 25
property int full: 9999
}
font: QtObject {
property QtObject family: QtObject {
property string main: "Rubik"
property string title: "Gabarito"
property string iconMaterial: "Material Symbols Rounded"
property string iconNerd: "SpaceMono NF"
property string monospace: "JetBrains Mono NF"
property string reading: "Readex Pro"
}
property QtObject pointSize: QtObject {
property int smaller: 10
property int small: 11
property int normal: 12
property int large: 13
property int larger: 16
}
} }
} }
@@ -7,7 +7,6 @@ pragma Singleton
// your singletons should always have Singleton as the type // your singletons should always have Singleton as the type
Singleton { Singleton {
property string time: Qt.formatDateTime(clock.date, "hh:mm") property string time: Qt.formatDateTime(clock.date, "hh:mm")
// something like Wednesday, 09/04
property string date: Qt.formatDateTime(clock.date, "dddd, dd/MM") property string date: Qt.formatDateTime(clock.date, "dddd, dd/MM")
SystemClock { SystemClock {