Merge branch 'main' into feat/peripheral-integration

Modules/SysTray/Widgets/AudioWidget.qml

@@ -4,75 +4,29 @@ import Quickshell.Io
 import Quickshell.Services.Pipewire
 import qs.Daemons
 import qs.Modules
-import qs.Config
+import ZShell.Config
 import qs.Components
+import qs.Services
 
-RowLayout {
-	id: root
+MaterialIcon {
+	id: speaker
 
-	property color barColor: DynamicColors.palette.m3primary
-	readonly property bool hasContent: mic.visible || speaker.visible
-	property color textColor: DynamicColors.palette.m3onSurface
+	animate: true
+	color: Audio.muted ? Colors.palette.m3error : Colors.palette.m3onSurface
+	fill: 1
+	font.pointSize: Tokens.font.size.larger
+	text: Audio.muted ? "volume_off" : "volume_up"
 
-	width: hasContent ? implicitWidth : 0
-
-	MaterialIcon {
-		id: mic
-
-		readonly property bool shouldBeVisible: Config.bar.tray.showMicrophone
-
-		Layout.alignment: Qt.AlignVCenter
-		Layout.maximumWidth: shouldBeVisible ? implicitWidth : 0
-		animate: true
-		color: (Audio.sourceMuted ?? false) ? DynamicColors.palette.m3error : root.textColor
-		fill: 1
-		font.pointSize: Appearance.font.size.larger
-		opacity: shouldBeVisible ? 1 : 0
-		scale: shouldBeVisible ? 1 : 0
-		text: Audio.sourceMuted ? "mic_off" : "mic"
-		visible: opacity > 0
-
-		Behavior on Layout.maximumWidth {
-			Anim {
-			}
-		}
-		Behavior on opacity {
-			Anim {
-			}
-		}
-		Behavior on scale {
-			Anim {
-			}
+	Behavior on Layout.maximumWidth {
+		Anim {
 		}
 	}
-
-	MaterialIcon {
-		id: speaker
-
-		readonly property bool shouldBeVisible: Config.bar.tray.showAudio
-
-		Layout.alignment: Qt.AlignVCenter
-		Layout.maximumWidth: shouldBeVisible ? implicitWidth : 0
-		animate: true
-		color: Audio.muted ? DynamicColors.palette.m3error : root.textColor
-		fill: 1
-		font.pointSize: Appearance.font.size.larger
-		opacity: shouldBeVisible ? 1 : 0
-		scale: shouldBeVisible ? 1 : 0
-		text: Audio.muted ? "volume_off" : "volume_up"
-		visible: opacity > 0
-
-		Behavior on Layout.maximumWidth {
-			Anim {
-			}
+	Behavior on opacity {
+		Anim {
 		}
-		Behavior on opacity {
-			Anim {
-			}
-		}
-		Behavior on scale {
-			Anim {
-			}
+	}
+	Behavior on scale {
+		Anim {
 		}
 	}
 }

Modules/SysTray/Widgets/MicWidget.qml

@@ -0,0 +1,32 @@
+import QtQuick
+import QtQuick.Layouts
+import Quickshell.Io
+import Quickshell.Services.Pipewire
+import qs.Daemons
+import qs.Modules
+import ZShell.Config
+import qs.Components
+import qs.Services
+
+MaterialIcon {
+	id: mic
+
+	animate: true
+	color: (Audio.sourceMuted ?? false) ? Colors.palette.m3error : Colors.palette.m3onSurface
+	fill: 1
+	font.pointSize: Tokens.font.size.larger
+	text: Audio.sourceMuted ? "mic_off" : "mic"
+
+	Behavior on Layout.maximumWidth {
+		Anim {
+		}
+	}
+	Behavior on opacity {
+		Anim {
+		}
+	}
+	Behavior on scale {
+		Anim {
+		}
+	}
+}

Modules/SysTray/Widgets/UPowerWidget.qml

@@ -3,21 +3,15 @@ import QtQuick
 import QtQuick.Layouts
 import qs.Modules.SysTray.Common
 import qs.Components
-import qs.Config
 import qs.Helpers
 
 Item {
 	id: root
 
 	readonly property Item currentItem: batteryIconLoader?.item ?? peripheralIconLoader?.item ?? upowerIconLoader.item
-	readonly property bool shouldBeActive: Config.bar.tray.showPower
 
-	Layout.preferredHeight: shouldBeActive ? implicitHeight : 0
-	Layout.preferredWidth: shouldBeActive ? implicitWidth : 0
 	implicitHeight: currentItem?.implicitHeight ?? 0
 	implicitWidth: currentItem?.implicitWidth ?? 0
-	opacity: shouldBeActive ? 1 : 0
-	scale: shouldBeActive ? 1 : 0
 	visible: opacity > 0
 
 	Behavior on Layout.preferredHeight {