Salastil/DankMaterialShell
1
0
Fork 0
mirror of https://github.com/AvengeMedia/DankMaterialShell.git synced 2026-01-24 21:42:51 -05:00
Code Packages Releases Activity

Cleanup wifi signal strength icon

Browse Source
This commit is contained in:
bbedward
2025-08-19 22:31:50 -04:00
parent 6367828036
commit 9871da775f
5 changed files with 20 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Modules/ControlCenter/Network/WiFiCard.qml
View File

@@ -12,21 +12,6 @@ Rectangle {
property var refreshTimer
function getWiFiSignalIcon(signalStrength) {
switch (signalStrength) {
case "excellent":
return "wifi"
case "good":
return "wifi_2_bar"
case "fair":
return "wifi_1_bar"
case "poor":
return "signal_wifi_0_bar"
default:
return "wifi"
}
}
width: parent.width
height: 80
radius: Theme.cornerRadius
@@ -57,14 +42,7 @@ Rectangle {
spacing: Theme.spacingM
DankIcon {
name: {
if (!NetworkService.wifiEnabled)
return "wifi_off"
else if (NetworkService.currentWifiSSID !== "")
return getWiFiSignalIcon(NetworkService.wifiSignalStrength)
else
return "wifi"
}
name: NetworkService.wifiSignalIcon
size: Theme.iconSize
color: NetworkService.networkStatus === "wifi" ? Theme.primary : Theme.surfaceText
anchors.verticalCenter: parent.verticalCenter

17
Modules/ControlCenter/Network/WiFiNetworksList.qml
View File

@@ -14,21 +14,6 @@ Column {
property var sortedWifiNetworks
property var wifiPasswordModalRef
function getWiFiSignalIcon(signalStrength) {
switch (signalStrength) {
case "excellent":
return "wifi"
case "good":
return "wifi_2_bar"
case "fair":
return "wifi_1_bar"
case "poor":
return "signal_wifi_0_bar"
default:
return "wifi"
}
}
anchors.top: parent.top
anchors.topMargin: 100
anchors.left: parent.left
@@ -165,7 +150,7 @@ Column {
anchors.left: parent.left
anchors.verticalCenter: parent.verticalCenter
name: getWiFiSignalIcon(modelData.signalStrength)
name: NetworkService.wifiSignalIcon
size: Theme.iconSize - 2
color: modelData.connected ? Theme.primary : Theme.surfaceText
}

16
Modules/Lock/LockScreenContent.qml
View File

@@ -594,22 +594,8 @@ Item {
name: {
if (NetworkService.networkStatus === "ethernet") {
return "lan"
} else if (NetworkService.networkStatus === "wifi") {
switch (NetworkService.wifiSignalStrengthStr) {
case "excellent":
return "wifi"
case "good":
return "wifi_2_bar"
case "fair":
return "wifi_1_bar"
case "poor":
return "signal_wifi_0_bar"
default:
return "wifi"
}
} else {
return "wifi_off"
}
return NetworkService.wifiSignalIcon
}
size: Theme.iconSize - 2
color: NetworkService.networkStatus

20
Modules/TopBar/ControlCenterButton.qml
View File

@@ -13,21 +13,6 @@ Rectangle {
signal clicked
function getWiFiSignalIcon(signalStrength) {
switch (signalStrength) {
case "excellent":
return "wifi"
case "good":
return "wifi_2_bar"
case "fair":
return "wifi_1_bar"
case "poor":
return "signal_wifi_0_bar"
default:
return "wifi"
}
}
width: Math.max(80, controlIndicators.implicitWidth + Theme.spacingS * 2)
height: 30
radius: Theme.cornerRadius
@@ -48,10 +33,7 @@ Rectangle {
name: {
if (NetworkService.networkStatus === "ethernet")
return "lan"
else if (NetworkService.networkStatus === "wifi")
return getWiFiSignalIcon(NetworkService.wifiSignalStrengthStr)
else
return "wifi_off"
return NetworkService.wifiSignalIcon
}
size: Theme.iconSize - 8
color: NetworkService.networkStatus !== "disconnected" ? Theme.primary : Theme.outlineButton

42
Services/NetworkService.qml
View File

@@ -32,7 +32,22 @@ Singleton {
property int wifiSignalStrength: 0
property var wifiNetworks: []
property var savedConnections: []
property var wifiSignalIcon: {
if (currentWifiSSID == "" || !wifiEnabled) {
return "wifi_off"
}
if (wifiSignalStrength >= 75) {
return "wifi"
}
if (wifiSignalStrength >= 50) {
return "wifi_2_bar"
}
if (wifiSignalStrength >= 25) {
return "wifi_1_bar"
}
return "signal_wifi_0_bar"
}
// Connection management
property string userPreference: "auto" // "auto", "wifi", "ethernet"
property bool isConnecting: false
@@ -48,7 +63,6 @@ Singleton {
property bool wifiToggling: false
property bool changingPreference: false
property string targetPreference: ""
property string wifiSignalStrengthStr: "excellent"
property var savedWifiNetworks: []
property string connectionStatus: ""
property string lastConnectionError: ""
@@ -397,16 +411,6 @@ Singleton {
if (parts.length >= 2) {
root.currentWifiSSID = parts[0]
root.wifiSignalStrength = parseInt(parts[1]) || 0
if (root.wifiSignalStrength >= 75) {
root.wifiSignalStrengthStr = "excellent"
} else if (root.wifiSignalStrength >= 50) {
root.wifiSignalStrengthStr = "good"
} else if (root.wifiSignalStrength >= 25) {
root.wifiSignalStrengthStr = "fair"
} else {
root.wifiSignalStrengthStr = "poor"
}
}
}
}
@@ -548,15 +552,10 @@ Singleton {
if (!seen.has(ssid)) {
seen.add(ssid)
const signal = parseInt(parts[1]) || 0
let signalQuality = "poor"
if (signal >= 75) signalQuality = "excellent"
else if (signal >= 50) signalQuality = "good"
else if (signal >= 25) signalQuality = "fair"
networks.push({
ssid: ssid,
signal: signal,
signalStrength: signalQuality,
secured: parts[2] !== "",
bssid: parts[3],
connected: ssid === root.currentWifiSSID,
@@ -991,14 +990,6 @@ Singleton {
}
}
function getSignalQuality(strength) {
if (strength >= 75) return "excellent"
if (strength >= 50) return "good"
if (strength >= 25) return "fair"
return "poor"
}
function getNetworkInfo(ssid) {
const network = root.wifiNetworks.find(n => n.ssid === ssid)
if (!network) return null
@@ -1006,7 +997,6 @@ Singleton {
return {
ssid: network.ssid,
signal: network.signal,
signalQuality: getSignalQuality(network.signal),
secured: network.secured,
saved: network.saved,
connected: network.connected,