Merge branch 'main' into feat/reposition-bar

Modules/Updates/UpdatesWidget.qml

@@ -3,37 +3,38 @@ import QtQuick.Layouts
 import qs.Components
 import qs.Modules
 import qs.Helpers
-import qs.Config
+import ZShell.Config
+import qs.Services
 
 CustomRect {
 	id: root
 
 	property int countUpdates: Updates.availableUpdates
 	required property bool horizontal
-	property color textColor: DynamicColors.palette.m3onSurface
+	property color textColor: Colors.palette.m3onSurface
 
-	color: DynamicColors.tPalette.m3surfaceContainer
-	implicitHeight: horizontal ? Config.bar.height : content.implicitHeight + Appearance.spacing.small * 2
-	implicitWidth: horizontal ? content.implicitWidth + Appearance.spacing.small * 2 : Config.bar.height
-	radius: Appearance.rounding.full
+	color: Colors.tPalette.m3surfaceContainer
+	implicitHeight: horizontal ? Config.bar.height : content.implicitHeight + Tokens.spacing.small * 2
+	implicitWidth: horizontal ? content.implicitWidth + Tokens.spacing.small * 2 : Config.bar.height
+	radius: Tokens.rounding.full
 
 	GridLayout {
 		id: content
 
 		anchors.centerIn: parent
-		columnSpacing: Appearance.spacing.small
+		columnSpacing: Tokens.spacing.small
 		columns: root.horizontal ? -1 : 1
 
 		MaterialIcon {
 			Layout.alignment: root.horizontal ? Qt.AlignVCenter : Qt.AlignHCenter
-			font.pointSize: root.horizontal ? Appearance.font.size.larger : Appearance.font.size.large
+			font.pointSize: root.horizontal ? Tokens.font.size.larger : Tokens.font.size.large
 			text: "package_2"
 		}
 
 		CustomText {
 			Layout.alignment: root.horizontal ? Qt.AlignVCenter : Qt.AlignHCenter
 			color: root.textColor
-			font.pointSize: root.horizontal ? Appearance.font.size.normal : Appearance.font.size.larger
+			font.pointSize: root.horizontal ? Tokens.font.size.normal : Tokens.font.size.larger
 			text: root.countUpdates
 		}
 	}