Merge remote-tracking branch 'origin/clickable' into landing-silo

QtZeroConf

@@ -1 +1 @@
-Subproject commit 2990b858e6334fae4dd37a77c770336bd6e1b2d9
+Subproject commit 09116a9bf84082688e9f2cd24cfd08788c71650c

clickable.json

@@ -0,0 +1,9 @@
+{
+  "template": "qmake",
+  "kill": "nymea-app",
+  "build_args": "CONFIG+=ubuntu",
+  "dependencies": [
+    "libavahi-client-dev",
+    "libavahi-common-dev"
+  ]
+}

manifest.json

@@ -0,0 +1,15 @@
+{
+    "name": "io.guh.nymeaapp",
+    "description": "nymea:app is a client for nymea - a professional IoT server that allows to link smart devices and services. Functional relations of all available sensing and acting capabilities can be defined by 'Magic'.",
+    "architecture": "armhf",
+    "title": "nymea:app",
+    "hooks": {
+        "nymea-app": {
+            "apparmor": "nymea-app.apparmor",
+            "desktop":  "nymea-app.desktop"
+        }
+    },
+    "version": "1.0.75",
+    "maintainer": "Michael Zanetti <michael.zanetti@nymea.io>",
+    "framework" : "ubuntu-sdk-15.04.5"
+}

nymea-app.apparmor

@@ -0,0 +1,5 @@
+{
+    "template": "unconfined",
+    "policy_groups": ["networking"],
+    "policy_version": 1.3
+}

nymea-app.desktop

@@ -0,0 +1,7 @@
+[Desktop Entry]
+Name=nymea:app
+Exec=usr/bin/nymea-app
+Icon=appicon.svg
+Terminal=false
+Type=Application
+X-Ubuntu-Touch=true

nymea-app.pro

@@ -1,6 +1,5 @@
 include(config.pri)
 message("APP_VERSION: $${APP_VERSION} ($${APP_REVISION})")
-
 TEMPLATE=subdirs
 
 SUBDIRS = libnymea-common libnymea-app-core nymea-app

nymea-app/nymea-app.pro

@@ -108,6 +108,10 @@ ios: {
     QMAKE_MAC_XCODE_SETTINGS += IOS_ENTITLEMENTS
 }
 
+ubuntu_files.path += /
+ubuntu_files.files += ../manifest.json ../nymea-app.apparmor ../nymea-app.desktop ../packaging/android/appicon.svg
+INSTALLS += ubuntu_files
+
 BR=$$BRANDING
 !equals(BR, "") {
     DEFINES += BRANDING=\\\"$${BR}\\\"
@@ -119,10 +123,3 @@ BR=$$BRANDING
 target.path = /usr/bin
 INSTALLS += target
 
-DISTFILES += \
-    ui/components/BusyOverlay.qml \
-    ui/devicepages/NotificationsDevicePage.qml \
-    ruletemplates/buttontemplates.json \
-    ruletemplates/notificationtemplates.json \
-    ui/devicepages/LightDevicePage.qml \
-    ruletemplates/accesscontroltemplates.json

nymea-app/ui/components/FancyHeader.qml

@@ -106,6 +106,7 @@ ToolBar {
                         ColumnLayout {
                             anchors.fill: parent
                             anchors.margins: app.margins / 2
+                            spacing: 0
                             ColorIcon {
                                 name: model.iconSource
                                 Layout.preferredHeight: app.iconSize

nymea-app/ui/components/MainPageTabButton.qml

@@ -16,6 +16,7 @@ TabButton {
 
     contentItem: GridLayout {
         columns: root.alignment === Qt.Vertical ? 1 : 2
+        rowSpacing: 4
         ColorIcon {
             Layout.preferredWidth: app.iconSize
             Layout.preferredHeight: app.iconSize