From 2136b8c153f43524967dde4d1214e1093f31da0b Mon Sep 17 00:00:00 2001
From: 2 * r + 2 * t <61896496+soramanew@users.noreply.github.com>
Date: Wed, 11 Jun 2025 23:02:42 +1000
Subject: colours: update for scheme refactor

---
 services/Colours.qml | 23 +++++++++--------------
 1 file changed, 9 insertions(+), 14 deletions(-)

(limited to 'services')

diff --git a/services/Colours.qml b/services/Colours.qml
index 4383972..3751240 100644
--- a/services/Colours.qml
+++ b/services/Colours.qml
@@ -36,12 +36,14 @@ Singleton {
 
     function load(data: string, isPreview: bool): void {
         const colours = isPreview ? preview : current;
-        for (const line of data.trim().split("\n")) {
-            let [name, colour] = line.split(" ");
-            name = name.trim();
-            name = colourNames.includes(name) ? name : `m3${name}`;
-            if (colours.hasOwnProperty(name))
-                colours[name] = `#${colour.trim()}`;
+        const scheme = JSON.parse(data);
+
+        light = scheme.mode === "light";
+
+        for (const [name, colour] of Object.entries(scheme.colours)) {
+            const propName = colourNames.includes(name) ? name : `m3${name}`;
+            if (colours.hasOwnProperty(propName))
+                colours[propName] = `#${colour}`;
         }
 
         if (!isPreview || (isPreview && endPreviewOnNextChange)) {
@@ -60,14 +62,7 @@ Singleton {
     }
 
     FileView {
-        path: `${Paths.state}/scheme/current-mode.txt`
-        watchChanges: true
-        onFileChanged: reload()
-        onLoaded: root.light = text() === "light"
-    }
-
-    FileView {
-        path: `${Paths.state}/scheme/current.txt`
+        path: `${Paths.state}/scheme.json`
         watchChanges: true
         onFileChanged: reload()
         onLoaded: root.load(text(), false)
-- 
cgit v1.2.3-freya


From 53db2c572f0757cca578896b2d0de162a5561072 Mon Sep 17 00:00:00 2001
From: 2 * r + 2 * t <61896496+soramanew@users.noreply.github.com>
Date: Thu, 12 Jun 2025 21:58:01 +1000
Subject: wallpapers: update current path

---
 services/Wallpapers.qml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'services')

diff --git a/services/Wallpapers.qml b/services/Wallpapers.qml
index 3f6bf15..1f29105 100644
--- a/services/Wallpapers.qml
+++ b/services/Wallpapers.qml
@@ -9,7 +9,7 @@ import QtQuick
 Singleton {
     id: root
 
-    readonly property string currentNamePath: `${Paths.state}/wallpaper/last.txt`.slice(7)
+    readonly property string currentNamePath: `${Paths.state}/wallpaper/path.txt`.slice(7)
     readonly property string path: `${Paths.pictures}/Wallpapers`.slice(7)
 
     readonly property list<Wallpaper> list: wallpapers.instances
-- 
cgit v1.2.3-freya


From 07d06938c9fc4c0ac40c1e3727f9ff74a23adb76 Mon Sep 17 00:00:00 2001
From: 2 * r + 2 * t <61896496+soramanew@users.noreply.github.com>
Date: Thu, 12 Jun 2025 21:59:07 +1000
Subject: wallpapers: update valid wall extensions

---
 services/Wallpapers.qml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'services')

diff --git a/services/Wallpapers.qml b/services/Wallpapers.qml
index 1f29105..44ca6a0 100644
--- a/services/Wallpapers.qml
+++ b/services/Wallpapers.qml
@@ -97,7 +97,7 @@ Singleton {
 
     Process {
         running: true
-        command: ["fd", ".", root.path, "-t", "f", "-e", "jpg", "-e", "jpeg", "-e", "png", "-e", "svg"]
+        command: ["fd", ".", root.path, "-t", "f", "-e", "jpg", "-e", "jpeg", "-e", "png", "-e", "webp", "-e", "tif", "-e", "tiff"]
         stdout: SplitParser {
             splitMarker: ""
             onRead: data => wallpapers.model = data.trim().split("\n")
-- 
cgit v1.2.3-freya