refactor: use Font.Xxx enum for weights

This commit is contained in:
2 * r + 2 * t 2026-04-21 02:12:25 +10:00
parent 1f900a14ed
commit 6573a62fc5
45 changed files with 94 additions and 94 deletions

View file

@ -15,7 +15,7 @@ ColumnLayout {
StyledText { StyledText {
Layout.topMargin: Tokens.spacing.largeIncreased Layout.topMargin: Tokens.spacing.largeIncreased
text: root.title text: root.title
font: Tokens.font.title.builders.medium.weight(500).build() font: Tokens.font.title.builders.medium.weight(Font.Medium).build()
} }
StyledText { StyledText {

View file

@ -38,7 +38,7 @@ ColumnLayout {
StyledText { StyledText {
text: root.title text: root.title
font: Tokens.font.title.builders.medium.weight(500).build() font: Tokens.font.title.builders.medium.weight(Font.Medium).build()
} }
Item { Item {

View file

@ -59,13 +59,13 @@ Item {
Layout.alignment: Qt.AlignHCenter Layout.alignment: Qt.AlignHCenter
text: "scan_delete" text: "scan_delete"
color: Colours.palette.m3outline color: Colours.palette.m3outline
fontStyle: Tokens.font.icon.builder.size(Tokens.font.icon.extraLarge.pointSize * 2).weight(500).build() fontStyle: Tokens.font.icon.builder.size(Tokens.font.icon.extraLarge.pointSize * 2).weight(Font.Medium).build()
} }
StyledText { StyledText {
text: qsTr("This folder is empty") text: qsTr("This folder is empty")
color: Colours.palette.m3outline color: Colours.palette.m3outline
font: Tokens.font.body.builders.large.weight(500).build() font: Tokens.font.body.builders.large.weight(Font.Medium).build()
} }
} }

View file

@ -34,7 +34,7 @@ Item {
StyledText { StyledText {
text: qsTr("Output device") text: qsTr("Output device")
font: Tokens.font.body.builders.medium.weight(500).build() font: Tokens.font.body.builders.medium.weight(Font.Medium).build()
} }
Repeater { Repeater {
@ -55,7 +55,7 @@ Item {
StyledText { StyledText {
Layout.topMargin: Tokens.spacing.medium Layout.topMargin: Tokens.spacing.medium
text: qsTr("Input device") text: qsTr("Input device")
font: Tokens.font.body.builders.medium.weight(500).build() font: Tokens.font.body.builders.medium.weight(Font.Medium).build()
} }
Repeater { Repeater {
@ -75,7 +75,7 @@ Item {
Layout.topMargin: Tokens.spacing.medium Layout.topMargin: Tokens.spacing.medium
Layout.bottomMargin: -Tokens.spacing.extraSmall Layout.bottomMargin: -Tokens.spacing.extraSmall
text: qsTr("Volume (%1)").arg(Audio.muted ? qsTr("Muted") : `${Math.round(Audio.volume * 100)}%`) text: qsTr("Volume (%1)").arg(Audio.muted ? qsTr("Muted") : `${Math.round(Audio.volume * 100)}%`)
font: Tokens.font.body.builders.medium.weight(500).build() font: Tokens.font.body.builders.medium.weight(Font.Medium).build()
} }
CustomMouseArea { CustomMouseArea {

View file

@ -72,7 +72,7 @@ Column {
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
text: qsTr("Performance Degraded") text: qsTr("Performance Degraded")
color: Colours.palette.m3onError color: Colours.palette.m3onError
font: Tokens.font.mono.builders.medium.weight(500).build() font: Tokens.font.mono.builders.medium.weight(Font.Medium).build()
} }
MaterialIcon { MaterialIcon {

View file

@ -22,7 +22,7 @@ ColumnLayout {
Layout.topMargin: Tokens.padding.medium Layout.topMargin: Tokens.padding.medium
Layout.rightMargin: Tokens.padding.extraSmall Layout.rightMargin: Tokens.padding.extraSmall
text: qsTr("Bluetooth") text: qsTr("Bluetooth")
font: Tokens.font.body.builders.medium.weight(500).build() font: Tokens.font.body.builders.medium.weight(Font.Medium).build()
} }
Toggle { Toggle {

View file

@ -29,7 +29,7 @@ ColumnLayout {
Layout.topMargin: visible ? Tokens.padding.medium : 0 Layout.topMargin: visible ? Tokens.padding.medium : 0
Layout.rightMargin: Tokens.padding.extraSmall Layout.rightMargin: Tokens.padding.extraSmall
text: qsTr("Wireless") text: qsTr("Wireless")
font: Tokens.font.body.builders.medium.weight(500).build() font: Tokens.font.body.builders.medium.weight(Font.Medium).build()
} }
Toggle { Toggle {
@ -106,7 +106,7 @@ ColumnLayout {
Layout.fillWidth: true Layout.fillWidth: true
text: networkItem.modelData.ssid text: networkItem.modelData.ssid
elide: Text.ElideRight elide: Text.ElideRight
font: Tokens.font.body.builders.medium.weight(networkItem.modelData.active ? 500 : 400).build() font: Tokens.font.body.builders.medium.weight(networkItem.modelData.active ? Font.Medium : Font.Normal).build()
color: networkItem.modelData.active ? Colours.palette.m3primary : Colours.palette.m3onSurface color: networkItem.modelData.active ? Colours.palette.m3primary : Colours.palette.m3onSurface
} }
@ -221,7 +221,7 @@ ColumnLayout {
Layout.topMargin: visible ? Tokens.padding.medium : 0 Layout.topMargin: visible ? Tokens.padding.medium : 0
Layout.rightMargin: Tokens.padding.extraSmall Layout.rightMargin: Tokens.padding.extraSmall
text: qsTr("Ethernet") text: qsTr("Ethernet")
font: Tokens.font.body.builders.medium.weight(500).build() font: Tokens.font.body.builders.medium.weight(Font.Medium).build()
} }
StyledText { StyledText {
@ -283,7 +283,7 @@ ColumnLayout {
Layout.fillWidth: true Layout.fillWidth: true
text: ethernetItem.modelData.interface || qsTr("Unknown") text: ethernetItem.modelData.interface || qsTr("Unknown")
elide: Text.ElideRight elide: Text.ElideRight
font: Tokens.font.body.builders.medium.weight(ethernetItem.modelData.connected ? 500 : 400).build() font: Tokens.font.body.builders.medium.weight(ethernetItem.modelData.connected ? Font.Medium : Font.Normal).build()
color: ethernetItem.modelData.connected ? Colours.palette.m3primary : Colours.palette.m3onSurface color: ethernetItem.modelData.connected ? Colours.palette.m3primary : Colours.palette.m3onSurface
} }

View file

@ -183,7 +183,7 @@ ColumnLayout {
StyledText { StyledText {
Layout.alignment: Qt.AlignHCenter Layout.alignment: Qt.AlignHCenter
text: qsTr("Enter password") text: qsTr("Enter password")
font: Tokens.font.body.builders.large.weight(500).build() font: Tokens.font.body.builders.large.weight(Font.Medium).build()
} }
StyledText { StyledText {
@ -248,7 +248,7 @@ ColumnLayout {
return ""; return "";
} }
color: connectButton.hasError ? Colours.palette.m3error : Colours.palette.m3onSurfaceVariant color: connectButton.hasError ? Colours.palette.m3error : Colours.palette.m3onSurfaceVariant
font: Tokens.font.body.builders.small.weight(400).build() font: Tokens.font.body.builders.small.weight(Font.Normal).build()
wrapMode: Text.WordWrap wrapMode: Text.WordWrap
Layout.maximumWidth: parent.width - Tokens.padding.extraLargeIncreased Layout.maximumWidth: parent.width - Tokens.padding.extraLargeIncreased
} }

View file

@ -27,7 +27,7 @@ ColumnLayout {
Layout.topMargin: Tokens.padding.medium Layout.topMargin: Tokens.padding.medium
Layout.rightMargin: Tokens.padding.extraSmall Layout.rightMargin: Tokens.padding.extraSmall
text: qsTr("Keyboard Layouts") text: qsTr("Keyboard Layouts")
font: Tokens.font.body.builders.medium.weight(500).build() font: Tokens.font.body.builders.medium.weight(Font.Medium).build()
} }
ListView { ListView {
@ -155,7 +155,7 @@ ColumnLayout {
Layout.fillWidth: true Layout.fillWidth: true
text: kb.activeLabel text: kb.activeLabel
elide: Text.ElideRight elide: Text.ElideRight
font: Tokens.font.body.builders.medium.weight(500).build() font: Tokens.font.body.builders.medium.weight(Font.Medium).build()
color: Colours.palette.m3primary color: Colours.palette.m3primary
} }

View file

@ -20,7 +20,7 @@ StyledRect {
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
text: qsTr("Caelestia Settings - %1").arg(root.session.active) text: qsTr("Caelestia Settings - %1").arg(root.session.active)
font: Tokens.font.title.builders.medium.capitalisation(Font.Capitalize).weight(500).build() font: Tokens.font.title.builders.medium.capitalisation(Font.Capitalize).weight(Font.Medium).build()
} }
Item { Item {

View file

@ -111,7 +111,7 @@ Item {
Layout.alignment: Qt.AlignHCenter Layout.alignment: Qt.AlignHCenter
Layout.bottomMargin: Tokens.spacing.medium Layout.bottomMargin: Tokens.spacing.medium
text: qsTr("Wallpaper") text: qsTr("Wallpaper")
font: Tokens.font.body.builders.large.size(28).weight(600).build() font: Tokens.font.body.builders.large.size(28).weight(Font.DemiBold).build()
} }
Loader { Loader {
@ -176,7 +176,7 @@ Item {
StyledText { StyledText {
text: qsTr("Appearance") text: qsTr("Appearance")
font: Tokens.font.body.builders.large.weight(500).build() font: Tokens.font.body.builders.large.weight(Font.Medium).build()
} }
Item { Item {

View file

@ -39,7 +39,7 @@ CollapsibleSection {
StyledText { StyledText {
Layout.topMargin: Tokens.spacing.medium Layout.topMargin: Tokens.spacing.medium
text: qsTr("Desktop Clock") text: qsTr("Desktop Clock")
font: Tokens.font.body.builders.large.weight(500).build() font: Tokens.font.body.builders.large.weight(Font.Medium).build()
} }
SwitchRow { SwitchRow {
@ -68,7 +68,7 @@ CollapsibleSection {
StyledText { StyledText {
text: qsTr("Positioning") text: qsTr("Positioning")
font: Tokens.font.body.builders.large.weight(500).build() font: Tokens.font.body.builders.large.weight(Font.Medium).build()
} }
SplitButtonRow { SplitButtonRow {
@ -158,7 +158,7 @@ CollapsibleSection {
StyledText { StyledText {
text: qsTr("Shadow") text: qsTr("Shadow")
font: Tokens.font.body.builders.large.weight(500).build() font: Tokens.font.body.builders.large.weight(Font.Medium).build()
} }
SwitchRow { SwitchRow {
@ -226,7 +226,7 @@ CollapsibleSection {
StyledText { StyledText {
text: qsTr("Background") text: qsTr("Background")
font: Tokens.font.body.builders.large.weight(500).build() font: Tokens.font.body.builders.large.weight(Font.Medium).build()
} }
SwitchRow { SwitchRow {
@ -276,7 +276,7 @@ CollapsibleSection {
StyledText { StyledText {
Layout.topMargin: Tokens.spacing.medium Layout.topMargin: Tokens.spacing.medium
text: qsTr("Visualiser") text: qsTr("Visualiser")
font: Tokens.font.body.builders.large.weight(500).build() font: Tokens.font.body.builders.large.weight(Font.Medium).build()
} }
SwitchRow { SwitchRow {

View file

@ -75,7 +75,7 @@ CollapsibleSection {
StyledText { StyledText {
Layout.fillWidth: true Layout.fillWidth: true
text: modelData.name text: modelData.name
font: modelData.variant === Schemes.currentVariant ? Tokens.font.body.builders.small.weight(500).build() : Tokens.font.body.builders.small.weight(400).build() font: modelData.variant === Schemes.currentVariant ? Tokens.font.body.builders.small.weight(Font.Medium).build() : Tokens.font.body.builders.small.weight(Font.Normal).build()
} }
MaterialIcon { MaterialIcon {

View file

@ -46,7 +46,7 @@ Item {
StyledText { StyledText {
text: qsTr("Audio") text: qsTr("Audio")
font: Tokens.font.body.builders.large.weight(500).build() font: Tokens.font.body.builders.large.weight(Font.Medium).build()
} }
Item { Item {
@ -71,7 +71,7 @@ Item {
StyledText { StyledText {
text: qsTr("Devices (%1)").arg(Audio.sinks.length) text: qsTr("Devices (%1)").arg(Audio.sinks.length)
font: Tokens.font.body.builders.medium.weight(500).build() font: Tokens.font.body.builders.medium.weight(Font.Medium).build()
} }
} }
@ -122,7 +122,7 @@ Item {
maximumLineCount: 1 maximumLineCount: 1
text: modelData.description || qsTr("Unknown") text: modelData.description || qsTr("Unknown")
font: Audio.sink?.id === modelData.id ? Tokens.font.body.builders.small.weight(500).build() : Tokens.font.body.builders.small.weight(400).build() font: Audio.sink?.id === modelData.id ? Tokens.font.body.builders.small.weight(Font.Medium).build() : Tokens.font.body.builders.small.weight(Font.Normal).build()
} }
} }
} }
@ -147,7 +147,7 @@ Item {
StyledText { StyledText {
text: qsTr("Devices (%1)").arg(Audio.sources.length) text: qsTr("Devices (%1)").arg(Audio.sources.length)
font: Tokens.font.body.builders.medium.weight(500).build() font: Tokens.font.body.builders.medium.weight(Font.Medium).build()
} }
} }
@ -198,7 +198,7 @@ Item {
maximumLineCount: 1 maximumLineCount: 1
text: modelData.description || qsTr("Unknown") text: modelData.description || qsTr("Unknown")
font: Audio.source?.id === modelData.id ? Tokens.font.body.builders.small.weight(500).build() : Tokens.font.body.builders.small.weight(400).build() font: Audio.source?.id === modelData.id ? Tokens.font.body.builders.small.weight(Font.Medium).build() : Tokens.font.body.builders.small.weight(Font.Normal).build()
} }
} }
} }
@ -251,7 +251,7 @@ Item {
StyledText { StyledText {
text: qsTr("Volume") text: qsTr("Volume")
font: Tokens.font.body.builders.medium.weight(500).build() font: Tokens.font.body.builders.medium.weight(Font.Medium).build()
} }
Item { Item {
@ -368,7 +368,7 @@ Item {
StyledText { StyledText {
text: qsTr("Volume") text: qsTr("Volume")
font: Tokens.font.body.builders.medium.weight(500).build() font: Tokens.font.body.builders.medium.weight(Font.Medium).build()
} }
Item { Item {
@ -505,7 +505,7 @@ Item {
elide: Text.ElideRight elide: Text.ElideRight
maximumLineCount: 1 maximumLineCount: 1
text: Audio.getStreamName(modelData) text: Audio.getStreamName(modelData)
font: Tokens.font.body.builders.medium.weight(500).build() font: Tokens.font.body.builders.medium.weight(Font.Medium).build()
} }
StyledInputField { StyledInputField {

View file

@ -59,7 +59,7 @@ StyledFlickable {
StyledText { StyledText {
Layout.topMargin: Tokens.spacing.largeIncreased Layout.topMargin: Tokens.spacing.largeIncreased
text: qsTr("Connection status") text: qsTr("Connection status")
font: Tokens.font.body.builders.large.weight(500).build() font: Tokens.font.body.builders.large.weight(Font.Medium).build()
} }
StyledText { StyledText {
@ -117,7 +117,7 @@ StyledFlickable {
StyledText { StyledText {
Layout.topMargin: Tokens.spacing.largeIncreased Layout.topMargin: Tokens.spacing.largeIncreased
text: qsTr("Device properties") text: qsTr("Device properties")
font: Tokens.font.body.builders.large.weight(500).build() font: Tokens.font.body.builders.large.weight(Font.Medium).build()
} }
StyledText { StyledText {
@ -322,7 +322,7 @@ StyledFlickable {
StyledText { StyledText {
Layout.topMargin: Tokens.spacing.largeIncreased Layout.topMargin: Tokens.spacing.largeIncreased
text: qsTr("Device information") text: qsTr("Device information")
font: Tokens.font.body.builders.large.weight(500).build() font: Tokens.font.body.builders.large.weight(Font.Medium).build()
} }
StyledText { StyledText {

View file

@ -36,7 +36,7 @@ DeviceList {
StyledText { StyledText {
text: qsTr("Bluetooth") text: qsTr("Bluetooth")
font: Tokens.font.body.builders.large.weight(500).build() font: Tokens.font.body.builders.large.weight(Font.Medium).build()
} }
Item { Item {

View file

@ -26,7 +26,7 @@ ColumnLayout {
StyledText { StyledText {
Layout.topMargin: Tokens.spacing.largeIncreased Layout.topMargin: Tokens.spacing.largeIncreased
text: qsTr("Adapter status") text: qsTr("Adapter status")
font: Tokens.font.body.builders.large.weight(500).build() font: Tokens.font.body.builders.large.weight(Font.Medium).build()
} }
StyledText { StyledText {
@ -86,7 +86,7 @@ ColumnLayout {
StyledText { StyledText {
Layout.topMargin: Tokens.spacing.largeIncreased Layout.topMargin: Tokens.spacing.largeIncreased
text: qsTr("Adapter properties") text: qsTr("Adapter properties")
font: Tokens.font.body.builders.large.weight(500).build() font: Tokens.font.body.builders.large.weight(Font.Medium).build()
} }
StyledText { StyledText {
@ -442,7 +442,7 @@ ColumnLayout {
StyledText { StyledText {
Layout.topMargin: Tokens.spacing.largeIncreased Layout.topMargin: Tokens.spacing.largeIncreased
text: qsTr("Adapter information") text: qsTr("Adapter information")
font: Tokens.font.body.builders.large.weight(500).build() font: Tokens.font.body.builders.large.weight(Font.Medium).build()
} }
StyledText { StyledText {

View file

@ -47,7 +47,7 @@ ColumnLayout {
StyledText { StyledText {
visible: root.title !== "" visible: root.title !== ""
text: root.title text: root.title
font: Tokens.font.title.builders.medium.weight(500).build() font: Tokens.font.title.builders.medium.weight(Font.Medium).build()
} }
Loader { Loader {

View file

@ -210,7 +210,7 @@ GridView {
anchors.bottomMargin: Tokens.padding.medium anchors.bottomMargin: Tokens.padding.medium
text: modelData.name text: modelData.name
font: Tokens.font.body.builders.small.weight(500).build() font: Tokens.font.body.builders.small.weight(Font.Medium).build()
color: isCurrent ? Colours.palette.m3primary : Colours.palette.m3onSurface color: isCurrent ? Colours.palette.m3primary : Colours.palette.m3onSurface
elide: Text.ElideMiddle elide: Text.ElideMiddle
maximumLineCount: 1 maximumLineCount: 1

View file

@ -119,7 +119,7 @@ Item {
StyledText { StyledText {
text: qsTr("Dashboard") text: qsTr("Dashboard")
font: Tokens.font.title.builders.medium.weight(500).build() font: Tokens.font.title.builders.medium.weight(Font.Medium).build()
} }
} }

View file

@ -156,7 +156,7 @@ Item {
StyledText { StyledText {
text: qsTr("Launcher") text: qsTr("Launcher")
font: Tokens.font.title.builders.medium.weight(500).build() font: Tokens.font.title.builders.medium.weight(Font.Medium).build()
} }
Item { Item {
@ -187,7 +187,7 @@ Item {
StyledText { StyledText {
Layout.topMargin: Tokens.spacing.largeIncreased Layout.topMargin: Tokens.spacing.largeIncreased
text: qsTr("Applications (%1)").arg(root.searchText ? root.filteredApps.length : allAppsDb.apps.length) text: qsTr("Applications (%1)").arg(root.searchText ? root.filteredApps.length : allAppsDb.apps.length)
font: Tokens.font.title.builders.small.weight(500).build() font: Tokens.font.title.builders.small.weight(Font.Medium).build()
} }
StyledText { StyledText {

View file

@ -27,7 +27,7 @@ DeviceList {
StyledText { StyledText {
text: qsTr("Settings") text: qsTr("Settings")
font: Tokens.font.title.builders.medium.weight(500).build() font: Tokens.font.title.builders.medium.weight(Font.Medium).build()
} }
Item { Item {
@ -129,7 +129,7 @@ DeviceList {
Layout.fillWidth: true Layout.fillWidth: true
text: modelData.connected ? qsTr("Connected") : qsTr("Disconnected") text: modelData.connected ? qsTr("Connected") : qsTr("Disconnected")
color: modelData.connected ? Colours.palette.m3primary : Colours.palette.m3outline color: modelData.connected ? Colours.palette.m3primary : Colours.palette.m3outline
font: Tokens.font.body.builders.small.weight(modelData.connected ? 500 : 400).build() font: Tokens.font.body.builders.small.weight(modelData.connected ? Font.Medium : Font.Normal).build()
elide: Text.ElideRight elide: Text.ElideRight
} }
} }

View file

@ -25,7 +25,7 @@ ColumnLayout {
StyledText { StyledText {
Layout.topMargin: Tokens.spacing.largeIncreased Layout.topMargin: Tokens.spacing.largeIncreased
text: qsTr("Ethernet devices") text: qsTr("Ethernet devices")
font: Tokens.font.body.builders.large.weight(500).build() font: Tokens.font.body.builders.large.weight(Font.Medium).build()
} }
StyledText { StyledText {

View file

@ -51,7 +51,7 @@ Item {
StyledText { StyledText {
text: qsTr("Network") text: qsTr("Network")
font: Tokens.font.body.builders.large.weight(500).build() font: Tokens.font.body.builders.large.weight(Font.Medium).build()
} }
Item { Item {

View file

@ -320,7 +320,7 @@ DeviceDetails {
StyledText { StyledText {
text: qsTr("Edit VPN Provider") text: qsTr("Edit VPN Provider")
font: Tokens.font.body.builders.large.weight(500).build() font: Tokens.font.body.builders.large.weight(Font.Medium).build()
} }
ColumnLayout { ColumnLayout {

View file

@ -196,7 +196,7 @@ ColumnLayout {
return Colours.palette.m3tertiary; return Colours.palette.m3tertiary;
return Colours.palette.m3onSurface; return Colours.palette.m3onSurface;
} }
font: Tokens.font.body.builders.small.weight(modelData.enabled && VPN.connected ? 500 : 400).build() font: Tokens.font.body.builders.small.weight(modelData.enabled && VPN.connected ? Font.Medium : Font.Normal).build()
elide: Text.ElideRight elide: Text.ElideRight
} }
} }
@ -456,7 +456,7 @@ ColumnLayout {
StyledText { StyledText {
text: qsTr("Add VPN Provider") text: qsTr("Add VPN Provider")
font: Tokens.font.body.builders.large.weight(500).build() font: Tokens.font.body.builders.large.weight(Font.Medium).build()
} }
StyledText { StyledText {
@ -574,7 +574,7 @@ ColumnLayout {
StyledText { StyledText {
text: vpnDialog.editIndex >= 0 ? qsTr("Edit VPN Provider") : qsTr("Add %1 VPN").arg(vpnDialog.displayName) text: vpnDialog.editIndex >= 0 ? qsTr("Edit VPN Provider") : qsTr("Add %1 VPN").arg(vpnDialog.displayName)
font: Tokens.font.body.builders.large.weight(500).build() font: Tokens.font.body.builders.large.weight(Font.Medium).build()
} }
ColumnLayout { ColumnLayout {

View file

@ -104,7 +104,7 @@ ColumnLayout {
StyledText { StyledText {
text: modelData.displayName text: modelData.displayName
font: Tokens.font.body.builders.medium.weight(modelData.isActive ? 500 : 400).build() font: Tokens.font.body.builders.medium.weight(modelData.isActive ? Font.Medium : Font.Normal).build()
} }
StyledText { StyledText {

View file

@ -52,7 +52,7 @@ DeviceList {
StyledText { StyledText {
text: qsTr("Settings") text: qsTr("Settings")
font: Tokens.font.title.builders.medium.weight(500).build() font: Tokens.font.title.builders.medium.weight(Font.Medium).build()
} }
Item { Item {
@ -181,7 +181,7 @@ DeviceList {
return qsTr("Open"); return qsTr("Open");
} }
color: modelData.active ? Colours.palette.m3primary : Colours.palette.m3outline color: modelData.active ? Colours.palette.m3primary : Colours.palette.m3outline
font: Tokens.font.body.builders.small.weight(modelData.active ? 500 : 400).build() font: Tokens.font.body.builders.small.weight(modelData.active ? Font.Medium : Font.Normal).build()
elide: Text.ElideRight elide: Text.ElideRight
} }
} }

View file

@ -155,7 +155,7 @@ Item {
StyledText { StyledText {
Layout.alignment: Qt.AlignHCenter Layout.alignment: Qt.AlignHCenter
text: qsTr("Enter password") text: qsTr("Enter password")
font: Tokens.font.body.builders.large.weight(500).build() font: Tokens.font.body.builders.large.weight(Font.Medium).build()
} }
StyledText { StyledText {
@ -181,7 +181,7 @@ Item {
return ""; return "";
} }
color: connectButton.hasError ? Colours.palette.m3error : Colours.palette.m3onSurfaceVariant color: connectButton.hasError ? Colours.palette.m3error : Colours.palette.m3onSurfaceVariant
font: Tokens.font.body.builders.small.weight(400).build() font: Tokens.font.body.builders.small.weight(Font.Normal).build()
wrapMode: Text.WordWrap wrapMode: Text.WordWrap
Layout.maximumWidth: parent.width - Tokens.padding.extraLargeIncreased Layout.maximumWidth: parent.width - Tokens.padding.extraLargeIncreased
} }

View file

@ -179,7 +179,7 @@ Item {
StyledText { StyledText {
text: qsTr("Taskbar") text: qsTr("Taskbar")
font: Tokens.font.title.builders.medium.weight(500).build() font: Tokens.font.title.builders.medium.weight(Font.Medium).build()
} }
} }

View file

@ -29,7 +29,7 @@ Item {
StyledText { StyledText {
text: Weather.city || qsTr("Loading...") text: Weather.city || qsTr("Loading...")
font: Tokens.font.body.builders.large.size(28).weight(600).build() font: Tokens.font.body.builders.large.size(28).weight(Font.DemiBold).build()
color: Colours.palette.m3onSurface color: Colours.palette.m3onSurface
} }
@ -90,7 +90,7 @@ Item {
StyledText { StyledText {
text: Weather.temp text: Weather.temp
font: Tokens.font.body.builders.large.size(28 * 2).weight(500).build() font: Tokens.font.body.builders.large.size(28 * 2).weight(Font.Medium).build()
color: Colours.palette.m3primary color: Colours.palette.m3primary
} }
@ -133,7 +133,7 @@ Item {
Layout.leftMargin: Tokens.padding.medium Layout.leftMargin: Tokens.padding.medium
visible: forecastRepeater.count > 0 visible: forecastRepeater.count > 0
text: qsTr("7-Day Forecast") text: qsTr("7-Day Forecast")
font: Tokens.font.body.builders.medium.weight(600).build() font: Tokens.font.body.builders.medium.weight(Font.DemiBold).build()
color: Colours.palette.m3onSurface color: Colours.palette.m3onSurface
} }
@ -167,7 +167,7 @@ Item {
StyledText { StyledText {
Layout.alignment: Qt.AlignHCenter Layout.alignment: Qt.AlignHCenter
text: forecastItem.index === 0 ? qsTr("Today") : new Date(forecastItem.modelData.date).toLocaleDateString(Qt.locale(), "ddd") text: forecastItem.index === 0 ? qsTr("Today") : new Date(forecastItem.modelData.date).toLocaleDateString(Qt.locale(), "ddd")
font: Tokens.font.body.builders.medium.weight(600).build() font: Tokens.font.body.builders.medium.weight(Font.DemiBold).build()
color: Colours.palette.m3primary color: Colours.palette.m3primary
} }
@ -190,7 +190,7 @@ Item {
StyledText { StyledText {
Layout.alignment: Qt.AlignHCenter Layout.alignment: Qt.AlignHCenter
text: GlobalConfig.services.useFahrenheit ? forecastItem.modelData.maxTempF + "°" + " / " + forecastItem.modelData.minTempF + "°" : forecastItem.modelData.maxTempC + "°" + " / " + forecastItem.modelData.minTempC + "°" text: GlobalConfig.services.useFahrenheit ? forecastItem.modelData.maxTempF + "°" + " / " + forecastItem.modelData.minTempF + "°" : forecastItem.modelData.maxTempC + "°" + " / " + forecastItem.modelData.minTempC + "°"
font: Tokens.font.body.builders.small.weight(600).build() font: Tokens.font.body.builders.small.weight(Font.DemiBold).build()
color: Colours.palette.m3tertiary color: Colours.palette.m3tertiary
} }
} }
@ -235,7 +235,7 @@ Item {
} }
StyledText { StyledText {
text: detailRoot.value text: detailRoot.value
font: Tokens.font.body.builders.small.weight(600).build() font: Tokens.font.body.builders.small.weight(Font.DemiBold).build()
horizontalAlignment: Text.AlignLeft horizontalAlignment: Text.AlignLeft
} }
} }
@ -266,7 +266,7 @@ Item {
} }
StyledText { StyledText {
text: weatherStat.value text: weatherStat.value
font: Tokens.font.body.builders.small.weight(600).build() font: Tokens.font.body.builders.small.weight(Font.DemiBold).build()
color: Colours.palette.m3onSurface color: Colours.palette.m3onSurface
} }
} }

View file

@ -61,7 +61,7 @@ CustomMouseArea {
anchors.centerIn: parent anchors.centerIn: parent
text: "chevron_left" text: "chevron_left"
color: Colours.palette.m3tertiary color: Colours.palette.m3tertiary
fontStyle: Tokens.font.icon.builder.size(Tokens.font.icon.medium.pointSize).weight(700).build() fontStyle: Tokens.font.icon.builder.size(Tokens.font.icon.medium.pointSize).weight(Font.Bold).build()
} }
} }
@ -94,7 +94,7 @@ CustomMouseArea {
anchors.centerIn: parent anchors.centerIn: parent
text: grid.title text: grid.title
color: Colours.palette.m3primary color: Colours.palette.m3primary
font: Tokens.font.body.builders.medium.weight(500).capitalisation(Font.Capitalize).build() font: Tokens.font.body.builders.medium.weight(Font.Medium).capitalisation(Font.Capitalize).build()
} }
} }
@ -118,7 +118,7 @@ CustomMouseArea {
anchors.centerIn: parent anchors.centerIn: parent
text: "chevron_right" text: "chevron_right"
color: Colours.palette.m3tertiary color: Colours.palette.m3tertiary
fontStyle: Tokens.font.icon.builder.size(Tokens.font.icon.medium.pointSize).weight(700).build() fontStyle: Tokens.font.icon.builder.size(Tokens.font.icon.medium.pointSize).weight(Font.Bold).build()
} }
} }
} }
@ -134,7 +134,7 @@ CustomMouseArea {
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter
text: model.shortName text: model.shortName
font: Tokens.font.body.builders.medium.weight(500).build() font: Tokens.font.body.builders.medium.weight(Font.Medium).build()
color: (model.day === 0 || model.day === 6) ? Colours.palette.m3secondary : Colours.palette.m3onSurfaceVariant color: (model.day === 0 || model.day === 6) ? Colours.palette.m3secondary : Colours.palette.m3onSurfaceVariant
} }
} }
@ -177,7 +177,7 @@ CustomMouseArea {
return Colours.palette.m3onSurfaceVariant; return Colours.palette.m3onSurfaceVariant;
} }
opacity: dayItem.model.today || dayItem.model.month === grid.month ? 1 : 0.4 opacity: dayItem.model.today || dayItem.model.month === grid.month ? 1 : 0.4
font: Tokens.font.body.builders.medium.weight(500).build() font: Tokens.font.body.builders.medium.weight(Font.Medium).build()
} }
} }
} }

View file

@ -24,7 +24,7 @@ Item {
Layout.alignment: Qt.AlignHCenter Layout.alignment: Qt.AlignHCenter
text: Time.hourStr text: Time.hourStr
color: Colours.palette.m3secondary color: Colours.palette.m3secondary
font: Tokens.font.clock.size(28).weight(600).build() font: Tokens.font.clock.size(28).weight(Font.DemiBold).build()
} }
StyledText { StyledText {
@ -39,7 +39,7 @@ Item {
Layout.alignment: Qt.AlignHCenter Layout.alignment: Qt.AlignHCenter
text: Time.minuteStr text: Time.minuteStr
color: Colours.palette.m3secondary color: Colours.palette.m3secondary
font: Tokens.font.clock.size(28).weight(600).build() font: Tokens.font.clock.size(28).weight(Font.DemiBold).build()
} }
Loader { Loader {
@ -52,7 +52,7 @@ Item {
sourceComponent: StyledText { sourceComponent: StyledText {
text: Time.amPmStr text: Time.amPmStr
color: Colours.palette.m3primary color: Colours.palette.m3primary
font: Tokens.font.clock.size(18).weight(600).build() font: Tokens.font.clock.size(18).weight(Font.DemiBold).build()
} }
} }
} }

View file

@ -39,7 +39,7 @@ Item {
animate: true animate: true
text: Weather.temp text: Weather.temp
color: Colours.palette.m3primary color: Colours.palette.m3primary
font: Tokens.font.body.builders.large.size(28).weight(500).build() font: Tokens.font.body.builders.large.size(28).weight(Font.Medium).build()
} }
StyledText { StyledText {

View file

@ -130,7 +130,7 @@ Item {
StyledText { StyledText {
text: root.state === "wallpapers" ? qsTr("No wallpapers found") : qsTr("No results") text: root.state === "wallpapers" ? qsTr("No wallpapers found") : qsTr("No results")
color: Colours.palette.m3onSurfaceVariant color: Colours.palette.m3onSurfaceVariant
font: Tokens.font.body.builders.large.weight(500).build() font: Tokens.font.body.builders.large.weight(Font.Medium).build()
} }
StyledText { StyledText {

View file

@ -58,7 +58,7 @@ Item {
anchors.centerIn: parent anchors.centerIn: parent
text: "image" text: "image"
color: Colours.tPalette.m3outline color: Colours.tPalette.m3outline
fontStyle: Tokens.font.icon.builder.size(Tokens.font.icon.extraLarge.pointSize * 2).weight(600).build() fontStyle: Tokens.font.icon.builder.size(Tokens.font.icon.extraLarge.pointSize * 2).weight(Font.DemiBold).build()
} }
CachingImage { CachingImage {

View file

@ -194,7 +194,7 @@ ColumnLayout {
anchors.centerIn: parent anchors.centerIn: parent
text: "arrow_forward" text: "arrow_forward"
color: root.lock.pam.buffer ? Colours.palette.m3onPrimary : Colours.palette.m3onSurface color: root.lock.pam.buffer ? Colours.palette.m3onPrimary : Colours.palette.m3onSurface
fontStyle: Tokens.font.icon.builder.size(Tokens.font.icon.large.pointSize).weight(500).build() fontStyle: Tokens.font.icon.builder.size(Tokens.font.icon.large.pointSize).weight(Font.Medium).build()
} }
} }
} }

View file

@ -76,7 +76,7 @@ Item {
Layout.bottomMargin: Tokens.spacing.large Layout.bottomMargin: Tokens.spacing.large
text: qsTr("Now playing") text: qsTr("Now playing")
color: Colours.palette.m3onSurfaceVariant color: Colours.palette.m3onSurfaceVariant
font: Tokens.font.mono.builders.small.weight(500).build() font: Tokens.font.mono.builders.small.weight(Font.Medium).build()
} }
StyledText { StyledText {
@ -85,7 +85,7 @@ Item {
text: Players.active?.trackArtist ?? qsTr("No media") text: Players.active?.trackArtist ?? qsTr("No media")
color: Colours.palette.m3primary color: Colours.palette.m3primary
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter
font: Tokens.font.mono.builders.large.weight(600).build() font: Tokens.font.mono.builders.large.weight(Font.DemiBold).build()
elide: Text.ElideRight elide: Text.ElideRight
} }

View file

@ -25,7 +25,7 @@ ColumnLayout {
Layout.fillWidth: true Layout.fillWidth: true
text: Notifs.list.length > 0 ? qsTr("%1 notification%2").arg(Notifs.list.length).arg(Notifs.list.length === 1 ? "" : "s") : qsTr("Notifications") text: Notifs.list.length > 0 ? qsTr("%1 notification%2").arg(Notifs.list.length).arg(Notifs.list.length === 1 ? "" : "s") : qsTr("Notifications")
color: Colours.palette.m3outline color: Colours.palette.m3outline
font: Tokens.font.mono.builders.small.weight(500).build() font: Tokens.font.mono.builders.small.weight(Font.Medium).build()
elide: Text.ElideRight elide: Text.ElideRight
} }
@ -64,7 +64,7 @@ ColumnLayout {
Layout.alignment: Qt.AlignHCenter Layout.alignment: Qt.AlignHCenter
text: Config.lock.hideNotifs ? qsTr("Unlock for Notifications") : qsTr("No Notifications") text: Config.lock.hideNotifs ? qsTr("Unlock for Notifications") : qsTr("No Notifications")
color: Colours.palette.m3outlineVariant color: Colours.palette.m3outlineVariant
font: Tokens.font.mono.builders.large.weight(500).build() font: Tokens.font.mono.builders.large.weight(Font.Medium).build()
} }
} }

View file

@ -80,7 +80,7 @@ GridLayout {
anchors.centerIn: parent anchors.centerIn: parent
text: res.icon text: res.icon
color: res.colour color: res.colour
fontStyle: Tokens.font.icon.builder.size((circ.arcRadius * 0.7) || 1).weight(600).build() fontStyle: Tokens.font.icon.builder.size((circ.arcRadius * 0.7) || 1).weight(Font.DemiBold).build()
} }
Behavior on value { Behavior on value {

View file

@ -29,7 +29,7 @@ ColumnLayout {
sourceComponent: StyledText { sourceComponent: StyledText {
text: qsTr("Weather") text: qsTr("Weather")
color: Colours.palette.m3primary color: Colours.palette.m3primary
font: Tokens.font.body.builders.large.size(28).weight(500).build() font: Tokens.font.body.builders.large.size(28).weight(Font.Medium).build()
} }
} }
@ -53,7 +53,7 @@ ColumnLayout {
animate: true animate: true
text: Weather.description text: Weather.description
color: Colours.palette.m3secondary color: Colours.palette.m3secondary
font: Tokens.font.body.builders.large.weight(500).build() font: Tokens.font.body.builders.large.weight(Font.Medium).build()
elide: Text.ElideRight elide: Text.ElideRight
} }
@ -84,7 +84,7 @@ ColumnLayout {
text: Weather.temp text: Weather.temp
color: Colours.palette.m3primary color: Colours.palette.m3primary
horizontalAlignment: Text.AlignRight horizontalAlignment: Text.AlignRight
font: Tokens.font.body.builders.large.size(28).weight(500).build() font: Tokens.font.body.builders.large.size(28).weight(Font.Medium).build()
elide: Text.ElideLeft elide: Text.ElideLeft
} }
@ -150,7 +150,7 @@ ColumnLayout {
MaterialIcon { MaterialIcon {
Layout.alignment: Qt.AlignHCenter Layout.alignment: Qt.AlignHCenter
text: forecastHour.modelData?.icon ?? "cloud_alert" text: forecastHour.modelData?.icon ?? "cloud_alert"
fontStyle: Tokens.font.icon.builder.size(Tokens.font.icon.extraLarge.pointSize * 1.5).weight(500).build() fontStyle: Tokens.font.icon.builder.size(Tokens.font.icon.extraLarge.pointSize * 1.5).weight(Font.Medium).build()
} }
StyledText { StyledText {

View file

@ -125,7 +125,7 @@ Column {
text: button.icon text: button.icon
color: button.activeFocus ? Colours.palette.m3onSecondaryContainer : Colours.palette.m3onSurface color: button.activeFocus ? Colours.palette.m3onSecondaryContainer : Colours.palette.m3onSurface
fontStyle: Tokens.font.icon.builder.size(Tokens.font.icon.extraLarge.pointSize).weight(500).build() fontStyle: Tokens.font.icon.builder.size(Tokens.font.icon.extraLarge.pointSize).weight(Font.Medium).build()
} }
} }
} }

View file

@ -43,7 +43,7 @@ Item {
text: root.notifCount text: root.notifCount
color: Colours.palette.m3outline color: Colours.palette.m3outline
font: Tokens.font.mono.builders.medium.weight(500).build() font: Tokens.font.mono.builders.medium.weight(Font.Medium).build()
Behavior on anchors.leftMargin { Behavior on anchors.leftMargin {
Anim {} Anim {}
@ -64,7 +64,7 @@ Item {
text: root.notifCount > 0 ? qsTr("notification%1").arg(root.notifCount === 1 ? "" : "s") : qsTr("Notifications") text: root.notifCount > 0 ? qsTr("notification%1").arg(root.notifCount === 1 ? "" : "s") : qsTr("Notifications")
color: Colours.palette.m3outline color: Colours.palette.m3outline
font: Tokens.font.mono.builders.medium.weight(500).build() font: Tokens.font.mono.builders.medium.weight(Font.Medium).build()
elide: Text.ElideRight elide: Text.ElideRight
} }
} }
@ -107,7 +107,7 @@ Item {
Layout.alignment: Qt.AlignHCenter Layout.alignment: Qt.AlignHCenter
text: qsTr("No Notifications") text: qsTr("No Notifications")
color: Colours.palette.m3outlineVariant color: Colours.palette.m3outlineVariant
font: Tokens.font.mono.builders.large.weight(500).build() font: Tokens.font.mono.builders.large.weight(Font.Medium).build()
} }
} }

View file

@ -19,7 +19,7 @@ ColumnLayout {
text: root.client?.title ?? qsTr("No active client") text: root.client?.title ?? qsTr("No active client")
wrapMode: Text.WrapAtWordBoundaryOrAnywhere wrapMode: Text.WrapAtWordBoundaryOrAnywhere
font: Tokens.font.body.builders.large.weight(500).build() font: Tokens.font.body.builders.large.weight(Font.Medium).build()
} }
Label { Label {

View file

@ -51,7 +51,7 @@ Item {
Layout.alignment: Qt.AlignHCenter Layout.alignment: Qt.AlignHCenter
text: qsTr("No active client") text: qsTr("No active client")
color: Colours.palette.m3outline color: Colours.palette.m3outline
font: Tokens.font.body.builders.large.size(28).weight(500).build() font: Tokens.font.body.builders.large.size(28).weight(Font.Medium).build()
} }
StyledText { StyledText {