From 67f568dac14e3eef4d36bb21debeb0dcff40e798 Mon Sep 17 00:00:00 2001 From: quadbyte Date: Fri, 15 Aug 2025 16:29:14 -0400 Subject: [PATCH] Better color schemes --- Assets/ColorSchemes/Catppuccin.json | 2 +- Assets/ColorSchemes/Dracula.json | 4 +- Assets/ColorSchemes/Gruvbox.json | 4 +- Assets/ColorSchemes/Nord.json | 2 +- Assets/ColorSchemes/Rosepine (default).json | 8 ++-- Assets/ColorSchemes/Tokyo Night.json | 19 +++++++++ Modules/Settings/Tabs/ColorSchemeTab.qml | 43 ++++++++++++--------- Services/Colors.qml | 6 +-- 8 files changed, 56 insertions(+), 32 deletions(-) create mode 100644 Assets/ColorSchemes/Tokyo Night.json diff --git a/Assets/ColorSchemes/Catppuccin.json b/Assets/ColorSchemes/Catppuccin.json index aebe0e3..ac63b64 100644 --- a/Assets/ColorSchemes/Catppuccin.json +++ b/Assets/ColorSchemes/Catppuccin.json @@ -14,6 +14,6 @@ "mSurfaceVariant": "#313244", "mOnSurfaceVariant": "#a3b4eb", "mOutline": "#45475a", - "mOutlineVariant": "#585b70", + "mOutlineVariant": "#2f303d", "mShadow": "#11111b" } diff --git a/Assets/ColorSchemes/Dracula.json b/Assets/ColorSchemes/Dracula.json index 5e8aa9d..deb173c 100644 --- a/Assets/ColorSchemes/Dracula.json +++ b/Assets/ColorSchemes/Dracula.json @@ -13,7 +13,7 @@ "mOnSurface": "#F8F8F2", "mSurfaceVariant": "#44475A", "mOnSurfaceVariant": "#d6d8e0", - "mOutline": "#6272A4", - "mOutlineVariant": "#4c566a", + "mOutline": "#4d5c86", + "mOutlineVariant": "#3a4666", "mShadow": "#282A36" } diff --git a/Assets/ColorSchemes/Gruvbox.json b/Assets/ColorSchemes/Gruvbox.json index 519884e..654223d 100644 --- a/Assets/ColorSchemes/Gruvbox.json +++ b/Assets/ColorSchemes/Gruvbox.json @@ -13,7 +13,7 @@ "mOnSurface": "#fbf1c7", "mSurfaceVariant": "#3c3836", "mOnSurfaceVariant": "#ebdbb2", - "mOutline": "#928374", - "mOutlineVariant": "#bfb6ad", + "mOutline": "#665c54", + "mOutlineVariant": "#3c3836", "mShadow": "#282828" } diff --git a/Assets/ColorSchemes/Nord.json b/Assets/ColorSchemes/Nord.json index a0dc572..1335d43 100644 --- a/Assets/ColorSchemes/Nord.json +++ b/Assets/ColorSchemes/Nord.json @@ -14,6 +14,6 @@ "mSurfaceVariant": "#3b4252", "mOnSurfaceVariant": "#e5e9f0", "mOutline": "#434c5e", - "mOutlineVariant": "#4c566a", + "mOutlineVariant": "#2e3440", "mShadow": "#2e3440" } diff --git a/Assets/ColorSchemes/Rosepine (default).json b/Assets/ColorSchemes/Rosepine (default).json index cd7a688..6712840 100644 --- a/Assets/ColorSchemes/Rosepine (default).json +++ b/Assets/ColorSchemes/Rosepine (default).json @@ -1,19 +1,19 @@ { "mPrimary": "#ebbcba", - "mOnPrimary": "#191724", + "mOnPrimary": "#1f1d2e", "mSecondary": "#31748f", "mOnSecondary": "#e0def4", "mTertiary": "#9ccfd8", "mOnTertiary": "#191724", "mError": "#eb6f92", - "mOnError": "#191724", + "mOnError": "#1f1d2e", - "mSurface": "#191724", + "mSurface": "#1f1d2e", "mOnSurface": "#e0def4", "mSurfaceVariant": "#26233a", "mOnSurfaceVariant": "#908caa", "mOutline": "#44415a", - "mOutlineVariant": "#514e6c", + "mOutlineVariant": "#2e2c3c", "mShadow": "#191724" } diff --git a/Assets/ColorSchemes/Tokyo Night.json b/Assets/ColorSchemes/Tokyo Night.json new file mode 100644 index 0000000..49a4d74 --- /dev/null +++ b/Assets/ColorSchemes/Tokyo Night.json @@ -0,0 +1,19 @@ +{ + "mPrimary": "#ff9e64", + "mOnPrimary": "#1a1b26", + "mSecondary": "#ff4499", + "mOnSecondary": "#1a1b26", + "mTertiary": "#7aa2f7", + "mOnTertiary": "#1a1b26", + + "mError": "#f7768e", + "mOnError": "#1f1d2e", + + "mSurface": "#1a1b26", + "mOnSurface": "#a9b1d6", + "mSurfaceVariant": "#292e42", + "mOnSurfaceVariant": "#787c99", + "mOutline": "#3b4261", + "mOutlineVariant": "#282c41", + "mShadow": "#1a1b26" +} diff --git a/Modules/Settings/Tabs/ColorSchemeTab.qml b/Modules/Settings/Tabs/ColorSchemeTab.qml index 5e32b8f..8e6b895 100644 --- a/Modules/Settings/Tabs/ColorSchemeTab.qml +++ b/Modules/Settings/Tabs/ColorSchemeTab.qml @@ -45,26 +45,31 @@ ColumnLayout { } } - ButtonGroup { - id: schemesGroup - } + ColumnLayout { + spacing: Style.marginTiny * scaling + Layout.fillWidth: true - Repeater { - model: ColorSchemes.schemes - NRadioButton { - property string schemePath: modelData - ButtonGroup.group: schemesGroup - text: { - // Remove json and the full path - var chunks = schemePath.replace(".json", "").split("/") - return chunks[chunks.length - 1] - } - checked: Settings.data.colorSchemes.predefinedScheme == schemePath - onClicked: { - // Disable useWallpaperColors when picking a predefined color scheme - Settings.data.colorSchemes.useWallpaperColors = false - Settings.data.colorSchemes.predefinedScheme = schemePath - ColorSchemes.applyScheme(schemePath) + ButtonGroup { + id: schemesGroup + } + + Repeater { + model: ColorSchemes.schemes + NRadioButton { + property string schemePath: modelData + ButtonGroup.group: schemesGroup + text: { + // Remove json and the full path + var chunks = schemePath.replace(".json", "").split("/") + return chunks[chunks.length - 1] + } + checked: Settings.data.colorSchemes.predefinedScheme == schemePath + onClicked: { + // Disable useWallpaperColors when picking a predefined color scheme + Settings.data.colorSchemes.useWallpaperColors = false + Settings.data.colorSchemes.predefinedScheme = schemePath + ColorSchemes.applyScheme(schemePath) + } } } } diff --git a/Services/Colors.qml b/Services/Colors.qml index b866ff1..2a20655 100644 --- a/Services/Colors.qml +++ b/Services/Colors.qml @@ -45,16 +45,16 @@ Singleton { id: defaultColors property color mPrimary: "#ebbcba" - property color mOnPrimary: "#191724" + property color mOnPrimary: "#1f1d2e" property color mSecondary: "#31748f" property color mOnSecondary: "#e0def4" property color mTertiary: "#9ccfd8" property color mOnTertiary: "#191724" property color mError: "#eb6f92" - property color mOnError: "#191724" + property color mOnError: "#1f1d2e" - property color mSurface: "#191724" + property color mSurface: "#1f1d2e" property color mOnSurface: "#e0def4" property color mSurfaceVariant: "#26233a" property color mOnSurfaceVariant: "#908caa"