From 9b62184eec3f34c0f3fb52c31dec82dedaa576f3 Mon Sep 17 00:00:00 2001
From: Michael Zanetti <michael_zanetti@gmx.net>
Date: Thu, 7 Feb 2019 14:48:46 +0100
Subject: [PATCH] Add SwipeDelegateGroup in GenericDevicePage

---
 nymea-app/ui/customviews/GenericTypeLogView.qml        | 2 ++
 nymea-app/ui/devicelistpages/GenericDeviceListPage.qml | 1 +
 nymea-app/ui/devicepages/GenericDevicePage.qml         | 5 ++++-
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/nymea-app/ui/customviews/GenericTypeLogView.qml b/nymea-app/ui/customviews/GenericTypeLogView.qml
index b617d82b..98364481 100644
--- a/nymea-app/ui/customviews/GenericTypeLogView.qml
+++ b/nymea-app/ui/customviews/GenericTypeLogView.qml
@@ -21,6 +21,8 @@ Item {
 
         ScrollBar.vertical: ScrollBar {}
 
+        SwipeDelegateGroup {}
+
         onContentYChanged: {
             if (!engine.jsonRpcClient.ensureServerVersion("1.10")) {
                 if (!logsModel.busy && contentY - originY < 5 * height) {
diff --git a/nymea-app/ui/devicelistpages/GenericDeviceListPage.qml b/nymea-app/ui/devicelistpages/GenericDeviceListPage.qml
index a7162af4..f014ed77 100644
--- a/nymea-app/ui/devicelistpages/GenericDeviceListPage.qml
+++ b/nymea-app/ui/devicelistpages/GenericDeviceListPage.qml
@@ -26,6 +26,7 @@ DeviceListPageBase {
     ListView {
         anchors.fill: parent
         model: root.devicesProxy
+
         delegate: ThingDelegate {
             width: parent.width
             device: engine.deviceManager.devices.getDevice(model.id);
diff --git a/nymea-app/ui/devicepages/GenericDevicePage.qml b/nymea-app/ui/devicepages/GenericDevicePage.qml
index 118f55c9..d94542b7 100644
--- a/nymea-app/ui/devicepages/GenericDevicePage.qml
+++ b/nymea-app/ui/devicepages/GenericDevicePage.qml
@@ -21,6 +21,8 @@ DevicePageBase {
         anchors.fill: parent
         clip: true
 
+        SwipeDelegateGroup {}
+
         section.property: "type"
         section.delegate: ListSectionHeader {
             text: {
@@ -82,7 +84,7 @@ DevicePageBase {
                 }
             }
 
-            onClicked: pageStack.push(Qt.resolvedUrl("DeviceLogPage.qml"), {device: root.device, filterTypeIds: [model.id]})
+            onClicked: swipe.close()
 
             swipe.right: RowLayout {
                 height: delegate.height
@@ -96,6 +98,7 @@ DevicePageBase {
                         name: "../images/logs.svg"
                     }
                     onClicked: {
+                        swipe.close();
                         pageStack.push(Qt.resolvedUrl("DeviceLogPage.qml"), {device: root.device, filterTypeIds: [model.id]})
                     }
                 }