Merge branch 'main' into module/wifi

Modules/SysTray/Popouts/Network/NetworkOverlay.qml

@@ -1,6 +1,7 @@
 import QtQuick
+import ZShell.Config
+import qs.Services
 import qs.Helpers
-import qs.Config
 import qs.Components
 
 CustomRect {
@@ -10,7 +11,7 @@ CustomRect {
 	readonly property url currentPopup: PopupManager.currentPopup
 	property bool shouldBeVisible: loader.status === Loader.Ready
 
-	color: Qt.alpha(DynamicColors.palette.m3shadow, 0.3)
+	color: Qt.alpha(Colors.palette.m3shadow, 0.3)
 	opacity: shouldBeVisible && !closing ? 1 : 0
 	visible: opacity > 0
 

Modules/SysTray/Popouts/Network/PSKOverlay.qml

@@ -2,7 +2,8 @@ import Quickshell
 import QtQuick
 import QtQuick.Layouts
 import ZShell.Components
-import qs.Config
+import ZShell.Config
+import qs.Services
 import qs.Components
 import qs.Helpers
 
@@ -11,27 +12,27 @@ CustomClippingRect {
 
 	required property var network
 
-	color: DynamicColors.palette.m3surfaceContainer
+	color: Colors.palette.m3surfaceContainer
 	implicitHeight: layout.implicitHeight + layout.anchors.margins * 2
 	implicitWidth: layout.implicitWidth + layout.anchors.margins * 2
-	radius: Appearance.rounding.large
+	radius: Tokens.rounding.large
 
 	ColumnLayout {
 		id: layout
 
 		anchors.fill: parent
-		anchors.margins: Appearance.padding.extraLarge
-		spacing: Appearance.spacing.normal
+		anchors.margins: Tokens.padding.extraLarge
+		spacing: Tokens.spacing.normal
 
 		MaterialIcon {
 			Layout.alignment: Qt.AlignHCenter
-			font.pointSize: Appearance.font.size.extraLarge * 2
+			font.pointSize: Tokens.font.size.extraLarge * 2
 			text: "lock"
 		}
 
 		CustomText {
 			Layout.alignment: Qt.AlignHCenter
-			color: DynamicColors.palette.m3onSurfaceVariant
+			color: Colors.palette.m3onSurfaceVariant
 			text: qsTr("Connect to %1").arg(root.network.name)
 		}
 
@@ -52,14 +53,14 @@ CustomClippingRect {
 			id: buttonRow
 
 			Layout.fillWidth: true
-			spacing: Appearance.spacing.smaller
+			spacing: Tokens.spacing.smaller
 
 			IconTextButton {
 				fillWidth: true
-				font.pointSize: Appearance.font.size.normal
+				font.pointSize: Tokens.font.size.normal
 				icon: "close"
-				inactiveColor: DynamicColors.layer(DynamicColors.palette.m3surfaceContainerHighest, 2)
-				inactiveOnColor: DynamicColors.palette.m3onSurfaceVariant
+				inactiveColor: Colors.layer(Colors.palette.m3surfaceContainerHighest, 2)
+				inactiveOnColor: Colors.palette.m3onSurfaceVariant
 				isRound: true
 				isToggle: false
 				shapeMorph: true
@@ -70,10 +71,10 @@ CustomClippingRect {
 
 			IconTextButton {
 				fillWidth: true
-				font.pointSize: Appearance.font.size.normal
+				font.pointSize: Tokens.font.size.normal
 				icon: Network.connectingNetwork ? "" : "check"
-				inactiveColor: Network.connectingNetwork ? DynamicColors.palette.m3primaryContainer : Network.failedNetwork ? DynamicColors.palette.m3error : DynamicColors.palette.m3primary
-				inactiveOnColor: Network.connectingNetwork ? DynamicColors.palette.m3onPrimaryContainer : Network.failedNetwork ? DynamicColors.palette.m3onError : DynamicColors.palette.m3onPrimary
+				inactiveColor: Network.connectingNetwork ? Colors.palette.m3primaryContainer : Network.failedNetwork ? Colors.palette.m3error : Colors.palette.m3primary
+				inactiveOnColor: Network.connectingNetwork ? Colors.palette.m3onPrimaryContainer : Network.failedNetwork ? Colors.palette.m3onError : Colors.palette.m3onPrimary
 				isRound: true
 				isToggle: false
 				shapeMorph: true
@@ -92,7 +93,7 @@ CustomClippingRect {
 					}
 					sourceComponent: CircularIndicator {
 						bgColor: "transparent"
-						implicitSize: buttonRow.height - Appearance.padding.normal
+						implicitSize: buttonRow.height - Tokens.padding.normal
 						running: true
 					}
 				}