lainns-mirror/noctalia-shell
1
0
Fork 0
mirror of https://github.com/noctalia-dev/noctalia-shell.git synced 2026-05-11 17:08:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Simplify getIcon

Browse Source
This commit is contained in:
Turann_
2026-02-02 02:14:00 +03:00
parent 16936221be
commit 52e58b8c95
1 changed files with 19 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Services/Hardware/BatteryService.qml
+19 -29
View File
@@ -168,10 +168,11 @@ Singleton {
var match = device.nativePath.match(/(\d+)$/);
if (match) {
// In case of 2 batteries: bat0 => bat1 bat1 => bat2
return I18n.tr("common.battery") + " " + (parseInt(match[1]) + 1);
return I18n.tr("common.battery") + " " + (parseInt(match[1]) + 1); // Append numbers
}
}
return "";
// Return Battery if there is only one
return I18n.tr("common.battery");
}
if (isBluetoothDevice(device) && device.name) {
@@ -185,33 +186,22 @@ Singleton {
return "";
}
function getIcon(percent, charging, pluggedIn, isReady) {
if (!isReady) {
return "battery-exclamation";
}
if (charging) {
return "battery-charging";
}
if (pluggedIn) {
return "battery-charging-2";
}
if (percent >= 80) {
return "battery-4";
}
if (percent >= 60) {
return "battery-3";
}
if (percent >= 40) {
return "battery-2";
}
if (percent >= 20) {
return "battery-1";
}
if (percent >= 0) {
return "battery";
}
return "battery-off"; // New fallback icon clearly represent if nothing is true here.
}
function getIcon(percent, charging, pluggedIn, isReady) {
if (!isReady){return "battery-exclamation";}
if (charging){return "battery-charging";}
if (pluggedIn){return "battery-charging-2";}
const icons = [
{ threshold: 80, icon: "battery-4" },
{ threshold: 60, icon: "battery-3" },
{ threshold: 40, icon: "battery-2" },
{ threshold: 20, icon: "battery-1" },
{ threshold: 0, icon: "battery" }
];
const match = icons.find(tier => percent >= tier.threshold);
return match ? match.icon : "battery-off"; // New fallback icon clearly represent if nothing is true here.
}
function getRateText(device) {
if (!device || device.changeRate === undefined) {