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

Merge PR #97: Improve closable lists

Browse Source
This commit is contained in:
Jenkins 2018-12-18 01:04:26 +01:00
commit af9c233c48
9 changed files with 166 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nymea-app/resources.qrc
View File

@ -78,6 +78,11 @@
<file>ui/devicepages/LightDevicePage.qml</file>
<file>ui/devicepages/FingerprintReaderDevicePage.qml</file>
<file>ui/devicelistpages/GenericDeviceListPage.qml</file>
<file>ui/devicelistpages/ClosablesDeviceListPage.qml</file>
<file>ui/devicelistpages/GarageDeviceListPage.qml</file>
<file>ui/devicelistpages/AwningDeviceListPage.qml</file>
<file>ui/devicelistpages/ShutterDeviceListPage.qml</file>
<file>ui/devicelistpages/BlindDeviceListPage.qml</file>
<file>ui/devicelistpages/LightsDeviceListPage.qml</file>
<file>ui/devicelistpages/SensorsDeviceListPage.qml</file>
<file>ui/devicelistpages/WeatherDeviceListPage.qml</file>

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

@ -175,6 +175,7 @@ ApplicationWindow {
return Qt.resolvedUrl("images/DeviceIconBlind.svg")
case "garagegate":
return Qt.resolvedUrl("images/shutter/shutter-100.svg")
case "awning":
case "extendedawning":
return Qt.resolvedUrl("images/awning/awning-100.svg")
case "battery":

7
nymea-app/ui/devicelistpages/AwningDeviceListPage.qml Normal file
View File

@ -0,0 +1,7 @@
import QtQuick 2.9
ClosablesDeviceListPage {
title: qsTr("Awnings")
iconBasename: "../images/awning/awning"
invertControls: true
}

6
nymea-app/ui/devicelistpages/BlindDeviceListPage.qml Normal file
View File

@ -0,0 +1,6 @@
import QtQuick 2.9
ClosablesDeviceListPage {
title: qsTr("Blinds")
iconBasename: "../images/shutter/shutter"
}

119
nymea-app/ui/devicelistpages/ClosablesDeviceListPage.qml Normal file
View File

@ -0,0 +1,119 @@
import QtQuick 2.5
import QtQuick.Controls 2.1
import QtQuick.Controls.Material 2.1
import QtQuick.Layouts 1.1
import QtGraphicalEffects 1.0
import Nymea 1.0
import "../components"
DeviceListPageBase {
id: root
property string iconBasename
property bool invertControls: false
header: GuhHeader {
id: header
onBackPressed: pageStack.pop()
text: root.title
HeaderButton {
imageSource: "../images/system-shutdown.svg"
onClicked: {
for (var i = 0; i < devicesProxy.count; i++) {
var device = devicesProxy.get(i);
var deviceClass = engine.deviceManager.deviceClasses.getDeviceClass(device.deviceClassId);
var actionType = deviceClass.actionTypes.findByName("close");
engine.deviceManager.executeAction(device.id, actionType.id)
}
}
}
}
ListView {
anchors.fill: parent
model: devicesProxy
spacing: app.margins
delegate: Pane {
id: itemDelegate
width: parent.width
property bool inline: width > 500
property Device device: devicesProxy.get(index);
property DeviceClass deviceClass: engine.deviceManager.deviceClasses.getDeviceClass(device.deviceClassId);
property var connectedStateType: deviceClass.stateTypes.findByName("connected");
property var connectedState: connectedStateType ? device.states.getState(connectedStateType.id) : null
property StateType percentageStateType: deviceClass.stateTypes.findByName("percentage");
property ActionType percentageActionType: deviceClass.actionTypes.findByName("percentage");
property State percentageState: percentageStateType ? device.states.getState(percentageStateType.id) : null
property StateType movingStateType: deviceClass.stateTypes.findByName("moving");
property ActionType movingActionType: deviceClass.actionTypes.findByName("moving");
property State movingState: movingStateType ? device.states.getState(movingStateType.id) : null
Material.elevation: 1
topPadding: 0
bottomPadding: 0
leftPadding: 0
rightPadding: 0
contentItem: ItemDelegate {
id: contentItem
implicitHeight: nameRow.implicitHeight
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
Item {
Layout.preferredHeight: app.iconSize
Layout.preferredWidth: height
Layout.alignment: Qt.AlignVCenter
ColorIcon {
id: icon
anchors.fill: parent
color: itemDelegate.movingStateType && itemDelegate.movingState.value === true
? app.accentColor
: keyColor
name: itemDelegate.percentageStateType
? root.iconBasename + "-" + app.pad(Math.round(itemDelegate.percentageState.value / 10) * 10, 3) + ".svg"
: root.iconBasename + "-050.svg"
}
}
Label {
Layout.fillWidth: true
text: itemDelegate.device.name
elide: Text.ElideRight
verticalAlignment: Text.AlignVCenter
}
Item {
Layout.preferredWidth: shutterControls.implicitWidth
Layout.preferredHeight: app.iconSize * 2
ShutterControls {
id: shutterControls
height: parent.height
device: itemDelegate.device
invert: root.invertControls
}
}
}
}
onClicked: {
enterPage(index, false)
}
}
}
}
}

6
nymea-app/ui/devicelistpages/GarageDeviceListPage.qml Normal file
View File

@ -0,0 +1,6 @@
import QtQuick 2.9
ClosablesDeviceListPage {
title: qsTr("Garage gates")
iconBasename: "../images/shutter/shutter"
}

6
nymea-app/ui/devicelistpages/ShutterDeviceListPage.qml Normal file
View File

@ -0,0 +1,6 @@
import QtQuick 2.9
ClosablesDeviceListPage {
title: qsTr("Shutters")
iconBasename: "../images/shutter/shutter"
}

2
nymea-app/ui/devicepages/ShutterDevicePage.qml
View File

@ -10,7 +10,7 @@ DevicePageBase {
id: root
readonly property bool landscape: width > height
readonly property bool isExtended: deviceClass.interfaces.indexOf("extendedshutter") >= 0
readonly property bool isExtended: deviceClass.interfaces.indexOf("extendedclosable") >= 0
readonly property var percentageState: isExtended ? device.states.getState(deviceClass.stateTypes.findByName("percentage").id) : 0
readonly property var movingState: isExtended ? device.states.getState(deviceClass.stateTypes.findByName("moving").id) : 0

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

@ -28,6 +28,21 @@ MainPageTile {
case "smartmeter":
page ="SmartMeterDeviceListPage.qml";
break;
case "garagegate":
page = "GarageDeviceListPage.qml";
break;
case "awning":
case "extendedAwning":
page = "AwningDeviceListPage.qml";
break;
case "blind":
case "extendedBlind":
page = "ShutterDeviceListPage.qml";
break;
case "shutter":
case "extendedShutter":
page = "ShutterDeviceListPage.qml";
break;
default:
page = "GenericDeviceListPage.qml"
}