Merge lp:~neokore/ubuntu-weather-app/CurrentWeatherComponent into lp:ubuntu-weather-app/obsolete.trunk

[Raúl Yeguas]

Added the current weather component, a javascript function to get the condition icon and a dummy image from the Mika Meskanen's design.

Added the current weather component, a javascript function to get the condition icon and a dummy image from the Mika Meskanen's design.

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

FAILED: Continuous integration, rev:3
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~neokore/ubuntu-weather-app/CurrentWeatherComponent/+merge/151606/+edit-commit-message

http://91.189.93.125:8080/job/ubuntu-weather-app-ci/2/
Executed test runs:
    SUCCESS: http://91.189.93.125:8080/job/ubuntu-weather-app-ci/./build=pbuilder,distribution=quantal,flavor=amd64/2/console

Click here to trigger a rebuild:
http://91.189.93.125:8080/job/ubuntu-weather-app-ci/2//rebuild/?

review: Needs Fixing (continuous-integration)

[Martin Borho (martin-borho)]

Hi Raul,

when running in qmlscene I get the following warnings:

file:///home/mborho/ubuntu/CurrentWeatherComponent/components/CurrentWeather.qml:29:5: QML Row: Cannot specify left, right, horizontalCenter, fill or centerIn anchors for items inside Row. Row will not function.
file:///home/mborho/ubuntu/CurrentWeatherComponent/components/CurrentWeather.qml:17:5: QML QQuickImage: Cannot open: file:///home/mborho/ubuntu/CurrentWeatherComponent/resources/images/suncloud.jpg

Cheers
Martin

[lp:~neokore/ubuntu-weather-app/CurrentWeatherComponent]

4. By Raúl Yeguas on 2013-03-05

Fixed Row warning and added suncloud dummy image.

[Raúl Yeguas (neokore)]

I updated the branch.
Thinking in widgets I used a row to keep these 3 items inline and then I used alingment. Now I use a simple rectangle instead of the row.
I uploaded the dummy image (I forgot to add it to bzr).

Thank you Martin! Cheers!

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

FAILED: Continuous integration, rev:4
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~neokore/ubuntu-weather-app/CurrentWeatherComponent/+merge/151606/+edit-commit-message

http://91.189.93.125:8080/job/ubuntu-weather-app-ci/3/
Executed test runs:
    SUCCESS: http://91.189.93.125:8080/job/ubuntu-weather-app-ci/./build=pbuilder,distribution=quantal,flavor=amd64/3/console

Click here to trigger a rebuild:
http://91.189.93.125:8080/job/ubuntu-weather-app-ci/3//rebuild/?

review: Needs Fixing (continuous-integration)

[David Planella (dpm)]

Thanks Raúl for your branch!

While I won't be reviewing all of the branches, I thought I'd provide some feedback in the hope that it is useful for future merge proposals:

1) Remember to set the commit message, otherwise the branch cannot be autocommitted to trunk once accepted, and you'll get the warning messages from Ubuntu Phone Apps Jenkins Bot

2) On line 29 of your diff, you're committing code that's commented out. If it's not functional, it's better to remove it than to commit dead code

3) Around line 69 of your diff I see `text: currentTemp+"°"` which means you're hardcoding Centigrade degrees. I'd recommend against using hardcoded units, as they won't be useful for those using Fahrenheit in the US, for example. Is there no Qt library that handles localized units?

Other than that, looks good, thanks!

[1] Either use the "Set commit message" link near the top of the page, or the direct link at
 https://code.launchpad.net/~neokore/ubuntu-weather-app/CurrentWeatherComponent/+merge/151606/+edit-commit-message

review: Needs Fixing

[lp:~neokore/ubuntu-weather-app/CurrentWeatherComponent]

5. By Raúl Yeguas on 2013-03-08

Added 'metric' var to set Metric or Imperial units, deleted dead code to
use 'getConditionIcon' script and renamed dummy icon.

[Raúl Yeguas (neokore)]

Thanks for the advices.

I just set the commit message (my fault!) with the same text of description (I promise I'll make it better next time).

I changed the dead code and made a little change to hardcoded degrees symbol to add a 'C' or a 'F' to text depending on a variable, because "°" represent only degree, it does not especify Celsius or Farenheit (my fault again).

Unfortunately, I couldn't find any QML library to handle it automatically and as we should convert Kelvin degrees into Farenheit or Celsius, maybe we can use a "metric" variable in app settings. Of course, it could be better if we get it from general device settings.

Any idea about that?

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

PASSED: Continuous integration, rev:5
http://91.189.93.125:8080/job/ubuntu-weather-app-ci/4/
Executed test runs:
    SUCCESS: http://91.189.93.125:8080/job/ubuntu-weather-app-ci/./build=pbuilder,distribution=quantal,flavor=amd64/4/console

Click here to trigger a rebuild:
http://91.189.93.125:8080/job/ubuntu-weather-app-ci/4//rebuild/?

review: Approve (continuous-integration)

[Martin Borho (martin-borho)]

> Any idea about that?

Openweathermap.org (and all other weather services) allows to define the metric (F or C) via a request param. So if we store an app setting for the preferred metric, we will get the right values from the api, without further calculations on our side.

=== added directory 'components'
=== added file 'components/CurrentWeather.qml'
--- components/CurrentWeather.qml	1970-01-01 00:00:00 +0000
+++ components/CurrentWeather.qml	2013-03-08 16:12:20 +0000
@@ -0,0 +1,112 @@
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+import "OpenWeatherMap.js" as Weather
+
+Rectangle {
+    id: currentWeather
+
+    // For Status I take the same condition codes from OpenWeatherMap (http://openweathermap.org/wiki/API/Weather_Condition_Codes)
+    property int condition
+    property int currentTemp
+    property int minTemp
+    property int maxTemp
+    property bool metric
+
+    width: units.gu(50)
+    height: units.gu(60)
+
+    Component.onCompleted: {
+        if(currentWeather.metric){
+            tempCurrent.text = tempCurrent.text + ("C");
+            tempMin.text = tempMin.text + ("C");
+            tempMax.text = tempMax.text + ("C");
+        }else{
+            tempCurrent.text = tempCurrent.text + ("F");
+            tempMax.text = tempMax.text + ("F");
+            tempMin.text = tempMin.text + ("F");
+        }
+    }
+
+    Image {
+        id: image1
+        width: units.gu(30)
+        height: units.gu(30)
+        sourceSize.height: units.gu(30)
+        sourceSize.width: units.gu(30)
+        anchors.horizontalCenter: parent.horizontalCenter
+        source: "../resources/images/"+Weather.getConditionIcon(condition)+".jpg"
+        fillMode: Image.PreserveAspectFit
+    }
+
+    Rectangle {
+        id: rectangle1
+        width: units.gu(50)
+        height: units.gu(10)
+        anchors.top: image1.bottom
+        anchors.topMargin: 0
+        color: "#00000000"
+
+        Column {
+            id: column1
+            width: units.gu(5)
+            height: units.gu(5)
+            anchors.rightMargin: 0
+            anchors.verticalCenter: parent.verticalCenter
+            anchors.right: tempCurrent.left
+
+            Label {
+                text: i18n.tr("Max.")
+                anchors.horizontalCenter: parent.horizontalCenter
+                font.pixelSize: FontUtils.sizeToPixels("x-small")
+                horizontalAlignment: Text.AlignHCenter
+            }
+
+            Label {
+                id: tempMax
+                text: maxTemp+"°"
+                anchors.horizontalCenter: parent.horizontalCenter
+                font.pixelSize: FontUtils.sizeToPixels("medium")
+                horizontalAlignment: Text.AlignHCenter
+            }
+        }
+
+        Text {
+            width: units.gu(17)
+            height: units.gu(10)
+            id: tempCurrent
+            text: currentTemp+String("°")
+            style: Text.Normal
+            font.bold: false
+            font.family: "Ubuntu"
+            verticalAlignment: Text.AlignVCenter
+            anchors.horizontalCenter: parent.horizontalCenter
+            anchors.verticalCenter: parent.verticalCenter
+            font.pointSize: 52
+            horizontalAlignment: Text.AlignHCenter
+        }
+
+        Column {
+            id: column2
+            width: units.gu(5)
+            height: units.gu(5)
+            anchors.leftMargin: 0
+            anchors.verticalCenter: parent.verticalCenter
+            anchors.left: tempCurrent.right
+
+            Label {
+                text: i18n.tr("Min.")
+                horizontalAlignment: Text.AlignHCenter
+                anchors.horizontalCenter: parent.horizontalCenter
+                font.pixelSize: FontUtils.sizeToPixels("x-small")
+            }
+
+            Label {
+                id: tempMin
+                text: minTemp+"°"
+                horizontalAlignment: Text.AlignHCenter
+                anchors.horizontalCenter: parent.horizontalCenter
+                font.pixelSize: FontUtils.sizeToPixels("medium")
+            }
+        }
+    }
+}

=== added file 'components/OpenWeatherMap.js'
--- components/OpenWeatherMap.js	1970-01-01 00:00:00 +0000
+++ components/OpenWeatherMap.js	2013-03-08 16:12:20 +0000
@@ -0,0 +1,49 @@
+.pragma library
+
+function getConditionIcon(condition){
+    var map = {
+        "200": "11",
+        "201": "11",
+        "202": "11",
+        "210": "11",
+        "211": "11",
+        "212": "11",
+        "221": "11",
+        "230": "11",
+        "231": "11",
+        "232": "11",
+        "300": "09",
+        "301": "09",
+        "302": "09",
+        "310": "09",
+        "311": "09",
+        "312": "09",
+        "321": "09",
+        "500": "10",
+        "501": "10",
+        "502": "10",
+        "503": "10",
+        "504": "10",
+        "511": "13",
+        "520": "09",
+        "521": "09",
+        "522": "09",
+        "600": "13",
+        "601": "13",
+        "602": "13",
+        "611": "13",
+        "621": "13",
+        "701": "50",
+        "711": "50",
+        "721": "50",
+        "731": "50",
+        "741": "50",
+        "800": "01",
+        "801": "02",
+        "802": "03",
+        "803": "04",
+        "804": "04"
+    }
+
+    return map[condition];
+}

=== added directory 'resources'
=== added directory 'resources/images'
=== added file 'resources/images/02.jpg'
Binary files resources/images/02.jpg	1970-01-01 00:00:00 +0000 and resources/images/02.jpg	2013-03-08 16:12:20 +0000 differ
=== modified file 'weather.qml'
--- weather.qml	2013-02-12 16:27:32 +0000
+++ weather.qml	2013-03-08 16:12:20 +0000
@@ -1,5 +1,6 @@
 import QtQuick 2.0
 import Ubuntu.Components 0.1
+import "components" as Components
 
 /*!
     \brief MainView with Tabs element.
@@ -27,9 +28,14 @@
             // Tab content begins here
             page: Page {
                 Column {
+                    id: column1
                     anchors.centerIn: parent
-                    Label {
-                        text: i18n.tr("Swipe from right to left to change tab.")
+                    Components.CurrentWeather {
+                        condition: 801
+                        currentTemp: 20
+                        minTemp: 12
+                        maxTemp: 25
+                        metric: true
                     }
                 }
             }