Merge branch 'main' into feat/reposition-bar

Modules/Resource.qml

@@ -2,12 +2,13 @@ import QtQuick
 import QtQuick.Layouts
 import QtQuick.Shapes
 import qs.Components
-import qs.Config
+import ZShell.Config
+import qs.Services
 
 GridLayout {
 	id: root
 
-	property color accentColor: warning ? DynamicColors.palette.m3error : mainColor
+	property color accentColor: warning ? Colors.palette.m3error : mainColor
 	property real animatedPercentage: 0
 	readonly property real arcStartAngle: 0.75 * Math.PI
 	readonly property real arcSweep: 1.5 * Math.PI
@@ -17,11 +18,11 @@ GridLayout {
 	required property color mainColor
 	required property double percentage
 	property bool shown: true
-	property color usageColor: warning ? DynamicColors.palette.m3error : mainColor
+	property color usageColor: warning ? Colors.palette.m3error : mainColor
 	property bool warning: percentage * 100 >= warningThreshold
 	property int warningThreshold: 80
 
-	columnSpacing: Appearance.spacing.smaller
+	columnSpacing: Tokens.spacing.smaller
 	columns: horizontal ? -1 : 1
 	percentage: 0
 
@@ -43,15 +44,15 @@ GridLayout {
 
 		Layout.preferredWidth: 16
 		color: root.iconColor
-		font.pointSize: Appearance.font.size.larger
+		font.pointSize: Tokens.font.size.larger
 		text: root.icon
 	}
 
 	CustomClippingRect {
 		Layout.preferredHeight: root.horizontal ? icon.implicitHeight : 4
 		Layout.preferredWidth: root.horizontal ? 4 : icon.implicitWidth
-		color: DynamicColors.layer(DynamicColors.palette.m3surfaceContainerHigh, 2)
-		radius: Appearance.rounding.full
+		color: Colors.layer(Colors.palette.m3surfaceContainerHigh, 2)
+		radius: Tokens.rounding.full
 
 		CustomRect {
 			id: fill