modules cleanup and qmlfmt everywhere

- throw in 24H clock fix and app drawer fix too
2026-01-29 07:52:50 -05:00 · 2025-09-03 23:26:07 -04:00
parent 178ccd3634
commit 21867c842f
55 changed files with 2720 additions and 3236 deletions
--- a/Modules/TopBar/Battery.qml
+++ b/Modules/TopBar/Battery.qml
@@ -15,113 +15,156 @@ Rectangle {
    property real barHeight: 48
    readonly property real horizontalPadding: SettingsData.topBarNoBackground ? 0 : Math.max(Theme.spacingXS, Theme.spacingS * (widgetHeight / 30))

-    signal toggleBatteryPopup
+    signal toggleBatteryPopup()

    width: batteryContent.implicitWidth + horizontalPadding * 2
    height: widgetHeight
    radius: SettingsData.topBarNoBackground ? 0 : Theme.cornerRadius
    color: {
-        if (SettingsData.topBarNoBackground) return "transparent"
-        const baseColor = batteryArea.containsMouse
-                        || batteryPopupVisible ? Theme.primaryPressed : Theme.secondaryHover
-        return Qt.rgba(baseColor.r, baseColor.g, baseColor.b,
-                       baseColor.a * Theme.widgetTransparency)
+        if (SettingsData.topBarNoBackground)
+            return "transparent";
+
+        const baseColor = batteryArea.containsMouse || batteryPopupVisible ? Theme.primaryPressed : Theme.secondaryHover;
+        return Qt.rgba(baseColor.r, baseColor.g, baseColor.b, baseColor.a * Theme.widgetTransparency);
    }
    visible: true

    Row {
        id: batteryContent
+
        anchors.centerIn: parent
        spacing: SettingsData.topBarNoBackground ? 1 : 2

        DankIcon {
            name: {
-                if (!BatteryService.batteryAvailable)
-                    return "power"
+                if (!BatteryService.batteryAvailable) {
+                    return "power";
+                }

                if (BatteryService.isCharging) {
-                    if (BatteryService.batteryLevel >= 90)
-                        return "battery_charging_full"
-                    if (BatteryService.batteryLevel >= 80)
-                        return "battery_charging_90"
-                    if (BatteryService.batteryLevel >= 60)
-                        return "battery_charging_80"
-                    if (BatteryService.batteryLevel >= 50)
-                        return "battery_charging_60"
-                    if (BatteryService.batteryLevel >= 30)
-                        return "battery_charging_50"
-                    if (BatteryService.batteryLevel >= 20)
-                        return "battery_charging_30"
-                    return "battery_charging_20"
-                }
+                    if (BatteryService.batteryLevel >= 90) {
+                        return "battery_charging_full";
+                    }

+                    if (BatteryService.batteryLevel >= 80) {
+                        return "battery_charging_90";
+                    }
+
+                    if (BatteryService.batteryLevel >= 60) {
+                        return "battery_charging_80";
+                    }
+
+                    if (BatteryService.batteryLevel >= 50) {
+                        return "battery_charging_60";
+                    }
+
+                    if (BatteryService.batteryLevel >= 30) {
+                        return "battery_charging_50";
+                    }
+
+                    if (BatteryService.batteryLevel >= 20) {
+                        return "battery_charging_30";
+                    }
+
+                    return "battery_charging_20";
+                }
                // Check if plugged in but not charging (like at 80% charge limit)
                if (BatteryService.isPluggedIn) {
-                    if (BatteryService.batteryLevel >= 90)
-                        return "battery_charging_full"
-                    if (BatteryService.batteryLevel >= 80)
-                        return "battery_charging_90"
-                    if (BatteryService.batteryLevel >= 60)
-                        return "battery_charging_80"
-                    if (BatteryService.batteryLevel >= 50)
-                        return "battery_charging_60"
-                    if (BatteryService.batteryLevel >= 30)
-                        return "battery_charging_50"
-                    if (BatteryService.batteryLevel >= 20)
-                        return "battery_charging_30"
-                    return "battery_charging_20"
+                    if (BatteryService.batteryLevel >= 90) {
+                        return "battery_charging_full";
+                    }
+
+                    if (BatteryService.batteryLevel >= 80) {
+                        return "battery_charging_90";
+                    }
+
+                    if (BatteryService.batteryLevel >= 60) {
+                        return "battery_charging_80";
+                    }
+
+                    if (BatteryService.batteryLevel >= 50) {
+                        return "battery_charging_60";
+                    }
+
+                    if (BatteryService.batteryLevel >= 30) {
+                        return "battery_charging_50";
+                    }
+
+                    if (BatteryService.batteryLevel >= 20) {
+                        return "battery_charging_30";
+                    }
+
+                    return "battery_charging_20";
+                }
+                // On battery power
+                if (BatteryService.batteryLevel >= 95) {
+                    return "battery_full";
                }

-                // On battery power
-                if (BatteryService.batteryLevel >= 95)
-                    return "battery_full"
-                if (BatteryService.batteryLevel >= 85)
-                    return "battery_6_bar"
-                if (BatteryService.batteryLevel >= 70)
-                    return "battery_5_bar"
-                if (BatteryService.batteryLevel >= 55)
-                    return "battery_4_bar"
-                if (BatteryService.batteryLevel >= 40)
-                    return "battery_3_bar"
-                if (BatteryService.batteryLevel >= 25)
-                    return "battery_2_bar"
-                return "battery_1_bar"
+                if (BatteryService.batteryLevel >= 85) {
+                    return "battery_6_bar";
+                }
+
+                if (BatteryService.batteryLevel >= 70) {
+                    return "battery_5_bar";
+                }
+
+                if (BatteryService.batteryLevel >= 55) {
+                    return "battery_4_bar";
+                }
+
+                if (BatteryService.batteryLevel >= 40) {
+                    return "battery_3_bar";
+                }
+
+                if (BatteryService.batteryLevel >= 25) {
+                    return "battery_2_bar";
+                }
+
+                return "battery_1_bar";
            }
            size: Theme.iconSize - 6
            color: {
-                if (!BatteryService.batteryAvailable)
-                    return Theme.surfaceText
+                if (!BatteryService.batteryAvailable) {
+                    return Theme.surfaceText;
+                }

-                if (BatteryService.isLowBattery && !BatteryService.isCharging)
-                    return Theme.error
+                if (BatteryService.isLowBattery && !BatteryService.isCharging) {
+                    return Theme.error;
+                }

-                if (BatteryService.isCharging || BatteryService.isPluggedIn)
-                    return Theme.primary
+                if (BatteryService.isCharging || BatteryService.isPluggedIn) {
+                    return Theme.primary;
+                }

-                return Theme.surfaceText
+                return Theme.surfaceText;
            }
            anchors.verticalCenter: parent.verticalCenter
        }

        StyledText {
-            text: BatteryService.batteryLevel + "%"
+            text: `${BatteryService.batteryLevel}%`
            font.pixelSize: Theme.fontSizeSmall
            font.weight: Font.Medium
            color: {
-                if (!BatteryService.batteryAvailable)
-                    return Theme.surfaceText
+                if (!BatteryService.batteryAvailable) {
+                    return Theme.surfaceText;
+                }

-                if (BatteryService.isLowBattery && !BatteryService.isCharging)
-                    return Theme.error
+                if (BatteryService.isLowBattery && !BatteryService.isCharging) {
+                    return Theme.error;
+                }

-                if (BatteryService.isCharging)
-                    return Theme.primary
+                if (BatteryService.isCharging) {
+                    return Theme.primary;
+                }

-                return Theme.surfaceText
+                return Theme.surfaceText;
            }
            anchors.verticalCenter: parent.verticalCenter
            visible: BatteryService.batteryAvailable
        }
+
    }

    MouseArea {
@@ -132,15 +175,13 @@ Rectangle {
        cursorShape: Qt.PointingHandCursor
        onPressed: {
            if (popupTarget && popupTarget.setTriggerPosition) {
-                var globalPos = mapToGlobal(0, 0)
-                var currentScreen = parentScreen || Screen
-                var screenX = currentScreen.x || 0
-                var relativeX = globalPos.x - screenX
-                popupTarget.setTriggerPosition(
-                            relativeX, barHeight + Theme.spacingXS,
-                            width, section, currentScreen)
+                const globalPos = mapToGlobal(0, 0);
+                const currentScreen = parentScreen || Screen;
+                const screenX = currentScreen.x || 0;
+                const relativeX = globalPos.x - screenX;
+                popupTarget.setTriggerPosition(relativeX, barHeight + Theme.spacingXS, width, section, currentScreen);
            }
-            toggleBatteryPopup()
+            toggleBatteryPopup();
        }
    }

@@ -168,30 +209,33 @@ Rectangle {

                text: {
                    if (!BatteryService.batteryAvailable) {
-                        if (typeof PowerProfiles === "undefined")
-                            return "Power Management"
+                        if (typeof PowerProfiles === "undefined") {
+                            return "Power Management";
+                        }

                        switch (PowerProfiles.profile) {
                        case PowerProfile.PowerSaver:
-                            return "Power Profile: Power Saver"
+                            return "Power Profile: Power Saver";
                        case PowerProfile.Performance:
-                            return "Power Profile: Performance"
+                            return "Power Profile: Performance";
                        default:
-                            return "Power Profile: Balanced"
+                            return "Power Profile: Balanced";
                        }
                    }
-                    let status = BatteryService.batteryStatus
-                    let level = BatteryService.batteryLevel + "%"
-                    let time = BatteryService.formatTimeRemaining()
-                    if (time !== "Unknown")
-                        return status + " • " + level + " • " + time
-                    else
-                        return status + " • " + level
+                    const status = BatteryService.batteryStatus;
+                    const level = `${BatteryService.batteryLevel}%`;
+                    const time = BatteryService.formatTimeRemaining();
+                    if (time !== "Unknown") {
+                        return `${status} • ${level} • ${time}`;
+                    } else {
+                        return `${status} • ${level}`;
+                    }
                }
                font.pixelSize: Theme.fontSizeSmall
                color: Theme.surfaceText
                horizontalAlignment: Text.AlignHCenter
            }
+
        }

        Behavior on opacity {
@@ -199,7 +243,9 @@ Rectangle {
                duration: Theme.shortDuration
                easing.type: Theme.standardEasing
            }
+
        }
+
    }

    Behavior on color {
@@ -207,5 +253,7 @@ Rectangle {
            duration: Theme.shortDuration
            easing.type: Theme.standardEasing
        }
+
    }
+
 }