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

Update connection to delegate

Browse Source
This commit is contained in:
Michael Zanetti 2018-07-04 21:48:37 +02:00 committed by Simon Stürz
parent 045edd52aa
commit 1e9a052999
2 changed files with 22 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
nymea-app/ui/ConnectPage.qml
View File

@ -143,7 +143,7 @@ Page {
model: discovery.discoveryModel
clip: true
delegate: SwipeDelegate {
delegate: MeaListItemDelegate {
id: discoveryDeviceDelegate
width: parent.width
height: app.delegateHeight
@ -172,51 +172,27 @@ Page {
return usedConfigIndex
}
contentItem: RowLayout {
ColorIcon {
Layout.fillHeight: true
Layout.preferredWidth: height
name: model.type === DiscoveryDevice.DeviceTypeNetwork ? "../images/network-vpn.svg" : "../images/bluetooth.svg"
color: app.guhAccent
}
ColumnLayout {
Layout.fillWidth: true
Label {
text: model.name
Layout.fillWidth: true
elide: Text.ElideRight
}
Label {
text: model.type === DiscoveryDevice.DeviceTypeNetwork ? model.hostAddress : model.bluetoothAddress
font.pixelSize: app.smallFont
}
}
ColorIcon {
Layout.fillHeight: true
Layout.preferredWidth: height
property bool hasSecurePort: {
if (model.type === DiscoveryDevice.DeviceTypeNetwork) {
return discoveryDeviceDelegate.discoveryDevice.portConfigs.get(discoveryDeviceDelegate.defaultPortConfigIndex).sslEnabled
} else {
return false
}
}
property bool isTrusted: {
if (model.type === DiscoveryDevice.DeviceTypeNetwork) {
Engine.connection.isTrusted(discoveryDeviceDelegate.discoveryDevice.toUrl(discoveryDeviceDelegate.defaultPortConfigIndex))
} else {
return false
}
}
visible: hasSecurePort
name: "../images/network-secure.svg"
color: isTrusted ? app.guhAccent : keyColor
iconName: model.type === DiscoveryDevice.DeviceTypeNetwork ? "../images/network-vpn.svg" : "../images/bluetooth.svg"
text: model.name
subText: model.type === DiscoveryDevice.DeviceTypeNetwork ? model.hostAddress : model.bluetoothAddress
property bool hasSecurePort: {
if (model.type === DiscoveryDevice.DeviceTypeNetwork) {
return discoveryDeviceDelegate.discoveryDevice.portConfigs.get(discoveryDeviceDelegate.defaultPortConfigIndex).sslEnabled
} else {
return false
}
}
property bool isTrusted: {
if (model.type === DiscoveryDevice.DeviceTypeNetwork) {
Engine.connection.isTrusted(discoveryDeviceDelegate.discoveryDevice.toUrl(discoveryDeviceDelegate.defaultPortConfigIndex))
} else {
return false
}
}
progressive: hasSecurePort
secondaryIconName: "../images/network-secure.svg"
secondaryIconColor: isTrusted ? app.guhAccent : Material.foreground
swipe.enabled: model.type === DiscoveryDevice.DeviceTypeNetwork
onClicked: {
if (model.type === DiscoveryDevice.DeviceTypeNetwork) {

2
nymea-app/ui/components/MeaListItemDelegate.qml
View File

@ -12,6 +12,8 @@ SwipeDelegate {
property string iconName
property int iconSize: app.iconSize
property color iconColor: app.guhAccent
property string secondaryIconName
property alias secondaryIconColor: secondaryIcon.color
property bool batteryCritical: false
property bool disconnected: false