never/noctalia-shell
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add light mode for predefined color schemes

Browse source
This commit is contained in:
Ly-sec 2025-08-18 13:37:43 +02:00
parent c482f800fe
commit 9a71598944
10 changed files with 379 additions and 141 deletions
Download patch file Download diff file Expand all files Collapse all files

74
Services/ColorSchemeService.qml
View file

@ -18,6 +18,8 @@ Singleton {
property bool scanning: false
property string schemesDirectory: Quickshell.shellDir + "/Assets/ColorScheme"
property string colorsJsonFilePath: Settings.configDir + "colors.json"
// Internal: remember last path if needed
property string pendingApplyPath: ""
function loadColorSchemes() {
Logger.log("ColorScheme", "Load ColorScheme")
@ -29,7 +31,11 @@ Singleton {
}
function applyScheme(filePath) {
Quickshell.execDetached(["cp", filePath, colorsJsonFilePath])
// Read the scheme JSON and write the effective variant to colors.json
pendingApplyPath = filePath
// Force reload by bouncing the path
schemeReader.path = ""
schemeReader.path = filePath
}
function changedWallpaper() {
@ -60,6 +66,72 @@ Singleton {
}
}
// Internal loader to read a scheme file
FileView {
id: schemeReader
onLoaded: {
try {
var data = JSON.parse(text())
var variant = data
// If scheme provides dark/light variants, pick based on settings
if (data && (data.dark || data.light)) {
if (Settings.data.colorSchemes.darkMode) {
variant = data.dark || data.light
} else {
variant = data.light || data.dark
}
}
writeColorsToDisk(variant)
} catch (e) {
Logger.error("ColorScheme", "Failed to parse scheme JSON:", e)
}
}
}
// Writer to colors.json using a JsonAdapter for safety
FileView {
id: colorsWriter
path: colorsJsonFilePath
JsonAdapter {
id: out
property color mPrimary: "#000000"
property color mOnPrimary: "#000000"
property color mSecondary: "#000000"
property color mOnSecondary: "#000000"
property color mTertiary: "#000000"
property color mOnTertiary: "#000000"
property color mError: "#ff0000"
property color mOnError: "#000000"
property color mSurface: "#ffffff"
property color mOnSurface: "#000000"
property color mSurfaceVariant: "#cccccc"
property color mOnSurfaceVariant: "#333333"
property color mOutline: "#666666"
property color mOutlineVariant: "#444444"
property color mShadow: "#000000"
}
}
function writeColorsToDisk(obj) {
function pick(o, a, b, fallback) { return (o && (o[a] || o[b])) || fallback }
out.mPrimary = pick(obj, "mPrimary", "primary", out.mPrimary)
out.mOnPrimary = pick(obj, "mOnPrimary", "onPrimary", out.mOnPrimary)
out.mSecondary = pick(obj, "mSecondary", "secondary", out.mSecondary)
out.mOnSecondary = pick(obj, "mOnSecondary", "onSecondary", out.mOnSecondary)
out.mTertiary = pick(obj, "mTertiary", "tertiary", out.mTertiary)
out.mOnTertiary = pick(obj, "mOnTertiary", "onTertiary", out.mOnTertiary)
out.mError = pick(obj, "mError", "error", out.mError)
out.mOnError = pick(obj, "mOnError", "onError", out.mOnError)
out.mSurface = pick(obj, "mSurface", "surface", out.mSurface)
out.mOnSurface = pick(obj, "mOnSurface", "onSurface", out.mOnSurface)
out.mSurfaceVariant = pick(obj, "mSurfaceVariant", "surfaceVariant", out.mSurfaceVariant)
out.mOnSurfaceVariant = pick(obj, "mOnSurfaceVariant", "onSurfaceVariant", out.mOnSurfaceVariant)
out.mOutline = pick(obj, "mOutline", "outline", out.mOutline)
out.mOutlineVariant = pick(obj, "mOutlineVariant", "outlineVariant", out.mOutlineVariant)
out.mShadow = pick(obj, "mShadow", "shadow", out.mShadow)
colorsWriter.writeAdapter()
}
Process {
id: generateColorsProcess
command: {