From 69822e4dcf541a52e4202d5ff566364fb90e6ec0 Mon Sep 17 00:00:00 2001
From: Javier <dev.git@javispedro.com>
Date: Wed, 3 Dec 2014 00:48:19 +0100
Subject: implement UI for JS app configuration

---
 app/qml/pages/AboutPage.qml     |  2 +-
 app/qml/pages/AppConfigPage.qml | 34 ++++++++++++++++++++++++++++++++++
 app/qml/pages/WatchPage.qml     | 30 ++++++++++++++++++++++++++++++
 app/qml/pages/WebViewPage.qml   | 29 -----------------------------
 app/qml/pebble.qml              |  5 -----
 5 files changed, 65 insertions(+), 35 deletions(-)
 create mode 100644 app/qml/pages/AppConfigPage.qml
 delete mode 100644 app/qml/pages/WebViewPage.qml

(limited to 'app/qml')

diff --git a/app/qml/pages/AboutPage.qml b/app/qml/pages/AboutPage.qml
index bec1031..8fd009e 100644
--- a/app/qml/pages/AboutPage.qml
+++ b/app/qml/pages/AboutPage.qml
@@ -40,7 +40,7 @@ Page {
                 anchors {
                     left: parent.left
                     right: parent.right
-                    margins: Theme.paddingSmall
+                    margins: Theme.paddingMedium
                 }
                 font.pixelSize: Theme.fontSizeTiny
                 horizontalAlignment: Text.AlignJustify
diff --git a/app/qml/pages/AppConfigPage.qml b/app/qml/pages/AppConfigPage.qml
new file mode 100644
index 0000000..8fb31ca
--- /dev/null
+++ b/app/qml/pages/AppConfigPage.qml
@@ -0,0 +1,34 @@
+import QtQuick 2.0
+import QtQml 2.1
+import QtWebKit 3.0
+import Sailfish.Silica 1.0
+
+Page {
+    id: appConfigPage
+
+    property alias url: webview.url
+    property string uuid
+
+    SilicaWebView {
+        id: webview
+        anchors.fill: parent
+
+        header: PageHeader {
+            title: "Configuring " + uuid
+        }
+
+        onNavigationRequested: {
+            console.log("appconfig navigation requested to " + request.url);
+            var url = request.url.toString();
+            if (/^pebblejs:\/\/close/.exec(url)) {
+                var data = decodeURI(url.substring(17));
+                console.log("appconfig requesting close; data: " + data);
+                pebbled.setAppConfiguration(uuid, data);
+                pageStack.pop();
+                request.action = WebView.IgnoreRequest;
+            } else {
+                request.action = WebView.AcceptRequest;
+            }
+        }
+    }
+}
diff --git a/app/qml/pages/WatchPage.qml b/app/qml/pages/WatchPage.qml
index 90e5ec9..8169507 100644
--- a/app/qml/pages/WatchPage.qml
+++ b/app/qml/pages/WatchPage.qml
@@ -77,6 +77,36 @@ Page {
                 }
             }
 
+
+            Label {
+                text: qsTr("App configuration")
+                font.family: Theme.fontFamilyHeading
+                color: Theme.highlightColor
+                anchors.right: parent.right
+                anchors.rightMargin: Theme.paddingMedium
+            }
+
+            Button {
+                text: "Configure current app"
+                anchors {
+                    left: parent.left
+                    right: parent.right
+                    margins: Theme.paddingLarge
+                }
+                onClicked: {
+                    var uuid = pebbled.appUuid;
+                    console.log("going to configureApp " + uuid);
+                    var url = pebbled.configureApp(uuid);
+                    console.log("obtained configure URL " + url);
+                    if (url) {
+                        pageStack.push(Qt.resolvedUrl("AppConfigPage.qml"), {
+                                           url: url,
+                                           uuid: uuid
+                                       });
+                    }
+                }
+            }
+
         }
     }
 }
diff --git a/app/qml/pages/WebViewPage.qml b/app/qml/pages/WebViewPage.qml
deleted file mode 100644
index 2c6fcf0..0000000
--- a/app/qml/pages/WebViewPage.qml
+++ /dev/null
@@ -1,29 +0,0 @@
-import QtQuick 2.0
-import QtQml 2.1
-import QtWebKit 3.0
-import Sailfish.Silica 1.0
-
-Page {
-    id: webviewPage
-
-    property alias url: webview.url
-
-    SilicaWebView {
-        id: webview
-        anchors.fill: parent
-
-        onNavigationRequested: {
-            console.log("navigation requested to " + request.url);
-            var url = request.url.toString()
-            if (/^pebblejs:\/\/close/.exec(url)) {
-                var data = decodeURI(url.substring(17));
-                console.log("match with pebble close regexp. data: " + data);
-                pebbled.webviewClosed(data);
-                pageStack.pop();
-                request.action = WebView.IgnoreRequest;
-            } else {
-                request.action = WebView.AcceptRequest;
-            }
-        }
-    }
-}
diff --git a/app/qml/pebble.qml b/app/qml/pebble.qml
index 2ff0839..da3bfb5 100644
--- a/app/qml/pebble.qml
+++ b/app/qml/pebble.qml
@@ -41,10 +41,5 @@ ApplicationWindow
 
     PebbledInterface {
         id: pebbled
-
-        onOpenUrl: {
-            console.log("got open url: " + url);
-            pageStack.push(Qt.resolvedUrl("pages/WebViewPage.qml"), {url: url});
-        }
     }
 }
-- 
cgit v1.2.3