ETM-Schurig/powersync-app
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

improve sensors page

Browse Source
This commit is contained in:
Michael Zanetti 2018-10-01 14:43:52 +02:00
parent f194bb1bc2
commit ebe24abd8e
12 changed files with 326 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libnymea-app-core/models/interfacesproxy.cpp
View File

@ -58,8 +58,8 @@ void InterfacesProxy::setShowStates(bool showStates)
bool InterfacesProxy::filterAcceptsRow(int source_row, const QModelIndex &source_parent) const
{
Q_UNUSED(source_parent)
qDebug() << "filterAcceptsRow";
QString interfaceName = m_interfaces->get(source_row)->name();
qDebug() << "filterAcceptsRow" << interfaceName << m_shownInterfaces;
if (!m_shownInterfaces.isEmpty()) {
if (!m_shownInterfaces.contains(interfaceName)) {
return false;

3
nymea-app/resources.qrc
View File

@ -250,5 +250,8 @@
<file>ui/devicepages/NotificationsDevicePage.qml</file>
<file>ui/components/BrightnessSlider.qml</file>
<file>ui/devicepages/LightDevicePage.qml</file>
<file>ui/devicelistpages/SensorsDeviceListPage.qml</file>
<file>ui/devicelistpages/WeatherDeviceListPage.qml</file>
<file>ui/devicelistpages/DeviceListPageBase.qml</file>
</qresource>
</RCC>

2
nymea-app/ui/NewDeviceWizard.qml
View File

@ -120,7 +120,7 @@ Page {
print("should setup", deviceClass.name, deviceClass.setupMethod, deviceClass.createMethods, deviceClass["discoveryParamTypes"].count)
}
swipe.enabled: deviceClass.createMethods.indexOf("CreateMethodUser") !== -1
swipe.enabled: true// deviceClass.createMethods.indexOf("CreateMethodUser") !== -1
swipe.right: MouseArea {
height: deviceClassDelegate.height
width: height

2
nymea-app/ui/Nymea.qml
View File

@ -369,7 +369,7 @@ ApplicationWindow {
} else if (interfaceList.indexOf("garagegate") >= 0 ) {
page = "GarageGateDevicePage.qml";
} else if (interfaceList.indexOf("light") >= 0) {
page = "ColorLightDevicePage.qml";
page = "LightDevicePage.qml";
} else if (interfaceList.indexOf("extendedshutter") >= 0 ) {
page = "ShutterDevicePage.qml";
} else if (interfaceList.indexOf("extendedawning") >= 0) {

51
nymea-app/ui/customviews/WeatherView.qml
View File

@ -19,6 +19,9 @@ CustomViewBase {
readonly property var humidityStateType: deviceClass.stateTypes ? deviceClass.stateTypes.findByName("humidity") : null
readonly property var humidityState: humidityStateType && device.states ? device.states.getState(humidityStateType.id) : null
readonly property var pressureStateType: deviceClass.stateTypes ? deviceClass.stateTypes.findByName("pressure") : null
readonly property var pressureState: pressureStateType && device.states ? device.states.getState(pressureStateType.id) : null
readonly property var windDirectionStateType: deviceClass.stateTypes ? deviceClass.stateTypes.findByName("windDirection") : null
readonly property var windDirectionState: windDirectionStateType && device.states ? device.states.getState(windDirectionStateType.id) : null
@ -33,12 +36,38 @@ CustomViewBase {
RowLayout {
Layout.fillWidth: true
Label {
text: (temperatureState ? Math.round(temperatureState.value * 10) / 10 : "N/A") + " °"
Item {
Layout.fillWidth: true
Layout.preferredWidth: (parent.width - mainImage.width) / 2
font.pixelSize: app.largeFont
horizontalAlignment: Text.AlignHCenter
GridLayout {
anchors.centerIn: parent
columns: 2
ColorIcon {
name: "../images/sensors/temperature.svg"
Layout.preferredWidth: app.iconSize
Layout.preferredHeight: width
color: app.interfaceToColor("temperaturesensor")
}
Label {
text: (temperatureState ? Math.round(temperatureState.value * 10) / 10 : "N/A") + " °"
Layout.fillWidth: true
font.pixelSize: app.largeFont
horizontalAlignment: Text.AlignHCenter
}
ColorIcon {
name: "../images/weathericons/humidity.svg"
Layout.preferredWidth: app.iconSize
Layout.preferredHeight: width
color: app.interfaceToColor("humiditysensor")
}
Label {
text: (humidityState ? humidityState.value : "N/A") + " %"
Layout.fillWidth: true
horizontalAlignment: Text.AlignHCenter
}
}
}
ColorIcon {
@ -47,21 +76,23 @@ CustomViewBase {
Layout.preferredHeight: app.largeFont * 4
name: weatherConditionState ? "../images/weathericons/weather-" + weatherConditionState.value + ".svg" : ""
}
ColumnLayout {
Item {
Layout.fillWidth: true
Layout.preferredWidth: (parent.width - mainImage.width) / 2
RowLayout {
GridLayout {
columns: 2
anchors.centerIn: parent
ColorIcon {
name: "../images/weathericons/humidity.svg"
name: "../images/sensors/pressure.svg"
width: app.iconSize
height: width
color: app.interfaceToColor("pressuresensor")
}
Label {
text: (humidityState ? humidityState.value : "N/A") + " %"
text: (pressureState ? pressureState.value : "N/A") + " %"
}
}
RowLayout {
ColorIcon {
name: "../images/weathericons/wind.svg"
width: app.iconSize

37
nymea-app/ui/devicelistpages/DeviceListPageBase.qml Normal file
View File

@ -0,0 +1,37 @@
import QtQuick 2.5
import QtQuick.Controls 2.1
import QtQuick.Controls.Material 2.1
import QtQuick.Layouts 1.1
import Nymea 1.0
import "../components"
Page {
id: root
property alias shownInterfaces: devicesProxyInternal.shownInterfaces
property alias hiddenInterfaces: devicesProxyInternal.hiddenInterfaces
Component.onCompleted: {
if (devicesProxyInternal.count === 1) {
enterPage(0, true)
}
}
property var devicesProxy: devicesProxyInternal
function enterPage(index, replace) {
var device = devicesProxy.get(index);
var deviceClass = Engine.deviceManager.deviceClasses.getDeviceClass(device.deviceClassId);
var page = app.interfaceListToDevicePage(deviceClass.interfaces);
if (replace) {
pageStack.replace(Qt.resolvedUrl("../devicepages/" + page), {device: devicesProxy.get(index)})
} else {
pageStack.push(Qt.resolvedUrl("../devicepages/" + page), {device: devicesProxy.get(index)})
}
}
DevicesProxy {
id: devicesProxyInternal
devices: Engine.deviceManager.devices
}
}

35
nymea-app/ui/devicelistpages/GenericDeviceListPage.qml
View File

@ -5,50 +5,27 @@ import Nymea 1.0
import "../components"
import "../delegates"
Page {
id: subPage
property alias shownInterfaces: devicesProxy.shownInterfaces
property alias hiddenInterfaces: devicesProxy.hiddenInterfaces
Component.onCompleted: {
if (devicesProxy.count == 1) {
enterPage(0, true)
}
}
DeviceListPageBase {
id: root
header: GuhHeader {
text: {
if (subPage.shownInterfaces.length === 1) {
return qsTr("My %1").arg(app.interfaceToString(subPage.shownInterfaces[0]))
} else if (subPage.shownInterfaces.length > 1 || subPage.hiddenInterfaces.length > 0) {
if (root.shownInterfaces.length === 1) {
return qsTr("My %1").arg(app.interfaceToString(root.shownInterfaces[0]))
} else if (root.shownInterfaces.length > 1 || root.hiddenInterfaces.length > 0) {
return qsTr("My things")
}
return qsTr("All my things")
}
onBackPressed: {
print("popping")
pageStack.pop()
}
}
function enterPage(index, replace) {
var device = devicesProxy.get(index);
var deviceClass = Engine.deviceManager.deviceClasses.getDeviceClass(device.deviceClassId);
var page = app.interfaceListToDevicePage(deviceClass.interfaces);
if (replace) {
pageStack.replace(Qt.resolvedUrl("../devicepages/" + page), {device: devicesProxy.get(index)})
} else {
pageStack.push(Qt.resolvedUrl("../devicepages/" + page), {device: devicesProxy.get(index)})
}
}
ListView {
anchors.fill: parent
model: DevicesProxy {
id: devicesProxy
devices: Engine.deviceManager.devices
}
model: root.devicesProxy
delegate: ThingDelegate {
width: parent.width
device: Engine.deviceManager.devices.getDevice(model.id);

44
nymea-app/ui/devicelistpages/LightsDeviceListPage.qml
View File

@ -1,11 +1,12 @@
import QtQuick 2.5
import QtQuick.Controls 2.1
import QtQuick.Controls.Material 2.1
import QtQuick.Layouts 1.1
import Nymea 1.0
import "../components"
Page {
property alias shownInterfaces: devicesProxy.shownInterfaces
DeviceListPageBase {
header: GuhHeader {
text: qsTr("Lights")
onBackPressed: pageStack.pop()
@ -31,12 +32,10 @@ Page {
ListView {
anchors.fill: parent
model: DevicesProxy {
id: devicesProxy
devices: Engine.deviceManager.devices
}
model: devicesProxy
spacing: app.margins
delegate: ItemDelegate {
delegate: Pane {
id: itemDelegate
width: parent.width
@ -59,24 +58,26 @@ Page {
property var colorStateType: deviceClass.stateTypes.findByName("color");
property var colorState: colorStateType ? device.states.getState(colorStateType.id) : null
Material.elevation: 1
topPadding: 0
bottomPadding: 0
leftPadding: 0
rightPadding: 0
contentItem: Rectangle {
contentItem: ItemDelegate {
id: contentItem
implicitHeight: itemDelegate.brightnessStateType && !itemDelegate.inline && enabled ? nameRow.implicitHeight + sliderRow.implicitHeight : nameRow.implicitHeight
gradient: Gradient {
GradientStop { position: 0.0; color: "transparent" }
GradientStop { position: 1.0; color: Qt.rgba(app.foregroundColor.r, app.foregroundColor.g, app.foregroundColor.b, 0.05) }
}
implicitHeight: itemDelegate.brightnessStateType && !itemDelegate.inline && nameRow.enabled ? nameRow.implicitHeight + sliderRow.implicitHeight : nameRow.implicitHeight
// gradient: Gradient {
// GradientStop { position: 0.0; color: "transparent" }
// GradientStop { position: 1.0; color: Qt.rgba(app.foregroundColor.r, app.foregroundColor.g, app.foregroundColor.b, 0.05) }
// }
enabled: itemDelegate.connectedState === null || itemDelegate.connectedState.value === true
ColumnLayout {
anchors { left: parent.left; right: parent.right; margins: app.margins }
topPadding: 0
contentItem: ColumnLayout {
spacing: 0
RowLayout {
enabled: itemDelegate.connectedState === null || itemDelegate.connectedState.value === true
id: nameRow
z: 2 // make sure the switch in here is on top of the slider, given we cheated a bit and made them overlap
spacing: app.margins
@ -133,7 +134,7 @@ Page {
ThrottledSlider {
id: outlineSlider
anchors { left: parent.left; right: parent.right; verticalCenter: parent.verticalCenter }
visible: contentItem.enabled && itemDelegate.brightnessStateType && !inlineSlider.visible
visible: nameRow.enabled && itemDelegate.brightnessStateType && !inlineSlider.visible
from: 0; to: 100
value: itemDelegate.brightnessState ? itemDelegate.brightnessState.value : 0
onMoved: {
@ -147,12 +148,9 @@ Page {
}
}
}
}
onClicked: {
var device = devicesProxy.get(index);
var deviceClass = Engine.deviceManager.deviceClasses.getDeviceClass(device.deviceClassId)
pageStack.push(Qt.resolvedUrl("../devicepages/LightDevicePage.qml"), {device: devicesProxy.get(index)})
onClicked: {
enterPage(index, false)
}
}
}
}

122
nymea-app/ui/devicelistpages/SensorsDeviceListPage.qml Normal file
View File

@ -0,0 +1,122 @@
import QtQuick 2.5
import QtQuick.Controls 2.1
import QtQuick.Controls.Material 2.1
import QtQuick.Layouts 1.1
import Nymea 1.0
import "../components"
DeviceListPageBase {
id: root
header: GuhHeader {
text: qsTr("Sensors")
onBackPressed: pageStack.pop()
}
ListView {
anchors.fill: parent
model: root.devicesProxy
delegate: ItemDelegate {
id: itemDelegate
width: parent.width
property bool inline: width > 500
property var device: devicesProxy.get(index);
property var deviceClass: Engine.deviceManager.deviceClasses.getDeviceClass(device.deviceClassId);
bottomPadding: index === ListView.view.count - 1 ? topPadding : 0
contentItem: Pane {
id: contentItem
Material.elevation: 2
leftPadding: 0
rightPadding: 0
topPadding: 0
bottomPadding: 0
contentItem: ItemDelegate {
leftPadding: 0
rightPadding: 0
topPadding: 0
bottomPadding: 0
contentItem: ColumnLayout {
Rectangle {
Layout.fillWidth: true
Layout.preferredHeight: app.mediumFont + app.margins
color: Qt.rgba(app.foregroundColor.r, app.foregroundColor.g, app.foregroundColor.b, .05)
RowLayout {
anchors { verticalCenter: parent.verticalCenter; left: parent.left; right: parent.right; margins: app.margins }
Label {
Layout.fillWidth: true
text: model.name
elide: Text.ElideRight
}
ColorIcon {
Layout.preferredHeight: app.iconSize * .5
Layout.preferredWidth: height
name: "../images/battery/battery-020.svg"
visible: itemDelegate.deviceClass.interfaces.indexOf("battery") >= 0 && itemDelegate.device.states.getState(itemDelegate.deviceClass.stateTypes.findByName("batteryCritical").id).value === true
}
ColorIcon {
Layout.preferredHeight: app.iconSize * .5
Layout.preferredWidth: height
name: "../images/dialog-warning-symbolic.svg"
visible: itemDelegate.deviceClass.interfaces.indexOf("connectable") >= 0 && itemDelegate.device.states.getState(itemDelegate.deviceClass.stateTypes.findByName("connected").id).value === false
color: "red"
}
}
}
GridLayout {
id: dataGrid
columns: Math.floor(contentItem.width / 120)
Layout.margins: app.margins
Repeater {
model: ListModel {
ListElement { interfaceName: "temperaturesensor"; stateName: "temperature" }
ListElement { interfaceName: "humiditysensor"; stateName: "humidity" }
ListElement { interfaceName: "moisturesensor"; stateName: "moisture" }
ListElement { interfaceName: "pressuresensor"; stateName: "pressure" }
ListElement { interfaceName: "lightsensor"; stateName: "lightIntensity" }
ListElement { interfaceName: "conductivitysensor"; stateName: "conductivity" }
}
delegate: RowLayout {
id: sensorValueDelegate
visible: itemDelegate.deviceClass.interfaces.indexOf(model.interfaceName) >= 0
Layout.preferredWidth: contentItem.width / dataGrid.columns
property var stateType: itemDelegate.deviceClass.stateTypes.findByName(model.stateName)
property var stateValue: stateType ? itemDelegate.device.states.getState(stateType.id) : null
ColorIcon {
Layout.preferredHeight: app.iconSize * .8
Layout.preferredWidth: height
Layout.alignment: Qt.AlignVCenter
color: app.interfaceToColor(model.interfaceName)
name: app.interfaceToIcon(model.interfaceName)
}
Label {
Layout.fillWidth: true
text: sensorValueDelegate.stateValue
? "%1 %2".arg(sensorValueDelegate.stateValue.value).arg(sensorValueDelegate.stateType.unitString)
: ""
elide: Text.ElideRight
verticalAlignment: Text.AlignVCenter
font.pixelSize: app.smallFont
}
}
}
}
}
onClicked: {
enterPage(index, false)
}
}
}
}
}
}

81
nymea-app/ui/devicelistpages/WeatherDeviceListPage.qml Normal file
View File

@ -0,0 +1,81 @@
import QtQuick 2.5
import QtQuick.Controls 2.1
import QtQuick.Controls.Material 2.1
import QtQuick.Layouts 1.1
import Nymea 1.0
import "../components"
import "../customviews"
DeviceListPageBase {
id: root
header: GuhHeader {
text: qsTr("Weather")
onBackPressed: pageStack.pop()
}
ListView {
anchors.fill: parent
model: root.devicesProxy
delegate: ItemDelegate {
id: itemDelegate
width: parent.width
property bool inline: width > 500
property var device: devicesProxy.get(index);
property var deviceClass: Engine.deviceManager.deviceClasses.getDeviceClass(device.deviceClassId);
bottomPadding: index === ListView.view.count - 1 ? topPadding : 0
contentItem: Pane {
id: contentItem
Material.elevation: 2
leftPadding: 0
rightPadding: 0
topPadding: 0
bottomPadding: 0
contentItem: ItemDelegate {
leftPadding: 0
rightPadding: 0
topPadding: 0
bottomPadding: 0
contentItem: ColumnLayout {
Rectangle {
Layout.fillWidth: true
Layout.preferredHeight: app.mediumFont + app.margins
color: Qt.rgba(app.foregroundColor.r, app.foregroundColor.g, app.foregroundColor.b, .05)
RowLayout {
anchors { verticalCenter: parent.verticalCenter; left: parent.left; right: parent.right; margins: app.margins }
Label {
Layout.fillWidth: true
text: model.name
elide: Text.ElideRight
}
ColorIcon {
Layout.preferredHeight: app.iconSize * .5
Layout.preferredWidth: height
name: "../images/dialog-warning-symbolic.svg"
visible: itemDelegate.deviceClass.interfaces.indexOf("connectable") >= 0 && itemDelegate.device.states.getState(itemDelegate.deviceClass.stateTypes.findByName("connected").id).value === false
color: "red"
}
}
}
WeatherView {
Layout.fillWidth: true
device: itemDelegate.device
deviceClass: itemDelegate.deviceClass
}
}
onClicked: {
var device = devicesProxy.get(index);
var deviceClass = Engine.deviceManager.deviceClasses.getDeviceClass(device.deviceClassId)
pageStack.push(Qt.resolvedUrl("../devicepages/WeatherDevicePage.qml"), {device: devicesProxy.get(index)})
}
}
}
}
}
}

6
nymea-app/ui/devicepages/WeatherDevicePage.qml
View File

@ -32,6 +32,12 @@ DevicePageBase {
deviceClass: root.deviceClass
interfaceName: "humiditysensor"
}
SensorView {
Layout.fillWidth: true
device: root.device
deviceClass: root.deviceClass
interfaceName: "pressuresensor"
}
}
}
}

6
nymea-app/ui/mainviews/DevicesPageDelegate.qml
View File

@ -16,6 +16,12 @@ MainPageTile {
onClicked: {
var page;
switch (model.name) {
case "sensor":
page = "SensorsDeviceListPage.qml"
break;
case "weather":
page = "WeatherDeviceListPage.qml"
break;
case "light":
page = "LightsDeviceListPage.qml"
break;