From 94483e92c5a8d50faeb0d580c37ba84b2dafb3b4 Mon Sep 17 00:00:00 2001
From: Michael Zanetti <michael_zanetti@gmx.net>
Date: Wed, 13 Jan 2021 12:34:33 +0100
Subject: [PATCH] Update UI to latest changes

---
 libnymea-app/wifisetup/btwifisetup.cpp         | 10 +++++++++-
 libnymea-app/wifisetup/btwifisetup.h           |  3 ++-
 .../wifisetup/BluetoothDiscoveryPage.qml       | 18 ++++++++++--------
 .../connection/wifisetup/WirelessSetupPage.qml |  4 ++--
 .../ThingClassDetailsPage.qml                  |  4 ++++
 5 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/libnymea-app/wifisetup/btwifisetup.cpp b/libnymea-app/wifisetup/btwifisetup.cpp
index 8cb3107f..d4bcc187 100644
--- a/libnymea-app/wifisetup/btwifisetup.cpp
+++ b/libnymea-app/wifisetup/btwifisetup.cpp
@@ -348,7 +348,9 @@ void BtWiFiSetup::processWiFiPacket(const QVariantMap &data)
             accessPoint->setProtected(data.toMap().value("p").toBool());
             accessPoint->setHostAddress("");
             m_accessPoints->addWirelessAccessPoint(accessPoint);
+
         }
+        loadCurrentConnection();
         break;
     case WirelessServiceCommandConnect:
         qDebug() << "Connect call succeeded";
@@ -374,6 +376,12 @@ void BtWiFiSetup::processWiFiPacket(const QVariantMap &data)
         }
         qDebug() << "current connection is:" << m_currentConnection;
         emit currentConnectionChanged();
+
+        if (m_bluetoothStatus != BluetoothStatusLoaded) {
+            m_bluetoothStatus = BluetoothStatusLoaded;
+            emit bluetoothStatusChanged(m_bluetoothStatus);
+        }
+
         break;
     case WirelessServiceCommandScan:
         if (responseCode == WirelessServiceResponseSuccess) {
@@ -439,7 +447,7 @@ void BtWiFiSetup::characteristicChanged(const QLowEnergyCharacteristic &characte
     } else if (characteristic.uuid() == networkStatusCharacteristicUuid) {
         m_networkStatus = static_cast<NetworkStatus>(value.toHex().toInt(nullptr, 16));
         qDebug() << "Network status changed:" << m_networkStatus;
-        if (m_networkStatus == NetworkStatusGlobal) {
+        if (m_networkStatus == NetworkStatusGlobal || m_networkStatus == NetworkStatusLocal || m_networkStatus == NetworkStatusConnectedSite) {
             loadCurrentConnection();
         }
 
diff --git a/libnymea-app/wifisetup/btwifisetup.h b/libnymea-app/wifisetup/btwifisetup.h
index bfbf316c..ac23e4d8 100644
--- a/libnymea-app/wifisetup/btwifisetup.h
+++ b/libnymea-app/wifisetup/btwifisetup.h
@@ -32,7 +32,8 @@ public:
     enum BluetoothStatus {
         BluetoothStatusDisconnected,
         BluetoothStatusConnectingToBluetooth,
-        BluetoothStatusConnectedToBluetooth
+        BluetoothStatusConnectedToBluetooth,
+        BluetoothStatusLoaded,
     };
     Q_ENUM(BluetoothStatus)
 
diff --git a/nymea-app/ui/connection/wifisetup/BluetoothDiscoveryPage.qml b/nymea-app/ui/connection/wifisetup/BluetoothDiscoveryPage.qml
index c8ef605d..bd24fa24 100644
--- a/nymea-app/ui/connection/wifisetup/BluetoothDiscoveryPage.qml
+++ b/nymea-app/ui/connection/wifisetup/BluetoothDiscoveryPage.qml
@@ -49,15 +49,17 @@ Page {
     BtWiFiSetup {
         id: wifiSetup
 
-        onStatusChanged: {
+        onBluetoothStatusChanged: {
             print("status changed", status)
             switch (status) {
-            case BtWiFiSetup.StatusDisconnected:
+            case BtWiFiSetup.BluetoothStatusDisconnected:
                 pageStack.pop(root)
                 break;
-            case BtWiFiSetup.StatusConnectingToBluetooth:
+            case BtWiFiSetup.BluetoothStatusConnectingToBluetooth:
                 break;
-            case BtWiFiSetup.StatusConnectedToBluetooth:
+            case BtWiFiSetup.BluetoothStatusConnectedToBluetooth:
+                break;
+            case BtWiFiSetup.BluetoothStatusLoaded:
                 if (!wifiSetup.networkingEnabled) {
                     wifiSetup.networkingEnabled = true;
                 }
@@ -66,12 +68,12 @@ Page {
                 }
                 setupDevice()
                 break;
-            case BtWiFiSetup.StatusConnectingToWiFi:
-                break;
-            case BtWiFiSetup.StatusConnectedToWiFi:
-                print("Connected to wifi!")
             }
         }
+        onWirelessStatusChanged: {
+
+        }
+
         onBluetoothConnectionError: {
             print("Error")
             pageStack.pop(root)
diff --git a/nymea-app/ui/connection/wifisetup/WirelessSetupPage.qml b/nymea-app/ui/connection/wifisetup/WirelessSetupPage.qml
index abb1ce5a..8aa9159f 100644
--- a/nymea-app/ui/connection/wifisetup/WirelessSetupPage.qml
+++ b/nymea-app/ui/connection/wifisetup/WirelessSetupPage.qml
@@ -86,7 +86,7 @@ Page {
 
     function updateConnectButton() {
         if (!root.wifiSetup.currentConnection) {
-            connectButton.url = "";
+            connectButton.host = null;
             return;
         }
 
@@ -102,7 +102,7 @@ Page {
                 updateConnectButton();
             })
         }
-        connectButton.url = "";
+        connectButton.host = null;
     }
 
     ColumnLayout {
diff --git a/nymea-app/ui/thingconfiguration/ThingClassDetailsPage.qml b/nymea-app/ui/thingconfiguration/ThingClassDetailsPage.qml
index 75fbbe88..fdc08bbe 100644
--- a/nymea-app/ui/thingconfiguration/ThingClassDetailsPage.qml
+++ b/nymea-app/ui/thingconfiguration/ThingClassDetailsPage.qml
@@ -54,6 +54,10 @@ SettingsPageBase {
         text: root.thingClass.displayName
         subText: root.thingClass.id.toString().replace(/[{}]/g, "")
         progressive: false
+        onClicked: {
+            PlatformHelper.toClipBoard(subText);
+            ToolTip.show(qsTr("ID copied to clipboard"), 500);
+        }
     }
 
     SettingsPageSectionHeader {