More work

libnymea-app/devices.cpp

@@ -40,46 +40,52 @@ Devices::Devices(QObject *parent) :
 
 QList<Device *> Devices::devices()
 {
-    return m_devices;
+    return m_things;
 }
 
 Device *Devices::get(int index) const
 {
-    if (index < 0 || index >= m_devices.count()) {
+    if (index < 0 || index >= m_things.count()) {
         return nullptr;
     }
-    return m_devices.at(index);
+    return m_things.at(index);
 }
 
-Device *Devices::getDevice(const QUuid &deviceId) const
+Device *Devices::getThing(const QUuid &thingId) const
 {
-    foreach (Device *device, m_devices) {
+    foreach (Device *thing, m_things) {
-        if (device->id() == deviceId) {
+        if (thing->id() == thingId) {
-            return device;
+            return thing;
         }
     }
     return nullptr;
 }
 
+Device *Devices::getDevice(const QUuid &deviceId) const
+{
+    return getThing(deviceId);
+}
+
 int Devices::rowCount(const QModelIndex &parent) const
 {
     Q_UNUSED(parent)
-    return m_devices.count();
+    return m_things.count();
 }
 
 QVariant Devices::data(const QModelIndex &index, int role) const
 {
-    if (index.row() < 0 || index.row() >= m_devices.count())
+    if (index.row() < 0 || index.row() >= m_things.count())
         return QVariant();
 
-    Device *thing = m_devices.at(index.row());
+    Device *thing = m_things.at(index.row());
     switch (role) {
     case RoleName:
         return thing->name();
     case RoleId:
         return thing->id().toString();
     case RoleDeviceClass:
-        return thing->deviceClassId().toString();
+    case RoleThingClass:
+        return thing->thingClassId().toString();
     case RoleParentDeviceId:
         return thing->parentDeviceId().toString();
     case RoleSetupStatus:
@@ -97,22 +103,22 @@ QVariant Devices::data(const QModelIndex &index, int role) const
 void Devices::addDevice(Device *device)
 {
     device->setParent(this);
-    beginInsertRows(QModelIndex(), m_devices.count(), m_devices.count());
+    beginInsertRows(QModelIndex(), m_things.count(), m_things.count());
 //    qDebug() << "Devices: add device" << device->name();
-    m_devices.append(device);
+    m_things.append(device);
     endInsertRows();
     connect(device, &Device::nameChanged, this, [device, this]() {
-        int idx = m_devices.indexOf(device);
+        int idx = m_things.indexOf(device);
         if (idx < 0) return;
         emit dataChanged(index(idx), index(idx), {RoleName});
     });
     connect(device, &Device::setupStatusChanged, this, [device, this]() {
-        int idx = m_devices.indexOf(device);
+        int idx = m_things.indexOf(device);
         if (idx < 0) return;
         emit dataChanged(index(idx), index(idx), {RoleSetupStatus, RoleSetupDisplayMessage});
     });
     connect(device->states(), &States::dataChanged, this, [device, this]() {
-        int idx = m_devices.indexOf(device);
+        int idx = m_things.indexOf(device);
         if (idx < 0) return;
         emit dataChanged(index(idx), index(idx));
     });
@@ -122,10 +128,10 @@ void Devices::addDevice(Device *device)
 
 void Devices::removeDevice(Device *device)
 {
-    int index = m_devices.indexOf(device);
+    int index = m_things.indexOf(device);
     beginRemoveRows(QModelIndex(), index, index);
     qDebug() << "Devices: removed device" << device->name();
-    m_devices.takeAt(index)->deleteLater();
+    m_things.takeAt(index)->deleteLater();
     endRemoveRows();
     emit countChanged();
     emit thingRemoved(device);
@@ -134,8 +140,8 @@ void Devices::removeDevice(Device *device)
 void Devices::clearModel()
 {
     beginResetModel();
-    qDeleteAll(m_devices);
+    qDeleteAll(m_things);
-    m_devices.clear();
+    m_things.clear();
     endResetModel();
     emit countChanged();
 }
@@ -146,6 +152,7 @@ QHash<int, QByteArray> Devices::roleNames() const
     roles[RoleName] = "name";
     roles[RoleId] = "id";
     roles[RoleDeviceClass] = "deviceClassId";
+    roles[RoleThingClass] = "thingClassId";
     roles[RoleParentDeviceId] = "parentDeviceId";
     roles[RoleSetupStatus] = "setupStatus";
     roles[RoleSetupDisplayMessage] = "setupDisplayMessage";

libnymea-app/devices.h

@@ -46,6 +46,7 @@ public:
         RoleId,
         RoleParentDeviceId,
         RoleDeviceClass,
+        RoleThingClass,
         RoleSetupStatus,
         RoleSetupDisplayMessage,
         RoleInterfaces,
@@ -58,6 +59,7 @@ public:
     QList<Device *> devices();
 
     Q_INVOKABLE Device *get(int index) const;
+    Q_INVOKABLE Device *getThing(const QUuid &thingId) const;
     Q_INVOKABLE Device *getDevice(const QUuid &deviceId) const;
 
     int rowCount(const QModelIndex & parent = QModelIndex()) const;
@@ -77,7 +79,7 @@ signals:
     void thingRemoved(Device *device);
 
 private:
-    QList<Device *> m_devices;
+    QList<Device *> m_things;
 
 };
 

libnymea-app/devicesproxy.cpp

@@ -329,14 +329,19 @@ Device *DevicesProxy::get(int index) const
 }
 
 Device *DevicesProxy::getDevice(const QUuid &deviceId) const
+{
+    return getThing(deviceId);
+}
+
+Device *DevicesProxy::getThing(const QUuid &thingId) const
 {
     Devices *d = qobject_cast<Devices*>(sourceModel());
     if (d) {
-        return d->getDevice(deviceId);
+        return d->getThing(thingId);
     }
     DevicesProxy *dp = qobject_cast<DevicesProxy*>(sourceModel());
     if (dp) {
-        return dp->getDevice(deviceId);
+        return dp->getThing(thingId);
     }
     return nullptr;
 }
@@ -442,7 +447,7 @@ bool DevicesProxy::filterAcceptsRow(int source_row, const QModelIndex &source_pa
     }
 
     if (m_filterSetupFailed) {
-        if (device->setupStatus() != Device::DeviceSetupStatusFailed) {
+        if (device->setupStatus() != Device::ThingSetupStatusFailed) {
             return false;
         }
     }

libnymea-app/devicesproxy.h

@@ -124,7 +124,8 @@ public:
    void setGroupByInterface(bool groupByInterface);
 
     Q_INVOKABLE Device *get(int index) const;
-    Q_INVOKABLE Device *getDevice(const QUuid &deviceId) const;
+   Q_INVOKABLE Device *getDevice(const QUuid &deviceId) const;
+   Q_INVOKABLE Device *getThing(const QUuid &thingId) const;
 
 signals:
     void engineChanged();

libnymea-app/libnymea-app-core.h

@@ -187,6 +187,8 @@ void registerQmlTypes() {
     qmlRegisterType<InterfacesModel>(uri, 1, 0, "InterfacesModel");
     qmlRegisterType<InterfacesSortModel>(uri, 1, 0, "InterfacesSortModel");
 
+    qmlRegisterUncreatableType<DeviceClass>(uri, 1, 0, "ThingClass", "Can't create this in QML. Get it from the ThingClasses.");
+    qmlRegisterUncreatableType<DeviceClasses>(uri, 1, 0, "ThingClasses", "Can't create this in QML. Get it from the ThingManager.");
     qmlRegisterUncreatableType<DeviceClass>(uri, 1, 0, "DeviceClass", "Can't create this in QML. Get it from the DeviceClasses.");
     qmlRegisterUncreatableType<DeviceClasses>(uri, 1, 0, "DeviceClasses", "Can't create this in QML. Get it from the DeviceManager.");
     qmlRegisterType<DeviceClassesProxy>(uri, 1, 0, "DeviceClassesProxy");

libnymea-app/thinggroup.cpp

@@ -37,7 +37,7 @@
 ThingGroup::ThingGroup(DeviceManager *deviceManager, DeviceClass *deviceClass, DevicesProxy *devices, QObject *parent):
     Device(deviceManager, deviceClass, QUuid::createUuid(), parent),
     m_thingManager(deviceManager),
-    m_devices(devices)
+    m_things(devices)
 {
     deviceClass->setParent(this);
 
@@ -52,7 +52,7 @@ ThingGroup::ThingGroup(DeviceManager *deviceManager, DeviceClass *deviceClass, D
     syncStates();
     setName(deviceClass->displayName());
 
-    connect(devices, &DevicesProxy::dataChanged, this, [this](const QModelIndex &topLeft, const QModelIndex &bottomRight, const QVector<int> &roles){
+    connect(devices, &DevicesProxy::dataChanged, this, [this](const QModelIndex &/*topLeft*/, const QModelIndex &/*bottomRight*/, const QVector<int> &/*roles*/){
         syncStates();
     });
 
@@ -77,9 +77,9 @@ int ThingGroup::executeAction(const QString &actionName, const QVariantList &par
     QList<int> pendingIds;
 
     qDebug() << "Execute action for group:" << this;
-    for (int i = 0; i < m_devices->rowCount(); i++) {
+    for (int i = 0; i < m_things->rowCount(); i++) {
-        Device *device = m_devices->get(i);
+        Device *device = m_things->get(i);
-        if (device->setupStatus() != Device::DeviceSetupStatusComplete) {
+        if (device->setupStatus() != Device::ThingSetupStatusComplete) {
             continue;
         }
         ActionType *actionType = device->thingClass()->actionTypes()->findByName(actionName);
@@ -118,8 +118,8 @@ void ThingGroup::syncStates()
 
         QVariant value;
         int count = 0;
-        for (int j = 0; j < m_devices->rowCount(); j++) {
+        for (int j = 0; j < m_things->rowCount(); j++) {
-            Device *d = m_devices->get(j);
+            Device *d = m_things->get(j);
             // Skip things that don't have the required state
             StateType *ds = d->thingClass()->stateTypes()->findByName(stateType->name());
             if (!ds) {

libnymea-app/thinggroup.h

@@ -54,7 +54,7 @@ signals:
 
 private:
     DeviceManager* m_thingManager = nullptr;
-    DevicesProxy* m_devices = nullptr;
+    DevicesProxy* m_things = nullptr;
 
     int m_idCounter = 0;
     QHash<int, QList<int>> m_pendingActions;

libnymea-app/types/device.h

@@ -59,14 +59,6 @@ class Device : public QObject
     Q_PROPERTY(DeviceClass *thingClass READ thingClass CONSTANT)
 
 public:
-    enum DeviceSetupStatus {
-        DeviceSetupStatusNone,
-        DeviceSetupStatusInProgress,
-        DeviceSetupStatusComplete,
-        DeviceSetupStatusFailed
-    };
-    Q_ENUM(DeviceSetupStatus)
-
     enum ThingSetupStatus {
         ThingSetupStatusNone,
         ThingSetupStatusInProgress,

nymea-app/main.cpp

@@ -125,8 +125,8 @@ int main(int argc, char *argv[])
 
     PushNotifications::instance()->connectClient();
     qmlRegisterSingletonType<PushNotifications>("Nymea", 1, 0, "PushNotifications", PushNotifications::pushNotificationsProvider);
-
     qmlRegisterSingletonType<AppLogController>("Nymea", 1, 0, "AppLogController", AppLogController::appLogControllerProvider);
+    qmlRegisterSingletonType(QUrl("qrc:///ui/utils/NymeaUtils.qml"), "Nymea", 1, 0, "NymeaUtils" );
 
 #ifdef BRANDING
     engine->rootContext()->setContextProperty("appBranding", BRANDING);

nymea-app/nymea-app.pro

@@ -160,3 +160,8 @@ BR=$$BRANDING
 
 target.path = /usr/bin
 INSTALLS += target
+
+contains(ANDROID_TARGET_ARCH,) {
+    ANDROID_ABIS = \
+        armeabi-v7a
+}

nymea-app/resources.qrc

@@ -218,5 +218,9 @@
         <file>ui/mainviews/MediaView.qml</file>
         <file>ui/components/ShuffleRepeatVolumeControl.qml</file>
         <file>ui/components/MediaBrowser.qml</file>
+        <file>ui/utils/NymeaUtils.qml</file>
+        <file>ui/components/ConnectionStatusIcon.qml</file>
+        <file>ui/components/BatteryStatusIcon.qml</file>
+        <file>ui/components/SetupStatusIcon.qml</file>
     </qresource>
 </RCC>

nymea-app/ui/components/BatteryStatusIcon.qml

@@ -0,0 +1,28 @@
+import QtQuick 2.9
+import Nymea 1.0
+
+ColorIcon {
+    id: root
+
+    property Thing thing: null
+
+    readonly property bool hasBattery: batteryCriticalState !== null
+    readonly property bool hasBatteryLevel: batteryLevelState !== null
+    readonly property bool isCritical: batteryCriticalState && batteryCriticalState.value === true
+    readonly property int batteryLevel: batteryLevelState ? batteryLevelState.value : 0
+
+    readonly property State batteryCriticalState: thing.stateByName("batteryCritical")
+    readonly property State batteryLevelState: thing.stateByName("batteryLevel")
+
+    name: {
+        if (!hasBatteryLevel) {
+            if (isCritical) {
+                return "../images/battery/battery-020.svg"
+            }
+            return "../images/battery/battery-100.svg"
+        }
+
+        var rounded = Math.round(batteryLevel / 10) * 10
+        return "../images/battery/battery-" + NymeaUtils.pad(rounded, 3)
+    }
+}

nymea-app/ui/components/ConnectionStatusIcon.qml

@@ -0,0 +1,35 @@
+import QtQuick 2.9
+import Nymea 1.0
+
+ColorIcon {
+    id: root
+
+    property Thing thing: null
+
+    readonly property bool isConnected: connectedState === null || connectedState.value === true
+    readonly property bool isWireless: thing.thingClass.interfaces.indexOf("wirelessconnectable") >= 0
+    readonly property bool hasSignalStrength: signalStrengthState !== null
+
+    readonly property State connectedState: thing.stateByName("connected")
+    readonly property State signalStrengthState: thing.stateByName("signalStrength")
+
+    name: {
+        if (!isWireless) {
+            return connectedState && connectedState.value === true ? "../images/network-wired.svg" : "../images/network-wired-offline.svg"
+        }
+        if (connectedState && connectedState.value === false) {
+            return "../images/network-wifi-offline.svg"
+        }
+
+        if (signalStrengthState && signalStrengthState.value === -1) {
+            return "../images/network-wifi.svg"
+        }
+
+        return "../images/nm-signal-" + NymeaUtils.pad(Math.round(signalStrengthState.value * 4 / 100) * 25, 2) + ".svg"
+    }
+
+    color: connectedState && connectedState.value === false
+           ? "red"
+           : signalStrengthState && signalStrengthState.value < 20
+             ? "orange" : keyColor
+}

nymea-app/ui/components/MainPageTile.qml

@@ -44,8 +44,8 @@ Item {
     property string text
     property bool disconnected: false
     property bool isWireless: false
-    property int signalStrength: -1
+    property int signalStrength: 0
-    property int setupStatus: Device.DeviceSetupStatusNone
+    property int setupStatus: Thing.ThingSetupStatusNone
     property bool batteryCritical: false
 
     property alias contentItem: innerContent.children
@@ -153,20 +153,20 @@ Item {
             width: height
             name: root.isWireless ? "../images/network-wifi-offline.svg" : "../images/network-wired-offline.svg"
             color: root.disconnected ? "red" : "orange"
-            visible: root.setupStatus == Device.DeviceSetupStatusComplete && (root.disconnected || (root.signalStrength >= 0 && root.signalStrength < 10))
+            visible: root.setupStatus == Thing.ThingSetupStatusComplete && (root.disconnected || (root.isWireless && root.signalStrength < 20))
         }
         ColorIcon {
             height: app.iconSize / 2
             width: height
-            name: root.setupStatus === Device.DeviceSetupStatusFailed ? "../images/dialog-warning-symbolic.svg" : "../images/settings.svg"
+            name: root.setupStatus === Thing.ThingSetupStatusFailed ? "../images/dialog-warning-symbolic.svg" : "../images/settings.svg"
-            color: root.setupStatus === Device.DeviceSetupStatusFailed ? "red" : keyColor
+            color: root.setupStatus === Thing.ThingSetupStatusFailed ? "red" : keyColor
-            visible: root.setupStatus === Device.DeviceSetupStatusFailed || root.setupStatus === Device.DeviceSetupStatusInProgress
+            visible: root.setupStatus === Thing.ThingSetupStatusFailed || root.setupStatus === Thing.ThingSetupStatusInProgress
         }
         ColorIcon {
             height: app.iconSize / 2
             width: height
             name: "../images/battery/battery-010.svg"
-            visible: root.batteryCritical
+            visible: root.setupStatus == Thing.ThingSetupStatusComplete && root.batteryCritical
         }
     }
 }

nymea-app/ui/components/MediaControls.qml

@@ -41,8 +41,7 @@ RowLayout {
     property Thing thing: null
     property int iconSize: app.iconSize * 1.5
 
-    readonly property StateType playbackStateType: thing ? thing.thingClass.stateTypes.findByName("playbackStatus") : null
+    readonly property State playbackState: thing.stateByName("playbackStatus")
-    readonly property State playbackState: playbackStateType ? thing.states.getState(playbackStateType.id) : null
 
     function executeAction(actionName, params) {
         if (params === undefined) {
@@ -58,7 +57,7 @@ RowLayout {
         Layout.preferredWidth: height
         imageSource: "../images/media-skip-backward.svg"
         longpressImageSource: "../images/media-seek-backward.svg"
-        enabled: root.playbackState.value !== "Stopped"
+        enabled: root.playbackState && root.playbackState.value !== "Stopped"
         opacity: enabled ? 1 : .5
 
         repeat: true
@@ -75,7 +74,7 @@ RowLayout {
         Layout.preferredWidth: height
         imageSource: root.playbackState && root.playbackState.value === "Playing" ? "../images/media-playback-pause.svg" : "../images/media-playback-start.svg"
         longpressImageSource: "../images/media-playback-stop.svg"
-        longpressEnabled: root.playbackState.value !== "Stopped"
+        longpressEnabled: root.playbackState && root.playbackState.value !== "Stopped"
 
         onClicked: {
             if (root.playbackState.value === "Playing") {
@@ -95,7 +94,7 @@ RowLayout {
         Layout.preferredWidth: height
         imageSource: "../images/media-skip-forward.svg"
         longpressImageSource: "../images/media-seek-forward.svg"
-        enabled: root.playbackState.value !== "Stopped"
+        enabled: root.playbackState && root.playbackState.value !== "Stopped"
         opacity: enabled ? 1 : .5
         repeat: true
         onClicked: {

nymea-app/ui/components/SetupStatusIcon.qml

@@ -0,0 +1,16 @@
+import QtQuick 2.9
+import Nymea 1.0
+
+ColorIcon {
+    id: root
+
+    property Thing thing: null
+
+    readonly property int setupStatus: thing.setupStatus
+    readonly property bool setupInProgress: setupStatus == Thing.ThingSetupStatusInProgress
+    readonly property bool setupFailed: setupStatus == Thing.ThingSetupStatusFailed
+
+    name: setupFailed ? "../images/dialog-warning-symbolic.svg"
+                      : setupInProgress ?  "../images/settings.svg" : "../images/tick.svg"
+    color: setupFailed ? "red" : keyColor
+}

nymea-app/ui/delegates/InterfaceTile.qml

@@ -43,7 +43,7 @@ MainPageTile {
     disconnected: devicesSubProxyConnectables.count > 0
     isWireless: devicesSubProxyConnectables.count > 0 && devicesSubProxyConnectables.get(0).thingClass.interfaces.indexOf("wirelessconnectable") >= 0
     batteryCritical: devicesSubProxyBattery.count > 0
-    setupStatus: thingsSubProxySetupFailure.count > 0 ? Device.DeviceSetupStatusFailed : Device.DeviceSetupStatusComplete
+    setupStatus: thingsSubProxySetupFailure.count > 0 ? Thing.ThingSetupStatusFailed : Thing.ThingSetupStatusComplete
 
     property Interface iface: null
     property alias filterTagId: devicesProxy.filterTagId

nymea-app/ui/delegates/ThingDelegate.qml

@@ -46,7 +46,8 @@ NymeaListItemDelegate {
                       : thing.setupStatus == Thing.ThingSetupStatusInProgress
                         ? "../images/settings.svg"
                         : disconnected
-                          ? "../images/dialog-warning-symbolic.svg"
+                          ? isWireless
+                            ? "../images/network-wifi-offline.svg" : "../images/network-wired-offline.svg"
                           : ""
     tertiaryIconColor: thing.setupStatus == Thing.ThingSetupStatusInProgress ? iconKeyColor : "red"
 
@@ -63,5 +64,7 @@ NymeaListItemDelegate {
     readonly property State connectedState: connectedStateType ? thing.states.getState(connectedStateType.id) : null
     readonly property bool disconnected: connectedState && connectedState.value === false ? true : false
 
+    readonly property bool isWireless: root.thing.thingClass.interfaces.indexOf("wirelessconnectable") >= 0
+
 
 }

nymea-app/ui/devicelistpages/DeviceListPageBase.qml

@@ -38,32 +38,32 @@ import "../components"
 Page {
     id: root
 
-    property alias shownInterfaces: devicesProxyInternal.shownInterfaces
+    property alias shownInterfaces: thingsProxyInternal.shownInterfaces
-    property alias hiddenInterfaces: devicesProxyInternal.hiddenInterfaces
+    property alias hiddenInterfaces: thingsProxyInternal.hiddenInterfaces
-    property alias filterTagId: devicesProxyInternal.filterTagId
+    property alias filterTagId: thingsProxyInternal.filterTagId
 
     Component.onCompleted: {
-        if (devicesProxyInternal.count === 1) {
+        if (thingsProxyInternal.count === 1) {
             enterPage(0, true)
         }
     }
 
-    property var devicesProxy: devicesProxyInternal
+    property var devicesProxy: thingsProxyInternal
+    property var thingsProxy: thingsProxyInternal
 
     function enterPage(index, replace) {
-        var device = devicesProxy.get(index);
+        var thing = thingsProxy.get(index);
-        var deviceClass = engine.deviceManager.deviceClasses.getDeviceClass(device.deviceClassId);
         var page = app.interfaceListToDevicePage(root.shownInterfaces);
 //        var page = "GenericDevicePage.qml";
         if (replace) {
-            pageStack.replace(Qt.resolvedUrl("../devicepages/" + page), {device: devicesProxy.get(index)})
+            pageStack.replace(Qt.resolvedUrl("../devicepages/" + page), {thing: thingsProxy.get(index)})
         } else {
-            pageStack.push(Qt.resolvedUrl("../devicepages/" + page), {device: devicesProxy.get(index)})
+            pageStack.push(Qt.resolvedUrl("../devicepages/" + page), {thing: thingsProxy.get(index)})
         }
     }
 
     DevicesProxy {
-        id: devicesProxyInternal
+        id: thingsProxyInternal
         engine: _engine
     }
 }

nymea-app/ui/devicelistpages/MediaDeviceListPage.qml

@@ -64,14 +64,13 @@ DeviceListPageBase {
 
                     property bool inline: width > 500
 
-                    property Device device: devicesProxy.getDevice(model.id)
+                    property Thing thing: thingsProxy.getThing(model.id)
-                    property DeviceClass deviceClass: device.deviceClass
 
-                    readonly property StateType playbackStateType: deviceClass.stateTypes.findByName("playbackStatus")
+                    readonly property StateType playbackStateType: thing.thingClass.stateTypes.findByName("playbackStatus")
-                    readonly property State playbackState: playbackStateType ? device.states.getState(playbackStateType.id) : null
+                    readonly property State playbackState: thing.stateByName("playbackStatus")
 
-                    readonly property StateType playerTypeStateType: deviceClass.stateTypes.findByName("playerType")
+                    readonly property StateType playerTypeStateType: thing.thingClass.stateTypes.findByName("playerType")
-                    readonly property State playerTypeState: playerTypeStateType ? device.states.getState(playerTypeStateType.id) : null
+                    readonly property State playerTypeState: thing.stateByName("playerType")
 
                     bottomPadding: index === root.devicesProxy.count - 1 ? topPadding : 0
                     contentItem: Pane {
@@ -100,18 +99,23 @@ DeviceListPageBase {
                                             text: model.name
                                             elide: Text.ElideRight
                                         }
-                                        ColorIcon {
+                                        BatteryStatusIcon {
                                             Layout.preferredHeight: app.iconSize * .5
                                             Layout.preferredWidth: height
-                                            name: "../images/battery/battery-020.svg"
+                                            thing: itemDelegate.thing
-                                            visible: itemDelegate.deviceClass.interfaces.indexOf("battery") >= 0 && itemDelegate.device.states.getState(itemDelegate.deviceClass.stateTypes.findByName("batteryCritical").id).value === true
+                                            visible: itemDelegate.thing.setupStatus == Thing.ThingSetupStatusComplete && (hasBatteryLevel || isCritical)
                                         }
-                                        ColorIcon {
+                                        ConnectionStatusIcon {
                                             Layout.preferredHeight: app.iconSize * .5
                                             Layout.preferredWidth: height
-                                            name: "../images/dialog-warning-symbolic.svg"
+                                            thing: itemDelegate.thing
-                                            visible: itemDelegate.deviceClass.interfaces.indexOf("connectable") >= 0 && itemDelegate.device.states.getState(itemDelegate.deviceClass.stateTypes.findByName("connected").id).value === false
+                                            visible: itemDelegate.thing.setupStatus == Thing.ThingSetupStatusComplete && (hasSignalStrength || !isConnected)
-                                            color: "red"
+                                        }
+                                        SetupStatusIcon {
+                                            Layout.preferredHeight: app.iconSize * .5
+                                            Layout.preferredWidth: height
+                                            thing: itemDelegate.thing
+                                            visible: setupFailed || setupInProgress
                                         }
                                     }
 
@@ -124,28 +128,28 @@ DeviceListPageBase {
                                             Layout.fillWidth: true
                                             text: itemDelegate.playbackState.value === "Stopped" ?
                                                       qsTr("No playback")
-                                                    : itemDelegate.device.states.getState(itemDelegate.deviceClass.stateTypes.findByName("title").id).value
+                                                    : itemDelegate.thing.stateByName("title").value
                                             horizontalAlignment: Text.AlignHCenter
                                             //                                    font.pixelSize: app.largeFont
                                             elide: Text.ElideRight
                                         }
                                         Label {
                                             Layout.fillWidth: true
-                                            text: itemDelegate.device.states.getState(itemDelegate.deviceClass.stateTypes.findByName("artist").id).value
+                                            text: itemDelegate.thing.stateByName("artist").value
                                             font.pixelSize: app.smallFont
                                             horizontalAlignment: Text.AlignHCenter
                                             elide: Text.ElideRight
                                         }
                                         Label {
                                             Layout.fillWidth: true
-                                            text: itemDelegate.device.states.getState(itemDelegate.deviceClass.stateTypes.findByName("collection").id).value
+                                            text: itemDelegate.thing.stateByName("collection").value
                                             horizontalAlignment: Text.AlignHCenter
                                             font.pixelSize: app.smallFont
                                             elide: Text.ElideRight
                                         }
                                         MediaControls {
-                                            visible: itemDelegate.deviceClass.interfaces.indexOf("mediacontroller") >= 0
+                                            visible: itemDelegate.thing.thingClass.interfaces.indexOf("mediacontroller") >= 0
-                                            thing: itemDelegate.device
+                                            thing: itemDelegate.thing
                                         }
                                     }
                                     Item {
@@ -159,8 +163,7 @@ DeviceListPageBase {
                                                 id: artworkImage
                                                 width: artworkImage.sourceSize.width * height / artworkImage.sourceSize.height
                                                 anchors { top: parent.top; right: parent.right; bottom: parent.bottom }
-                                                readonly property StateType artworkStateType: device ? device.deviceClass.stateTypes.findByName("artwork") : null
+                                                readonly property State artworkState: thing.stateByName("artwork")
-                                                readonly property State artworkState: artworkStateType ? device.states.getState(artworkStateType.id) : null
                                                 source: artworkState ? artworkState.value : ""
                                             }
                                             Rectangle {

nymea-app/ui/devicelistpages/SensorsDeviceListPage.qml

@@ -45,7 +45,7 @@ DeviceListPageBase {
 
     ListView {
         anchors.fill: parent
-        model: root.devicesProxy
+        model: root.thingsProxy
 
         delegate: ItemDelegate {
             id: itemDelegate
@@ -53,8 +53,7 @@ DeviceListPageBase {
 
             property bool inline: width > 500
 
-            property Device device: devicesProxy.getDevice(model.id)
+            property Thing thing: thingsProxy.getThing(model.id)
-            property DeviceClass deviceClass: device.deviceClass
 
             bottomPadding: index === ListView.view.count - 1 ? topPadding : 0
             contentItem: Pane {
@@ -82,21 +81,25 @@ DeviceListPageBase {
                                     text: model.name
                                     elide: Text.ElideRight
                                 }
-                                ColorIcon {
+                                BatteryStatusIcon {
                                     Layout.preferredHeight: app.iconSize * .5
                                     Layout.preferredWidth: height
-                                    name: "../images/battery/battery-020.svg"
+                                    thing: itemDelegate.thing
-                                    visible: itemDelegate.deviceClass.interfaces.indexOf("battery") >= 0 && itemDelegate.device.states.getState(itemDelegate.deviceClass.stateTypes.findByName("batteryCritical").id).value === true
+                                    visible: itemDelegate.thing.setupStatus == Thing.ThingSetupStatusComplete && (hasBatteryLevel || isCritical)
                                 }
-                                ColorIcon {
+                                ConnectionStatusIcon {
                                     Layout.preferredHeight: app.iconSize * .5
                                     Layout.preferredWidth: height
-                                    name: "../images/dialog-warning-symbolic.svg"
+                                    thing: itemDelegate.thing
-                                    visible: itemDelegate.deviceClass.interfaces.indexOf("connectable") >= 0 && itemDelegate.device.states.getState(itemDelegate.deviceClass.stateTypes.findByName("connected").id).value === false
+                                    visible: itemDelegate.thing.setupStatus == Thing.ThingSetupStatusComplete && (isWireless || !isConnected)
-                                    color: "red"
+                                }
+                                SetupStatusIcon {
+                                    Layout.preferredHeight: app.iconSize * .5
+                                    Layout.preferredWidth: height
+                                    thing: itemDelegate.thing
+                                    visible: setupFailed || setupInProgress
                                 }
                             }
-
                         }
                         GridLayout {
                             id: dataGrid
@@ -121,11 +124,11 @@ DeviceListPageBase {
 
                                 delegate: RowLayout {
                                     id: sensorValueDelegate
-                                    visible: itemDelegate.deviceClass.interfaces.indexOf(model.interfaceName) >= 0
+                                    visible: itemDelegate.thing.thingClass.interfaces.indexOf(model.interfaceName) >= 0
                                     Layout.preferredWidth: contentItem.width / dataGrid.columns
 
-                                    property StateType stateType: itemDelegate.deviceClass.stateTypes.findByName(model.stateName)
+                                    property StateType stateType: itemDelegate.thing.thingClass.stateTypes.findByName(model.stateName)
-                                    property State stateValue: stateType ? itemDelegate.device.states.getState(stateType.id) : null
+                                    property State stateValue: stateType ? itemDelegate.thing.states.getState(stateType.id) : null
 
                                     ColorIcon {
                                         Layout.preferredHeight: app.iconSize * .8

nymea-app/ui/devicelistpages/SmartMeterDeviceListPage.qml

@@ -53,8 +53,7 @@ DeviceListPageBase {
 
             property bool inline: width > 500
 
-            property Device device: devicesProxy.getDevice(model.id)
+            property Thing thing: thingsProxy.getThing(model.id)
-            property DeviceClass deviceClass: device.deviceClass
 
             bottomPadding: index === ListView.view.count - 1 ? topPadding : 0
             contentItem: Pane {
@@ -82,18 +81,23 @@ DeviceListPageBase {
                                     text: model.name
                                     elide: Text.ElideRight
                                 }
-                                ColorIcon {
+                                BatteryStatusIcon {
                                     Layout.preferredHeight: app.iconSize * .5
                                     Layout.preferredWidth: height
-                                    name: "../images/battery/battery-020.svg"
+                                    thing: itemDelegate.thing
-                                    visible: itemDelegate.deviceClass.interfaces.indexOf("battery") >= 0 && itemDelegate.device.states.getState(itemDelegate.deviceClass.stateTypes.findByName("batteryCritical").id).value === true
+                                    visible: thing.setupStatus == Thing.ThingSetupStatusComplete && (isCritical || hasBatteryLevel)
                                 }
-                                ColorIcon {
+                                ConnectionStatusIcon {
                                     Layout.preferredHeight: app.iconSize * .5
                                     Layout.preferredWidth: height
-                                    name: "../images/dialog-warning-symbolic.svg"
+                                    thing: itemDelegate.thing
-                                    visible: itemDelegate.deviceClass.interfaces.indexOf("connectable") >= 0 && itemDelegate.device.states.getState(itemDelegate.deviceClass.stateTypes.findByName("connected").id).value === false
+                                    visible: thing.setupStatus == Thing.ThingSetupStatusComplete && (isWireless || !isConnected)
-                                    color: "red"
+                                }
+                                SetupStatusIcon {
+                                    Layout.preferredHeight: app.iconSize * .5
+                                    Layout.preferredWidth: height
+                                    thing: itemDelegate.thing
+                                    visible: setupFailed || setupInProgress
                                 }
                             }
 
@@ -105,18 +109,18 @@ DeviceListPageBase {
                             Repeater {
                                 model: ListModel {
                                     Component.onCompleted: {
-                                        if (itemDelegate.deviceClass.interfaces.indexOf("smartmeterproducer") >= 0) {
+                                        if (itemDelegate.thing.thingClass.interfaces.indexOf("smartmeterproducer") >= 0) {
                                             append( {interfaceName: "smartmeterproducer", stateName: "totalEnergyProduced" })
                                         }
-                                        if (itemDelegate.deviceClass.interfaces.indexOf("smartmeterconsumer") >= 0) {
+                                        if (itemDelegate.thing.thingClass.interfaces.indexOf("smartmeterconsumer") >= 0) {
                                             append( {interfaceName: "smartmeterconsumer", stateName: "totalEnergyConsumed" })
                                         }
                                         var added = false;
-                                        if (itemDelegate.deviceClass.interfaces.indexOf("extendedsmartmeterproducer") >= 0) {
+                                        if (itemDelegate.thing.thingClass.interfaces.indexOf("extendedsmartmeterproducer") >= 0) {
                                             append({interfaceName: "extendedsmartmeterconsumer", stateName: "currentPower"});
                                             added = true;
                                         }
-                                        if (!added && itemDelegate.deviceClass.interfaces.indexOf("extendedsmartmeterconsumer") >= 0) {
+                                        if (!added && itemDelegate.thing.thingClass.interfaces.indexOf("extendedsmartmeterconsumer") >= 0) {
                                             append({interfaceName: "extendedsmartmeterconsumer", stateName: "currentPower"});
                                         }
                                     }
@@ -126,8 +130,8 @@ DeviceListPageBase {
                                     id: sensorValueDelegate
                                     Layout.preferredWidth: contentItem.width / dataGrid.columns
 
-                                    property var stateType: itemDelegate.deviceClass.stateTypes.findByName(model.stateName)
+                                    property StateType stateType: itemDelegate.thing.thingClass.stateTypes.findByName(model.stateName)
-                                    property var stateValue: stateType ? itemDelegate.device.states.getState(stateType.id) : null
+                                    property State stateValue: stateType ? itemDelegate.thing.states.getState(stateType.id) : null
 
                                     ColorIcon {
                                         Layout.preferredHeight: app.iconSize * .8

nymea-app/ui/devicepages/DevicePageBase.qml

@@ -36,10 +36,11 @@ import "../components"
 
 Page {
     id: root
-    property Device device: null
+    property Thing thing: null
-    readonly property DeviceClass deviceClass: device.deviceClass
+    readonly property ThingClass thingClass: thing.thingClass
 
-    readonly property Device thing: device
+    property alias device: root.thing
+    property alias deviceClass: root.thingClass
 
     property bool showLogsButton: true
     property bool showDetailsButton: true
@@ -51,7 +52,7 @@ Page {
     signal backPressed()
 
     header: NymeaHeader {
-        text: device.name
+        text: root.thing.name
         onBackPressed: {
             root.backPressed();
             if (root.popStackOnBackButton) {
@@ -61,7 +62,7 @@ Page {
 
         HeaderButton {
             imageSource: "../images/folder-symbolic.svg"
-            visible: root.deviceClass.browsable && root.showBrowserButton
+            visible: root.thingClass.browsable && root.showBrowserButton
             onClicked: {
                 pageStack.push(Qt.resolvedUrl("DeviceBrowserPage.qml"), {device: root.device})
             }
@@ -229,11 +230,11 @@ Page {
         visible: setupInProgress || setupFailure || batteryState !== null || (connectedState !== null && connectedState.value === false)
         height: visible ? contentRow.implicitHeight : 0
         anchors { left: parent.left; top: parent.top; right: parent.right }
-        property bool setupInProgress: device.setupStatus == Device.DeviceSetupStatusInProgress
+        property bool setupInProgress: root.thing.setupStatus == Thing.ThingSetupStatusInProgress
-        property bool setupFailure: device.setupStatus == Device.DeviceSetupStatusFailed
+        property bool setupFailure: root.thing.setupStatus == Thing.ThingSetupStatusFailed
-        property var batteryState: deviceClass.interfaces.indexOf("battery") >= 0 ? device.states.getState(deviceClass.stateTypes.findByName("batteryLevel").id) : null
+        property State batteryState: root.thing.stateByName("batteryLevel")
-        property var batteryCriticalState: deviceClass.interfaces.indexOf("battery") >= 0 ? device.states.getState(deviceClass.stateTypes.findByName("batteryCritical").id) : null
+        property State batteryCriticalState: root.thing.stateByName("batteryCritical")
-        property var connectedState: deviceClass.interfaces.indexOf("connectable") >= 0 ? device.states.getState(deviceClass.stateTypes.findByName("connected").id) : null
+        property State connectedState: root.thing.stateByName("connected")
         property bool alertState: setupFailure ||
                                   (connectedState !== null && connectedState.value === false) ||
                                   (batteryCriticalState !== null && batteryCriticalState.value === true)
@@ -261,22 +262,28 @@ Page {
                 color: "white"
             }
 
-            ColorIcon {
+            BatteryStatusIcon {
-                height: app.iconSize / 2
-                width: height
-                visible: infoPane.setupInProgress || infoPane.setupFailure || (infoPane.connectedState !== null && infoPane.connectedState.value === false)
-                color: "white"
-                name: infoPane.setupInProgress ?
-                          "../images/settings.svg"
-                        : "../images/dialog-warning-symbolic.svg"
-            }
-
-            ColorIcon {
                 height: app.iconSize / 2
                 width: height * 1.23
-                name: infoPane.batteryState !== null ? "../images/battery/battery-" + ("00" + (Math.floor(infoPane.batteryState.value / 10) * 10)).slice(-3) + ".svg" : ""
+                thing: root.thing
-                visible: infoPane.batteryState !== null
                 color: infoPane.alertState ? "white" : keyColor
+                visible: thing.setupStatus == Thing.ThingSetupStatusComplete && (hasBatteryLevel || isCritical)
+            }
+
+            ConnectionStatusIcon {
+                height: app.iconSize / 2
+                width: height
+                thing: root.thing
+                color: infoPane.alertState ? "white" : keyColor
+                visible: thing.setupStatus == Thing.ThingSetupStatusComplete && (hasSignalStrength || !isConnected)
+            }
+
+            SetupStatusIcon {
+                height: app.iconSize / 2
+                width: height
+                thing: root.thing
+                color: infoPane.alertState ? "white" : keyColor
+                visible: setupFailed || setupInProgress
             }
         }
     }

nymea-app/ui/utils/NymeaUtils.qml

@@ -0,0 +1,18 @@
+pragma Singleton
+import QtQuick 2.9
+
+Item {
+    id: root
+
+    function pad(num, size) {
+        var trimmedNum = Math.floor(num)
+        var decimals = num - trimmedNum
+        var trimmedStr = "" + trimmedNum
+        var str = "000000000" + trimmedNum;
+        str = str.substr(str.length - Math.max(size, trimmedStr.length));
+        if (decimals !== 0) {
+            str += "." + (num - trimmedNum);
+        }
+        return str;
+    }
+}