Merge branch 'main' into module/wifi

Components/CircularIndicator.qml

@@ -1,7 +1,8 @@
+import ZShell.Config
+import ZShell.Internal
 import QtQuick
 import QtQuick.Templates
-import ZShell.Internal
-import qs.Config
+import qs.Services
 
 BusyIndicator {
 	id: root
@@ -17,12 +18,12 @@ BusyIndicator {
 	}
 
 	property int animState
-	property color bgColor: DynamicColors.palette.m3secondaryContainer
-	property color fgColor: DynamicColors.palette.m3primary
-	property real implicitSize: Appearance.font.size.medium * 3
+	property color bgColor: Colors.palette.m3secondaryContainer
+	property color fgColor: Colors.palette.m3primary
+	property real implicitSize: Tokens.font.size.normal * 3
 	property real internalStrokeWidth: strokeWidth
 	readonly property alias progress: manager.progress
-	property real strokeWidth: Appearance.padding.extraSmall
+	property real strokeWidth: Tokens.padding.small * 0.8
 	property alias type: manager.indeterminateAnimationType
 
 	implicitHeight: implicitSize
@@ -51,7 +52,7 @@ BusyIndicator {
 	}
 	transitions: Transition {
 		Anim {
-			duration: manager.completeEndDuration * Appearance.anim.durations.scale
+			duration: manager.completeEndDuration * Tokens.anim.durations.scale
 			properties: "opacity,internalStrokeWidth"
 			type: Anim.DefaultEffects
 		}
@@ -78,7 +79,7 @@ BusyIndicator {
 	}
 
 	NumberAnimation {
-		duration: manager.duration * Appearance.anim.durations.scale
+		duration: manager.duration * Tokens.anim.durations.scale
 		from: 0
 		loops: Animation.Infinite
 		property: "progress"
@@ -88,7 +89,7 @@ BusyIndicator {
 	}
 
 	NumberAnimation {
-		duration: manager.completeEndDuration * Appearance.anim.durations.scale
+		duration: manager.completeEndDuration * Tokens.anim.durations.scale
 		from: 0
 		property: "completeEndProgress"
 		running: root.animState === CircularIndicator.Completing