new network service

Modules/ControlCenter/Network/EthernetCard.qml

@@ -30,42 +30,41 @@ Rectangle {
                                                                 0.12)
   border.width: NetworkService.networkStatus === "ethernet" ? 2 : 1
 
-  Column {
+  Row {
     anchors.left: parent.left
     anchors.leftMargin: Theme.spacingM
     anchors.verticalCenter: parent.verticalCenter
-    anchors.right: ethernetToggle.left
+    anchors.right: parent.right
     anchors.rightMargin: Theme.spacingM
-    spacing: Theme.spacingS
+    spacing: Theme.spacingM
 
-    Row {
-      spacing: Theme.spacingM
+    DankIcon {
+      name: "lan"
+      size: Theme.iconSize
+      color: NetworkService.networkStatus === "ethernet" ? Theme.primary : Theme.surfaceText
+      anchors.verticalCenter: parent.verticalCenter
+    }
 
-      DankIcon {
-        name: "lan"
-        size: Theme.iconSize
-        color: NetworkService.networkStatus === "ethernet" ? Theme.primary : Theme.surfaceText
-        anchors.verticalCenter: parent.verticalCenter
-      }
+    Column {
+      anchors.verticalCenter: parent.verticalCenter
+      spacing: 2
 
       StyledText {
         text: "Ethernet"
         font.pixelSize: Theme.fontSizeMedium
         color: NetworkService.networkStatus === "ethernet" ? Theme.primary : Theme.surfaceText
         font.weight: Font.Medium
-        anchors.verticalCenter: parent.verticalCenter
         elide: Text.ElideRight
       }
-    }
 
-    StyledText {
-      text: NetworkService.ethernetConnected ? (NetworkService.ethernetIP
-                                                || "Connected") : "Disconnected"
-      font.pixelSize: Theme.fontSizeSmall
-      color: Qt.rgba(Theme.surfaceText.r, Theme.surfaceText.g,
-                     Theme.surfaceText.b, 0.7)
-      leftPadding: Theme.iconSize + Theme.spacingM
-      elide: Text.ElideRight
+      StyledText {
+        text: NetworkService.ethernetConnected ? (NetworkService.ethernetIP
+                                                  || "Connected") : "Disconnected"
+        font.pixelSize: Theme.fontSizeSmall
+        color: Qt.rgba(Theme.surfaceText.r, Theme.surfaceText.g,
+                       Theme.surfaceText.b, 0.7)
+        elide: Text.ElideRight
+      }
     }
   }
 
@@ -75,7 +74,7 @@ Rectangle {
     name: "refresh"
     size: Theme.iconSize - 4
     color: Theme.primary
-    anchors.right: ethernetToggle.left
+    anchors.right: parent.right
     anchors.rightMargin: Theme.spacingS
     anchors.verticalCenter: parent.verticalCenter
     visible: NetworkService.changingPreference
@@ -93,24 +92,11 @@ Rectangle {
     }
   }
 
-  DankToggle {
-    id: ethernetToggle
-
-    checked: NetworkService.ethernetConnected
-    enabled: true
-    anchors.right: parent.right
-    anchors.rightMargin: Theme.spacingM
-    anchors.verticalCenter: parent.verticalCenter
-    onClicked: {
-      NetworkService.toggleNetworkConnection("ethernet")
-    }
-  }
 
   MouseArea {
     id: ethernetPreferenceArea
 
     anchors.fill: parent
-    anchors.rightMargin: 60 // Exclude toggle area
     hoverEnabled: true
     cursorShape: (NetworkService.ethernetConnected && NetworkService.wifiEnabled
                   && NetworkService.networkStatus

Modules/ControlCenter/Network/WiFiCard.qml

@@ -48,30 +48,31 @@ Rectangle {
   border.width: NetworkService.networkStatus === "wifi" ? 2 : 1
   visible: NetworkService.wifiAvailable
 
-  Column {
+  Row {
     anchors.left: parent.left
     anchors.leftMargin: Theme.spacingM
     anchors.verticalCenter: parent.verticalCenter
     anchors.right: wifiToggle.left
     anchors.rightMargin: Theme.spacingM
-    spacing: Theme.spacingS
+    spacing: Theme.spacingM
 
-    Row {
-      spacing: Theme.spacingM
-
-      DankIcon {
-        name: {
-          if (!NetworkService.wifiEnabled)
-            return "wifi_off"
-          else if (NetworkService.currentWifiSSID !== "")
-            return getWiFiSignalIcon(NetworkService.wifiSignalStrength)
-          else
-            return "wifi"
-        }
-        size: Theme.iconSize
-        color: NetworkService.networkStatus === "wifi" ? Theme.primary : Theme.surfaceText
-        anchors.verticalCenter: parent.verticalCenter
+    DankIcon {
+      name: {
+        if (!NetworkService.wifiEnabled)
+          return "wifi_off"
+        else if (NetworkService.currentWifiSSID !== "")
+          return getWiFiSignalIcon(NetworkService.wifiSignalStrength)
+        else
+          return "wifi"
       }
+      size: Theme.iconSize
+      color: NetworkService.networkStatus === "wifi" ? Theme.primary : Theme.surfaceText
+      anchors.verticalCenter: parent.verticalCenter
+    }
+
+    Column {
+      anchors.verticalCenter: parent.verticalCenter
+      spacing: 2
 
       StyledText {
         text: {
@@ -85,25 +86,23 @@ Rectangle {
         font.pixelSize: Theme.fontSizeMedium
         color: NetworkService.networkStatus === "wifi" ? Theme.primary : Theme.surfaceText
         font.weight: Font.Medium
-        anchors.verticalCenter: parent.verticalCenter
         elide: Text.ElideRight
       }
-    }
 
-    StyledText {
-      text: {
-        if (!NetworkService.wifiEnabled)
-          return "Turn on WiFi to see networks"
-        else if (NetworkService.wifiEnabled && NetworkService.currentWifiSSID)
-          return NetworkService.wifiIP || "Connected"
-        else
-          return "Select a network below"
+      StyledText {
+        text: {
+          if (!NetworkService.wifiEnabled)
+            return "Turn on WiFi to see networks"
+          else if (NetworkService.wifiEnabled && NetworkService.currentWifiSSID)
+            return NetworkService.wifiIP || "Connected"
+          else
+            return "Select a network below"
+        }
+        font.pixelSize: Theme.fontSizeSmall
+        color: Qt.rgba(Theme.surfaceText.r, Theme.surfaceText.g,
+                       Theme.surfaceText.b, 0.7)
+        elide: Text.ElideRight
       }
-      font.pixelSize: Theme.fontSizeSmall
-      color: Qt.rgba(Theme.surfaceText.r, Theme.surfaceText.g,
-                     Theme.surfaceText.b, 0.7)
-      leftPadding: Theme.iconSize + Theme.spacingM
-      elide: Text.ElideRight
     }
   }
 
@@ -143,7 +142,7 @@ Rectangle {
     onClicked: {
       if (NetworkService.wifiEnabled) {
         NetworkService.currentWifiSSID = ""
-        NetworkService.wifiSignalStrength = "excellent"
+        NetworkService.wifiSignalStrength = 100
         NetworkService.wifiNetworks = []
         NetworkService.savedWifiNetworks = []
         NetworkService.connectionStatus = ""

Modules/ControlCenter/NetworkTab.qml

@@ -22,7 +22,7 @@ Item {
     var allNetworks = NetworkService.wifiNetworks
     var savedNetworks = NetworkService.savedWifiNetworks
     var currentSSID = NetworkService.currentWifiSSID
-    var signalStrength = NetworkService.wifiSignalStrength
+    var signalStrength = NetworkService.wifiSignalStrengthStr
     var refreshTrigger = forceRefresh
 
     // Force recalculation
@@ -60,15 +60,12 @@ Item {
 
   Component.onCompleted: {
     NetworkService.addRef()
-    NetworkService.autoRefreshEnabled = true
     if (NetworkService.wifiEnabled)
       NetworkService.scanWifi()
-    wifiMonitorTimer.start()
   }
 
   Component.onDestruction: {
     NetworkService.removeRef()
-    NetworkService.autoRefreshEnabled = false
   }
 
   Row {
@@ -79,6 +76,7 @@ Item {
       width: (parent.width - Theme.spacingM) / 2
       height: parent.height
       spacing: Theme.spacingS
+      anchors.verticalCenter: parent.verticalCenter
 
       Flickable {
         width: parent.width
@@ -110,9 +108,7 @@ Item {
           width: parent.width
           spacing: Theme.spacingM
 
-          WiFiCard {
-            refreshTimer: refreshTimer
-          }
+          WiFiCard {}
         }
 
         ScrollBar.vertical: ScrollBar {
@@ -125,6 +121,7 @@ Item {
       width: (parent.width - Theme.spacingM) / 2
       height: parent.height
       spacing: Theme.spacingS
+      anchors.verticalCenter: parent.verticalCenter
 
       Flickable {
         width: parent.width
@@ -212,104 +209,20 @@ Item {
     wifiPasswordModalRef: networkTab.wifiPasswordModalRef
   }
 
-  Timer {
-    id: refreshTimer
-    interval: 2000
-    running: visible && refreshTimer.triggered
-    property bool triggered: false
-    onTriggered: {
-      NetworkService.refreshNetworkStatus()
-      if (NetworkService.wifiEnabled && !NetworkService.isScanning) {
-        NetworkService.scanWifi()
-      }
-      triggered = false
-    }
-  }
-
   Connections {
     target: NetworkService
     function onWifiEnabledChanged() {
       if (NetworkService.wifiEnabled && visible) {
-        wifiScanDelayTimer.start()
-        wifiMonitorTimer.start()
-      } else {
-        NetworkService.currentWifiSSID = ""
-        NetworkService.wifiSignalStrength = "excellent"
-        NetworkService.wifiNetworks = []
-        NetworkService.savedWifiNetworks = []
-        NetworkService.connectionStatus = ""
-        NetworkService.connectingSSID = ""
-        NetworkService.isScanning = false
-        NetworkService.refreshNetworkStatus()
-        wifiMonitorTimer.stop()
-      }
-    }
-  }
-
-  Timer {
-    id: wifiScanDelayTimer
-    interval: 1500
-    running: false
-    repeat: false
-    onTriggered: {
-      if (NetworkService.wifiEnabled && visible) {
-        if (!NetworkService.isScanning) {
-          NetworkService.scanWifi()
-        } else {
-          wifiRetryTimer.start()
-        }
-      }
-    }
-  }
-
-  Timer {
-    id: wifiRetryTimer
-    interval: 2000
-    running: false
-    repeat: false
-    onTriggered: {
-      if (NetworkService.wifiEnabled && visible
-          && NetworkService.wifiNetworks.length === 0) {
-        if (!NetworkService.isScanning) {
-          NetworkService.scanWifi()
-        }
-      }
-    }
-  }
-
-  Timer {
-    id: wifiMonitorTimer
-    interval: 8000 // Check every 8 seconds
-    running: false
-    repeat: true
-    onTriggered: {
-      if (!visible || !NetworkService.wifiEnabled) {
-        running = false
-        return
-      }
-
-      var shouldScan = false
-      var reason = ""
-
-      if (NetworkService.networkStatus !== "wifi") {
-        shouldScan = true
-        reason = "not connected to WiFi"
-      } else if (NetworkService.wifiNetworks.length === 0) {
-        shouldScan = true
-        reason = "no networks cached"
-      }
-
-      if (shouldScan && !NetworkService.isScanning) {
+        // Trigger a scan when WiFi is enabled
         NetworkService.scanWifi()
       }
     }
   }
 
   onVisibleChanged: {
-    if (visible && NetworkService.wifiEnabled) {
-      wifiMonitorTimer.start()
-    } else {
-      wifiMonitorTimer.stop()
+    if (visible && NetworkService.wifiEnabled && NetworkService.wifiNetworks.length === 0) {
+      // Scan when tab becomes visible if we don't have networks cached
+      NetworkService.scanWifi()
     }
   }