Merge branch 'main' into module/wifi

Modules/Dock/Content.qml

@@ -6,7 +6,7 @@ import QtQml.Models
 import qs.Modules.Dock.Parts
 import qs.Components
 import qs.Helpers
-import qs.Config
+import ZShell.Config
 
 Item {
 	id: root
@@ -22,10 +22,10 @@ Item {
 	property string draggedAppId: ""
 	property var draggedModelData: null
 	property bool dropAnimating: false
-	readonly property int padding: Appearance.padding.small
+	readonly property int padding: Tokens.padding.small
 	required property var panels
 	property var pendingCommitIds: []
-	readonly property int rounding: Appearance.rounding.large
+	readonly property int rounding: Tokens.rounding.large
 	required property ShellScreen screen
 	required property PersistentProperties visibilities
 	property var visualIds: []
@@ -119,7 +119,7 @@ Item {
 		Anim {
 			id: settleX
 
-			duration: Appearance.anim.durations.normal
+			duration: Tokens.anim.durations.normal
 			property: "dragX"
 			target: root
 		}
@@ -127,7 +127,7 @@ Item {
 		Anim {
 			id: settleY
 
-			duration: Appearance.anim.durations.normal
+			duration: Tokens.anim.durations.normal
 			property: "dragY"
 			target: root
 		}
@@ -247,7 +247,7 @@ Item {
 		property bool enableAddAnimation: false
 
 		anchors.left: parent.left
-		anchors.margins: Appearance.padding.small
+		anchors.margins: Tokens.padding.small
 		anchors.top: parent.top
 		boundsBehavior: Flickable.StopAtBounds
 		height: Config.dock.height
@@ -255,19 +255,19 @@ Item {
 		interactive: !(root.dragActive || root.dropAnimating)
 		model: visualModel
 		orientation: ListView.Horizontal
-		spacing: Appearance.padding.smaller
+		spacing: Tokens.padding.smaller
 
 		add: Transition {
 			ParallelAnimation {
 				Anim {
-					duration: dockRow.enableAddAnimation ? Appearance.anim.durations.normal : 0
+					duration: dockRow.enableAddAnimation ? Tokens.anim.durations.normal : 0
 					from: 0
 					property: "opacity"
 					to: 1
 				}
 
 				Anim {
-					duration: dockRow.enableAddAnimation ? Appearance.anim.durations.normal : 0
+					duration: dockRow.enableAddAnimation ? Tokens.anim.durations.normal : 0
 					from: 0.5
 					property: "scale"
 					to: 1
@@ -276,13 +276,13 @@ Item {
 		}
 		displaced: Transition {
 			Anim {
-				duration: Appearance.anim.durations.small
+				duration: Tokens.anim.durations.small
 				properties: "x,y"
 			}
 		}
 		move: Transition {
 			Anim {
-				duration: Appearance.anim.durations.small
+				duration: Tokens.anim.durations.small
 				properties: "x,y"
 			}
 		}

Modules/Dock/Parts/DockAppButton.qml

@@ -4,7 +4,8 @@ import Quickshell
 import Quickshell.Widgets
 import qs.Components
 import qs.Helpers
-import qs.Config
+import ZShell.Config
+import qs.Services
 
 CustomRect {
 	id: root
@@ -22,7 +23,7 @@ CustomRect {
 
 	implicitHeight: Config.dock.height
 	implicitWidth: isSeparator ? 1 : implicitHeight
-	radius: Appearance.rounding.normal - Appearance.padding.small
+	radius: Tokens.rounding.normal - Tokens.padding.small
 
 	Loader {
 		active: !isSeparator
@@ -47,10 +48,10 @@ CustomRect {
 					delegate: Rectangle {
 						required property int index
 
-						color: appIsActive ? DynamicColors.palette.m3primary : DynamicColors.tPalette.m3primary
+						color: appIsActive ? Colors.palette.m3primary : Colors.tPalette.m3primary
 						implicitHeight: root.countDotHeight
 						implicitWidth: (appToplevel?.toplevels.length <= 3) ? root.countDotWidth : root.countDotHeight // Circles when too many
-						radius: Appearance.rounding.full
+						radius: Tokens.rounding.full
 					}
 				}
 			}

Modules/Dock/Parts/DockSeparator.qml

@@ -1,12 +1,13 @@
 import QtQuick
 import QtQuick.Layouts
 import qs.Components
-import qs.Config
+import ZShell.Config
+import qs.Services
 
 CustomRect {
-	Layout.bottomMargin: dockRow.padding + Appearance.rounding.normal
+	Layout.bottomMargin: dockRow.padding + Tokens.rounding.normal
 	Layout.fillHeight: true
-	Layout.topMargin: dockRow.padding + Appearance.rounding.normal
-	color: DynamicColors.palette.m3outlineVariant
+	Layout.topMargin: dockRow.padding + Tokens.rounding.normal
+	color: Colors.palette.m3outlineVariant
 	implicitWidth: 1
 }

Modules/Dock/Wrapper.qml

@@ -3,7 +3,7 @@ pragma ComponentBehavior: Bound
 import Quickshell
 import QtQuick
 import qs.Components
-import qs.Config
+import ZShell.Config
 
 Item {
 	id: root
@@ -23,8 +23,8 @@ Item {
 
 	Behavior on offsetScale {
 		Anim {
-			duration: Appearance.anim.durations.expressiveDefaultSpatial
-			easing.bezierCurve: Appearance.anim.curves.expressiveDefaultSpatial
+			duration: Tokens.anim.durations.expressiveDefaultSpatial
+			easing.bezierCurve: Tokens.anim.curves.expressiveDefaultSpatial
 		}
 	}