From 78f015e80dc84cc548fa16a9075d8b6d3e3c11b7 Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Sun, 6 Jan 2019 21:49:31 +0100 Subject: [PATCH 1/2] fix datetime strings --- nymea-app/ui/devicepages/SensorDevicePagePost110.qml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nymea-app/ui/devicepages/SensorDevicePagePost110.qml b/nymea-app/ui/devicepages/SensorDevicePagePost110.qml index 1e27381e..35ad6a9d 100644 --- a/nymea-app/ui/devicepages/SensorDevicePagePost110.qml +++ b/nymea-app/ui/devicepages/SensorDevicePagePost110.qml @@ -87,7 +87,7 @@ ListView { font.bold: true } Label { - text: Qt.formatDateTime(new Date(parent.lastSeenState.value)) + text: parent.lastSeenState ? Qt.formatDateTime(new Date(parent.lastSeenState.value * 1000)) : "" } } RowLayout { @@ -101,7 +101,7 @@ ListView { font.bold: true } Label { - text: parent.sunriseStateType ? Qt.formatDateTime(new Date(parent.sunriseState.value)) : "" + text: parent.sunriseStateType ? Qt.formatDateTime(new Date(parent.sunriseState.value * 1000)) : "" } } RowLayout { @@ -115,7 +115,7 @@ ListView { font.bold: true } Label { - text: parent.sunsetStateType ? Qt.formatDateTime(new Date(parent.sunsetState.value)) : "" + text: parent.sunsetStateType ? Qt.formatDateTime(new Date(parent.sunsetState.value * 1000)) : "" } } Item { From e1b2642f64f2e90142b37448936bffaea16e6b35 Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Mon, 7 Jan 2019 13:54:20 +0100 Subject: [PATCH 2/2] fix landscape views --- nymea-app/ui/devicepages/SensorDevicePagePost110.qml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/nymea-app/ui/devicepages/SensorDevicePagePost110.qml b/nymea-app/ui/devicepages/SensorDevicePagePost110.qml index 35ad6a9d..9044d34f 100644 --- a/nymea-app/ui/devicepages/SensorDevicePagePost110.qml +++ b/nymea-app/ui/devicepages/SensorDevicePagePost110.qml @@ -67,7 +67,8 @@ ListView { Item { Layout.fillWidth: true Layout.fillHeight: true - Layout.rowSpan: 3 + Layout.minimumWidth: app.iconSize * 5 + Layout.rowSpan: app.landscape ? 5 : 1 ColorIcon { anchors.centerIn: parent height: app.iconSize * 4 @@ -76,6 +77,10 @@ ListView { color: device.states.getState(boolView.stateType.id).value === true ? app.interfaceToColor(boolView.interfaceName) : keyColor } } + Item { + Layout.fillHeight: true + Layout.fillWidth: true + } RowLayout { Layout.fillWidth: false Layout.alignment: Qt.AlignHCenter