From 63fb5bd2902777e6b706ecc271b4f398e3422371 Mon Sep 17 00:00:00 2001 From: quadbyte Date: Thu, 14 Aug 2025 08:22:13 -0400 Subject: [PATCH] Colors: slight rework of the default colorscheme and overall colors usage --- Assets/Colors/{default.json => rosepine.json} | 6 +++--- Modules/Notification/Notification.qml | 4 ++-- Modules/Settings/SettingsPanel.qml | 2 +- Modules/Settings/Tabs/About.qml | 4 ++-- Modules/SidePanel/Cards/MediaCard.qml | 13 +++++++++---- Modules/SidePanel/Cards/WeatherCard.qml | 10 ++++++---- Modules/SidePanel/PowerMenu.qml | 4 ++-- Modules/SidePanel/SidePanel.qml | 13 ++++++++++++- Services/Colors.qml | 8 ++++---- Services/Style.qml | 1 + Widgets/NBox.qml | 2 +- Widgets/NCircleStat.qml | 6 +++--- Widgets/NTooltip.qml | 4 ++-- 13 files changed, 48 insertions(+), 29 deletions(-) rename Assets/Colors/{default.json => rosepine.json} (88%) diff --git a/Assets/Colors/default.json b/Assets/Colors/rosepine.json similarity index 88% rename from Assets/Colors/default.json rename to Assets/Colors/rosepine.json index ddd0a7a..1b00997 100644 --- a/Assets/Colors/default.json +++ b/Assets/Colors/rosepine.json @@ -3,8 +3,8 @@ "backgroundSecondary": "#1f1d2e", "backgroundTertiary": "#26233a", - "surface": "#1f1d2e", - "surfaceVariant": "#37354c", + "surface": "#1b1927", + "surfaceVariant": "#262337", "textPrimary": "#e0def4", "textSecondary": "#908caa", @@ -23,4 +23,4 @@ "shadow": "#191724", "overlay": "#191724" -} +} \ No newline at end of file diff --git a/Modules/Notification/Notification.qml b/Modules/Notification/Notification.qml index 36ae1da..d7c3e94 100644 --- a/Modules/Notification/Notification.qml +++ b/Modules/Notification/Notification.qml @@ -68,11 +68,11 @@ PanelWindow { gradient: Gradient { GradientStop { position: 0.0 - color: Colors.backgroundTertiary + color: Colors.backgroundSecondary } GradientStop { position: 1.0 - color: Colors.backgroundSecondary + color: Colors.backgroundTertiary } } diff --git a/Modules/Settings/SettingsPanel.qml b/Modules/Settings/SettingsPanel.qml index 132cf68..51948ab 100644 --- a/Modules/Settings/SettingsPanel.qml +++ b/Modules/Settings/SettingsPanel.qml @@ -281,7 +281,7 @@ NLoader { Layout.fillWidth: true Layout.fillHeight: true radius: Style.radiusMedium * scaling - color: Colors.surface + color: Colors.surfaceVariant border.color: Colors.outline border.width: Math.max(1, Style.borderThin * scaling) clip: true diff --git a/Modules/Settings/Tabs/About.qml b/Modules/Settings/Tabs/About.qml index bd90b27..85c4bee 100644 --- a/Modules/Settings/Tabs/About.qml +++ b/Modules/Settings/Tabs/About.qml @@ -168,10 +168,10 @@ ColumnLayout { } NText { - text: `Contributors: ${root.contributors.length}` + text: `Shout-out to our ${root.contributors.length} awesome contributors!` font.pointSize: Style.fontSizeLarge * scaling font.weight: Style.fontWeightBold - color: Colors.textPrimary + color: Colors.textSecondary Layout.alignment: Qt.AlignCenter Layout.topMargin: Style.marginLarge * 2 } diff --git a/Modules/SidePanel/Cards/MediaCard.qml b/Modules/SidePanel/Cards/MediaCard.qml index d0489ba..6a59f24 100644 --- a/Modules/SidePanel/Cards/MediaCard.qml +++ b/Modules/SidePanel/Cards/MediaCard.qml @@ -21,19 +21,23 @@ NBox { // } ColumnLayout { anchors.fill: parent + Layout.fillHeight: true anchors.margins: Style.marginLarge * scaling // Fallback ColumnLayout { id: fallback + visible: !main.visible - spacing: Style.marginMedium * scaling + spacing: Style.marginSmall * scaling Item { Layout.fillWidth: true + Layout.fillHeight: true } + NText { - text: "music_note" + text: "album" font.family: "Material Symbols Outlined" font.pointSize: 28 * scaling color: Colors.textSecondary @@ -44,6 +48,7 @@ NBox { color: Colors.textDisabled Layout.alignment: Qt.AlignHCenter } + Item { Layout.fillWidth: true } @@ -117,11 +122,11 @@ NBox { gradient: Gradient { GradientStop { position: 0.0 - color: Colors.backgroundTertiary + color: Colors.backgroundSecondary } GradientStop { position: 1.0 - color: Colors.backgroundSecondary + color: Colors.backgroundTertiary } } border.color: Colors.outline diff --git a/Modules/SidePanel/Cards/WeatherCard.qml b/Modules/SidePanel/Cards/WeatherCard.qml index 4bbe940..040b046 100644 --- a/Modules/SidePanel/Cards/WeatherCard.qml +++ b/Modules/SidePanel/Cards/WeatherCard.qml @@ -30,7 +30,7 @@ NBox { text: weatherReady ? Location.weatherSymbolFromCode(Location.data.weather.current_weather.weathercode) : "" font.family: "Material Symbols Outlined" font.pointSize: Style.fontSizeXXL * 1.5 * scaling - color: Colors.accentSecondary + color: Colors.accentPrimary } ColumnLayout { @@ -41,8 +41,8 @@ NBox { const chunks = Settings.data.location.name.split(",") return chunks[0] } + font.pointSize: Style.fontSizeLarger * scaling font.weight: Style.fontWeightBold - font.pointSize: Style.fontSizeXL * scaling } RowLayout { @@ -53,11 +53,13 @@ NBox { return "" } var temp = Location.data.weather.current_weather.temperature + var suffix = "C" if (Settings.data.location.useFahrenheit) { temp = Location.celsiusToFahrenheit(temp) + var suffix = "F" } temp = Math.round(temp) - return `${temp}°` + return `${temp}°${suffix}` } font.pointSize: Style.fontSizeXL * scaling font.weight: Style.fontWeightBold @@ -95,7 +97,7 @@ NBox { text: Location.weatherSymbolFromCode(Location.data.weather.daily.weathercode[index]) font.family: "Material Symbols Outlined" font.pointSize: Style.fontSizeXL * scaling - color: Colors.textSecondary + color: Colors.accentPrimary } NText { text: { diff --git a/Modules/SidePanel/PowerMenu.qml b/Modules/SidePanel/PowerMenu.qml index 4f62141..d2af3b6 100644 --- a/Modules/SidePanel/PowerMenu.qml +++ b/Modules/SidePanel/PowerMenu.qml @@ -30,11 +30,11 @@ NPanel { gradient: Gradient { GradientStop { position: 0.0 - color: Colors.backgroundTertiary + color: Colors.backgroundSecondary } GradientStop { position: 1.0 - color: Colors.backgroundSecondary + color: Colors.backgroundTertiary } } diff --git a/Modules/SidePanel/SidePanel.qml b/Modules/SidePanel/SidePanel.qml index 96de4ce..97c267a 100644 --- a/Modules/SidePanel/SidePanel.qml +++ b/Modules/SidePanel/SidePanel.qml @@ -81,7 +81,18 @@ NLoader { // Inline helpers moved to dedicated widgets: NCard and NCircleStat Rectangle { id: panelBackground - color: Colors.backgroundPrimary + color: "transparent" + gradient: Gradient { + GradientStop { + position: 0.0 + color: Colors.backgroundSecondary + } + GradientStop { + position: 1.0 + color: Colors.backgroundTertiary + } + } + radius: Style.radiusLarge * scaling border.color: Colors.backgroundTertiary border.width: Math.max(1, Style.borderMedium * scaling) diff --git a/Services/Colors.qml b/Services/Colors.qml index 4507667..c5dc26f 100644 --- a/Services/Colors.qml +++ b/Services/Colors.qml @@ -58,8 +58,8 @@ Singleton { property color backgroundSecondary: "#1f1d2e" property color backgroundTertiary: "#26233a" - property color surface: "#1f1d2e" - property color surfaceVariant: "#37354c" + property color surface: "#1b1927" + property color surfaceVariant: "#262337" property color textPrimary: "#e0def4" property color textSecondary: "#908caa" @@ -134,8 +134,8 @@ Singleton { property string backgroundTertiary: "#26233a" // Surfaces & Elevation - property string surface: "#1f1d2e" - property string surfaceVariant: "#37354c" + property string surface: "#1b1927" + property string surfaceVariant: "#262337" // Text Colors property string textPrimary: "#e0def4" diff --git a/Services/Style.qml b/Services/Style.qml index 03ee2d1..c3f56a6 100644 --- a/Services/Style.qml +++ b/Services/Style.qml @@ -18,6 +18,7 @@ Singleton { property real fontSizeMedium: 11 property real fontSizeInter: 12 property real fontSizeLarge: 13 + property real fontSizeLarger: 16 property real fontSizeXL: 18 property real fontSizeXXL: 24 diff --git a/Widgets/NBox.qml b/Widgets/NBox.qml index 9281bf2..b75d79c 100644 --- a/Widgets/NBox.qml +++ b/Widgets/NBox.qml @@ -11,7 +11,7 @@ Rectangle { implicitWidth: childrenRect.width implicitHeight: childrenRect.height - color: Colors.surfaceVariant + color: Colors.surface radius: Style.radiusMedium * scaling border.color: Colors.backgroundTertiary border.width: Math.max(1, Style.borderThin * scaling) diff --git a/Widgets/NCircleStat.qml b/Widgets/NCircleStat.qml index 1ca3f05..80bec42 100644 --- a/Widgets/NCircleStat.qml +++ b/Widgets/NCircleStat.qml @@ -57,8 +57,8 @@ Rectangle { const endBg = Math.PI * 5 / 3 ctx.reset() ctx.lineWidth = 6 * root.scaling * contentScale - // Track uses backgroundPrimary for stronger contrast - ctx.strokeStyle = Colors.backgroundPrimary + // Track uses surfaceVariant for stronger contrast + ctx.strokeStyle = Colors.surfaceVariant ctx.beginPath() ctx.arc(cx, cy, r, start, endBg) ctx.stroke() @@ -89,7 +89,7 @@ Rectangle { width: 28 * scaling * contentScale height: width radius: width / 2 - color: Colors.backgroundSecondary + color: Colors.surfaceVariant // border.color: Colors.accentPrimary // border.width: Math.max(1, Style.borderThin * scaling) anchors.right: parent.right diff --git a/Widgets/NTooltip.qml b/Widgets/NTooltip.qml index 8f4b8da..a450eb9 100644 --- a/Widgets/NTooltip.qml +++ b/Widgets/NTooltip.qml @@ -138,11 +138,11 @@ Window { gradient: Gradient { GradientStop { position: 0.0 - color: Colors.backgroundTertiary + color: Colors.backgroundSecondary } GradientStop { position: 1.0 - color: Colors.backgroundSecondary + color: Colors.backgroundTertiary } } border.color: Colors.outline