refactor: move colours to separate service

7 files changed, 13 insertions, 12 deletions

diff --git a/modules/launcher/ActionItem.qml b/modules/launcher/ActionItem.qml
index f23cf0a..f4f7e2f 100644
--- a/modules/launcher/ActionItem.qml
+++ b/modules/launcher/ActionItem.qml
@@ -1,6 +1,6 @@
 import "root:/widgets"
+import "root:/services"
 import "root:/config"
-import Quickshell
 import QtQuick
 
 PaddedRect {
@@ -50,7 +50,7 @@ PaddedRect {
         StyledText {
             text: root.modelData.desc
             font.pointSize: Appearance.font.size.small
-            color: Appearance.alpha(Appearance.colours.m3outline, true)
+            color: Colours.alpha(Colours.palette.m3outline, true)
 
             elide: Text.ElideRight
             width: root.width - icon.width - Appearance.rounding.normal * 2
diff --git a/modules/launcher/AppItem.qml b/modules/launcher/AppItem.qml
index ea67682..dd0682f 100644
--- a/modules/launcher/AppItem.qml
+++ b/modules/launcher/AppItem.qml
@@ -1,4 +1,5 @@
 import "root:/widgets"
+import "root:/services"
 import "root:/config"
 import Quickshell
 import Quickshell.Widgets
@@ -52,7 +53,7 @@ PaddedRect {
         StyledText {
             text: root.modelData.comment || root.modelData.genericName || root.modelData.name
             font.pointSize: Appearance.font.size.small
-            color: Appearance.alpha(Appearance.colours.m3outline, true)
+            color: Colours.alpha(Colours.palette.m3outline, true)
 
             elide: Text.ElideRight
             width: root.width - icon.width - Appearance.rounding.normal * 2
diff --git a/modules/launcher/AppList.qml b/modules/launcher/AppList.qml
index 5dfdf8b..dc58402 100644
--- a/modules/launcher/AppList.qml
+++ b/modules/launcher/AppList.qml
@@ -39,7 +39,7 @@ ListView {
 
     highlight: StyledRect {
         radius: Appearance.rounding.normal
-        color: Appearance.alpha(Appearance.colours.m3surfaceContainerHigh, true)
+        color: Colours.alpha(Colours.palette.m3surfaceContainerHigh, true)
     }
 
     delegate: isAction ? actionItem : appItem
diff --git a/modules/launcher/Background.qml b/modules/launcher/Background.qml
index 7bffd26..7dce14a 100644
--- a/modules/launcher/Background.qml
+++ b/modules/launcher/Background.qml
@@ -1,3 +1,4 @@
+import "root:/services"
 import "root:/config"
 import QtQuick
 import QtQuick.Shapes
@@ -12,11 +13,11 @@ Shape {
     readonly property real wrapperHeight: realWrapperHeight - 1 // Pixel issues :sob:
 
     preferredRendererType: Shape.CurveRenderer
-    opacity: Appearance.transparency.enabled ? Appearance.transparency.base : 1
+    opacity: Colours.transparency.enabled ? Colours.transparency.base : 1
 
     ShapePath {
         strokeWidth: -1
-        fillColor: Appearance.colours.m3surface
+        fillColor: Colours.palette.m3surface
 
         startY: root.wrapperHeight
 
diff --git a/modules/launcher/Content.qml b/modules/launcher/Content.qml
index 41904f7..6ecced5 100644
--- a/modules/launcher/Content.qml
+++ b/modules/launcher/Content.qml
@@ -5,7 +5,6 @@ import "root:/services"
 import "root:/config"
 import Quickshell
 import QtQuick
-import QtQuick.Controls
 
 Item {
     id: root
@@ -24,7 +23,7 @@ Item {
     StyledRect {
         id: listWrapper
 
-        color: Appearance.alpha(Appearance.colours.m3surfaceContainer, true)
+        color: Colours.alpha(Colours.palette.m3surfaceContainer, true)
         radius: root.rounding
 
         implicitWidth: list.width + root.padding * 2
@@ -61,7 +60,7 @@ Item {
         placeholderText: qsTr(`Type "${LauncherConfig.actionPrefix}" for commands`)
 
         background: StyledRect {
-            color: Appearance.alpha(Appearance.colours.m3surfaceContainer, true)
+            color: Colours.alpha(Colours.palette.m3surfaceContainer, true)
             radius: root.rounding
         }
 
diff --git a/modules/launcher/ContentList.qml b/modules/launcher/ContentList.qml
index 253bcf0..5f8c783 100644
--- a/modules/launcher/ContentList.qml
+++ b/modules/launcher/ContentList.qml
@@ -139,7 +139,7 @@ Item {
             id: icon
 
             text: "manage_search"
-            color: Appearance.colours.m3onSurfaceVariant
+            color: Colours.palette.m3onSurfaceVariant
             font.pointSize: Appearance.font.size.extraLarge
 
             anchors.verticalCenter: parent.verticalCenter
@@ -153,7 +153,7 @@ Item {
             anchors.verticalCenter: parent.verticalCenter
 
             text: qsTr("No results")
-            color: Appearance.colours.m3onSurfaceVariant
+            color: Colours.palette.m3onSurfaceVariant
             font.pointSize: Appearance.font.size.larger
             font.weight: 500
         }
diff --git a/modules/launcher/WallpaperItem.qml b/modules/launcher/WallpaperItem.qml
index c0b91d4..22f8eda 100644
--- a/modules/launcher/WallpaperItem.qml
+++ b/modules/launcher/WallpaperItem.qml
@@ -60,7 +60,7 @@ StyledRect {
         opacity: root.PathView.isCurrentItem ? 0.7 : 0
         anchors.fill: mask
         radius: mask.radius
-        color: Appearance.colours.m3shadow
+        color: Colours.palette.m3shadow
         blur: 10
         spread: 3