reworked icon logic to cover all grounds

Modules/Panels/Network/NetworkPanel.qml

@@ -493,7 +493,7 @@ SmartPanel {
 
                           NIcon {
                             anchors.centerIn: parent
-                            icon: NetworkService.getIcon()
+                            icon: NetworkService.getIcon(true)
                             pointSize: Style.fontSizeXXL
                             color: ethItem.getContentColors()[1]
                           }

Modules/Panels/Settings/Tabs/Connections/WifiSubTab.qml

@@ -151,15 +151,7 @@ Item {
 
           NToggle {
             label: I18n.tr("common.wifi")
-            icon: {
-              if (!Settings.data.network.wifiEnabled) {
-                return "wifi-off";
-              }
-              if (root.connectedNetworks.length > 0) {
-                return NetworkService.getSignalInfo(root.connectedNetworks[0].signal, true).icon;
-              }
-              return "wifi";
-            }
+            icon: NetworkService.getIcon(false)
             checked: Settings.data.network.wifiEnabled
             onToggled: checked => NetworkService.setWifiEnabled(checked)
             enabled: ProgramCheckerService.nmcliAvailable && !Settings.data.network.airplaneModeEnabled && NetworkService.wifiAvailable

Services/Networking/NetworkService.qml

@@ -550,23 +550,51 @@ Singleton {
     return I18n.tr("common.disconnected"); // p.length === 0
   }
 
-  function getIcon() {
-    // This function doesn't know what to do when more than one ethernet device is connected. most people doesn't use but just in case.
-    if (root.ethernetConnected) {
+  function getIcon(forceEthernet = false) {
+    let i = "wifi-off"; // Default to prevent empty space on launch.
+    // Ethernet has priority over Wi-Fi which is standard.
+    if (root.ethernetConnected || forceEthernet) {
+      // Ethernet connected or forced (by the NetworkPanel)
       switch (root.networkConnectivity) {
       case "limited":
-        return "ethernet-exclamation";
+        // Ethernet connected, no internet access
+        i = "ethernet-exclamation";
+        break;
       case "portal":
       case "unknown":
-        return "ethernet-question";
+        // Ethernet connected, status unknown or behind portal
+        i = "ethernet-question";
+        break;
       case "full":
-        return "ethernet";
+        // Ethernet connected and internet access
+        i = "ethernet";
+        break;
       default:
-        return "ethernet-off";
+        // Ethernet not connected (Forced by the NetworkPanel)
+        i = "ethernet-off";
+        break;
+      }
+    } else {
+      // Wi-Fi
+      const connectedNet = Object.values(root.networks).find(net => net.connected);
+      const availableNet = Object.values(root.networks).length;
+      if (connectedNet) {
+        // Wi-Fi Connected
+        i = root.getSignalInfo(connectedNet.signal, true).icon;
+      } else if (root.connecting || availableNet > 0) {
+        // Wi-Fi Connecting or Wi-Fi available but not connected
+        i = "wifi-question";
+      } else if (!Settings.data.network.wifiEnabled) {
+        // Wi-Fi is off
+        i = "wifi-off";
       }
     }
-    const connectedNet = Object.values(root.networks).find(net => net.connected); // This might be inefficient...
-    return connectedNet ? root.getSignalInfo(connectedNet.signal, true).icon : "wifi-off";
+    if (Settings.data.network.airplaneModeEnabled) {
+      // Airplane mode show icon if enabled
+      i = "plane";
+    }
+    return i;
+    // This function should be covering all possibilities i think it does. Tbh became fairly complicated...
   }
 
   // Processes