Merge lp:~nik90/ubuntu-clock-app/clock-sunrise into lp:ubuntu-clock-app/saucy

[Nekhelesh Ramananthan]

Basic implementation of Clock Sunrise/Sunset Feature using OpenWeatherMap online API.

This MP is a basic implementation of Clock Sunrise/Sunset Feature. It uses the OpenWeatherMap API to get the Sunrise/Sunset times.

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:51
http://91.189.93.125:8080/job/ubuntu-clock-app-ci/8/
Executed test runs:
    SUCCESS: http://91.189.93.125:8080/job/ubuntu-clock-app-quantal-amd64-ci/8
    SUCCESS: http://91.189.93.125:8080/job/ubuntu-clock-app-raring-amd64-ci/8

Click here to trigger a rebuild:
http://91.189.93.125:8080/job/ubuntu-clock-app-ci/8/rebuild

review: Approve (continuous-integration)

=== renamed file 'common/AnalogClockFace.qml' => 'clock/AnalogClockFace.qml'
--- common/AnalogClockFace.qml	2013-04-11 19:49:04 +0000
+++ clock/AnalogClockFace.qml	2013-05-01 13:19:25 +0000
@@ -20,7 +20,11 @@
 
 import QtQuick 2.0
 import Ubuntu.Components 0.1
+import QtQuick.XmlListModel 2.0
+import "ClockScript.js" as Cscript
 import "../common/Constants.js" as Constants
+import "../common/ClockUtils.js" as Utils
+import "../common"
 
 AnalogFaceBase {
     id: clockRoot
@@ -32,6 +36,8 @@
     property alias hourHandRect: hourHand
     property alias minuteHandRect: minuteHand
     property alias secondsHandRect: secondsHand
+    property real latitude: 52.01;
+    property real longitude: 4.35;
 
     function timeChanged(now) {
         hours = now.getHours()
@@ -39,6 +45,10 @@
         seconds = now.getUTCSeconds();
     }
 
+    function reloadSunRiseModel () {
+        sunRiseModel.reload()
+    }
+
     // "API" of the analog face
     // say you want add a mousearea to one of the hands
     // (e.g. when doing a timepicker), just do
@@ -50,7 +60,18 @@
     }
     */
 
-    pulseGlow: false
+    pulseGlow: true
+
+    // TODO: Get the latitude and longitude using the platform API automatically instead of using static values.
+    XmlListModel {
+        id: sunRiseModel
+
+        source: Cscript.getUrlString(latitude, longitude)
+        query: "/current/city"
+
+        XmlRole { name: "sunrise"; query: "sun/@rise/string()"; isKey: true }
+        XmlRole { name: "sunset"; query: "sun/@set/string()"; isKey: true  }
+    }
 
     AnalogClockHand {
         id: hourHand
@@ -89,4 +110,97 @@
             color: Constants.pitchBlack
         }
     }
+
+    MouseArea {
+        anchors.fill: parent
+        onClicked: {
+            // Only show the sunrise/sunset times after the XmlListModel is Ready.
+            if (sunRiseModel.status == 1) {
+                clockRoot.state == "" ? clockRoot.state = "easteregg" : clockRoot.state = "";
+            }
+            else {
+                Utils.log("Sunrise/Sunset times not yet loaded.")
+            }
+        }
+    }
+
+    Rectangle {
+        id: easterEggCircle;
+
+        width: parent.width; height: parent.height
+        radius: parent.radius
+        z: parent.z + 100
+        antialiasing: parent.antialiasing
+        anchors.centerIn: parent
+        color: Constants.brightWhite
+        opacity: 0
+        visible: opacity == 0 ? false : true
+
+        Column {
+            spacing: units.gu(1)
+            anchors.centerIn: parent
+            width: parent.width
+
+            Label {
+                id: sunriseLabel
+                anchors.horizontalCenter: parent.horizontalCenter
+
+                fontSize: "large"
+                text: i18n.tr("Sunrise")
+            }
+
+            Label {
+                id: sunriseTimeLabel
+                anchors.horizontalCenter: parent.horizontalCenter
+
+                fontSize: "x-large"
+                text: "Default"
+            }
+
+            Rectangle {
+                id: sunsetsunriseDivider
+                width: parent.width - units.gu(12)
+                height: units.gu(1) / 2
+                anchors.horizontalCenter: parent.horizontalCenter
+
+                color: Constants.normalGrey
+            }
+
+            Label {
+                id: sunsetTimeLabel
+                width: parent.width
+                horizontalAlignment: Text.AlignHCenter
+
+                fontSize: "x-large"
+                text: "Default"
+            }
+
+            Label {
+                id: sunsetLabel
+                width: parent.width
+                horizontalAlignment: Text.AlignHCenter
+
+                fontSize: "large"
+                text: i18n.tr("Sunset")
+            }
+
+        }
+    }
+
+    states: [
+        State {
+            name: "easteregg"
+            PropertyChanges { target: clockRoot; isForeground: false; }
+            PropertyChanges { target: easterEggCircle; opacity: 1; }
+            // TODO: Do some caching of data here. Store data locally to reduce API calls.
+            PropertyChanges { target: sunriseTimeLabel; text: Cscript.getSunTime(sunRiseModel.get(0).sunrise); }
+            PropertyChanges { target: sunsetTimeLabel; text: Cscript.getSunTime(sunRiseModel.get(0).sunset); }
+        },
+        State {
+            name: ""
+            PropertyChanges { target: clockRoot; isForeground: true }
+            PropertyChanges { target: easterEggCircle; opacity: 0; }
+        }
+
+    ]
 }

=== renamed file 'common/AnalogClockHand.qml' => 'clock/AnalogClockHand.qml'
--- common/AnalogClockHand.qml	2013-04-12 23:18:36 +0000
+++ clock/AnalogClockHand.qml	2013-05-01 13:19:25 +0000
@@ -19,7 +19,7 @@
  */
 
 import QtQuick 2.0
-import "Constants.js" as Constants
+import "../common/Constants.js" as Constants
 
 Rectangle {
     id: hand

=== modified file 'clock/ClockPage.qml'
--- clock/ClockPage.qml	2013-04-16 13:26:43 +0000
+++ clock/ClockPage.qml	2013-05-01 13:19:25 +0000
@@ -20,8 +20,10 @@
 
 import QtQuick 2.0
 import Ubuntu.Components 0.1
+import Ubuntu.Components.Popups 0.1 as Popups
 import "../common/ClockUtils.js" as Utils
 
+
 /*!
     \brief ClockPage is a page that lives inside the "Clock"-tab of the application
 */
@@ -31,12 +33,11 @@
         Utils.log("ClockPage loaded");
         currentTimeFormatted = Qt.formatTime(new Date());
         selectedLocation = "USER'S LOCATION TODO"
+
+        // Obtaining the sunrise/sunset times as soon as clock page is loaded.
+        clockFace.reloadSunRiseModel()
     }
 
-    // Currently loaded clock face filename
-    // TODO better enumeration to filename mapping
-    property string currentClockFaceFilename: "../common/AnalogClockFace.qml"
-
     // Property to hold the formatted time string to show on the screen
     property string currentTimeFormatted
 
@@ -50,8 +51,8 @@
     function onTimerUpdate(now) {
         currentTimeFormatted = Qt.formatTime(now);
 
-        // Tell currently loaded clockface that time has changed
-        clockFaceLoader.item.timeChanged(now);
+        // Update time
+        clockFace.timeChanged(now)
     }
 
     Label {
@@ -67,17 +68,8 @@
         text: currentTimeFormatted
     }
 
-    // TODO: load from settings which clock face to display
-    // TODO: create digital clock face
-    Loader {
-        id: clockFaceLoader
-
-        anchors.centerIn: parent
-        source: currentClockFaceFilename
-
-        Component.onCompleted:  {
-            Utils.log("Clock face loaded from " + source);
-        }
+    AnalogClockFace {
+        id: clockFace
     }
 
     Label {
@@ -92,4 +84,52 @@
         text: selectedLocation
     }
 
+    Component {
+        id: locationDialogComponent
+
+        Popups.Dialog {
+            id: dialog
+            title: "Location information"
+            text: "Enter your latitude and longtitude"
+
+            TextField {
+                id: latitudeField
+                width: parent.width/2
+                placeholderText: 'latitude'
+            }
+
+            TextField {
+                id: longitudeField
+                width: parent.width/2
+                placeholderText: 'longitude'
+            }
+
+            Button {
+                id: goButton
+                text: 'Ok'
+                color: 'green'
+                onClicked: {
+                    clockFace.latitude = latitudeField.text
+                    clockFace.longitude = longitudeField.text
+                    PopupUtils.close(dialog)
+                }
+            }
+        }
+    }
+
+    tools: ToolbarActions {
+        Action {
+            id: locationAction
+            objectName: "changeSubredditAction"
+
+            iconSource: Qt.resolvedUrl("../images/add.png")
+            text: i18n.tr("Location")
+
+            onTriggered: {
+                PopupUtils.open(locationDialogComponent, locationAction.itemHint)
+            }
+        }
+    }
+
+
 }

=== added file 'clock/ClockScript.js'
--- clock/ClockScript.js	1970-01-01 00:00:00 +0000
+++ clock/ClockScript.js	2013-05-01 13:19:25 +0000
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2013 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Nekhelesh Ramananthan <[e-mail]>
+ */
+
+.pragma library
+
+// Function to form the url string to make the API call
+function getUrlString (lat, long) {
+    var base_url,url;
+    base_url = "http://api.openweathermap.org/data/2.5/weather?";
+    url = base_url + "lat=" + lat + "&lon=" + long + "&mode=xml";
+    return url;
+}
+
+// Function to convert online data format "2013-04-20T19:40:30" to just "19:40:30"
+function getSunTime (data) {
+    var DateTime = data.split('T');
+    return DateTime[1];
+}