Merge lp:~martin-borho/ubuntu-weather-app/DayWeatherComponent into lp:ubuntu-weather-app/obsolete.trunk

[Martin Borho]

added DayWeatherComponent and DateComponent

a) added DayWeatherComponent, DateComponent

b) added a smaller dummy condition icon as png with transparent background

c) added some dummy DayWeatherComponents and DateComponents to first Tab

d) fixed alignment in CurrentWeater to fit other aspect ratios too. (for example when qmlscene window gets resized)

[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/5/
Executed test runs:
    SUCCESS: http://91.189.93.125:8080/job/ubuntu-weather-app-ci/./build=pbuilder,distribution=quantal,flavor=amd64/5/console

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

review: Approve (continuous-integration)

[Raúl Yeguas (neokore)]

Great work, Martin!
Everything seems OK and I like the way you resolved the 'metric' issue, I'll take it to current weather component too.

Cheers!

review: Approve

=== modified file 'components/CurrentWeather.qml'
--- components/CurrentWeather.qml	2013-03-08 16:08:49 +0000
+++ components/CurrentWeather.qml	2013-03-09 15:42:21 +0000
@@ -12,8 +12,9 @@
     property int maxTemp
     property bool metric
 
-    width: units.gu(50)
-    height: units.gu(60)
+    width: parent.width
+    height: childrenRect.height+units.gu(10)
+    anchors.horizontalCenter: parent.horizontalCenter
 
     Component.onCompleted: {
         if(currentWeather.metric){
@@ -42,6 +43,7 @@
         id: rectangle1
         width: units.gu(50)
         height: units.gu(10)
+        anchors.horizontalCenter: parent.horizontalCenter
         anchors.top: image1.bottom
         anchors.topMargin: 0
         color: "#00000000"

=== added file 'components/DateComponent.qml'
--- components/DateComponent.qml	1970-01-01 00:00:00 +0000
+++ components/DateComponent.qml	2013-03-09 15:42:21 +0000
@@ -0,0 +1,51 @@
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+
+Rectangle {
+    width: parent.width
+    height: childrenRect.height
+
+    property bool borderTopVisible: true
+    property string dateRelative: ""
+    property string dateString: ""
+    property string borderColor: "#D6D6D6"
+    property int borderHeight: units.gu(0.1)
+
+    Component.onCompleted: {
+        var dateText = ""
+        if(dateRelative !== "") {
+            dateText += dateRelative+", ";
+        }
+        dateText += dateString
+        dayText.text = dateText
+    }
+
+    Rectangle {
+        id: topBorder
+        visible: borderTopVisible
+        width:parent.width
+        height: borderHeight
+        color: borderColor
+    }
+
+    Item {
+        id: dayLabel
+        width:parent.width-units.gu(3)
+        height: units.gu(4)
+        anchors.top: topBorder.bottom
+        anchors.horizontalCenter: parent.horizontalCenter
+
+        Label {
+            id: dayText
+            height: parent.height
+            verticalAlignment: Text.AlignVCenter
+        }
+    }
+
+    Rectangle {
+        width:parent.width
+        height: borderHeight
+        anchors.top: dayLabel.bottom
+        color: borderColor
+    }
+}

=== added file 'components/DayWeatherComponent.qml'
--- components/DayWeatherComponent.qml	1970-01-01 00:00:00 +0000
+++ components/DayWeatherComponent.qml	2013-03-09 15:42:21 +0000
@@ -0,0 +1,56 @@
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+import "OpenWeatherMap.js" as Weather
+
+Rectangle {
+    id: dayWeatherComponent
+    width: parent.width-units.gu(2)
+    anchors.horizontalCenter: parent.horizontalCenter
+    height:contentShape.height+units.gu(2)
+
+    property int condition
+    property int temperature
+    property int temperatureMin
+    property bool metric: true
+    property string scale: (metric) ? "C" : "F"
+    property string shapeColor: "#D6D6D6"
+
+    onConditionChanged: {
+        currentIcon.source = "../resources/images/"+Weather.getConditionIcon(condition)+"-day.png"
+    }
+
+     UbuntuShape{
+        id: contentShape
+        radius: "small"
+        width: parent.width
+        color: shapeColor
+        anchors.centerIn: parent
+        height:childrenRect.height
+        Row {
+            width:parent.width
+            Image {
+                id: currentIcon
+                height: units.gu(10)
+                fillMode: Image.PreserveAspectFit
+            }
+            Label {
+                id: currentTemp
+                horizontalAlignment: Text.AlignHCenter
+                verticalAlignment: Text.AlignVCenter
+                width:parent.width/9*3
+                height:parent.height
+                ItemStyle.class: "title"
+                text: dayWeatherComponent.temperature+"°"+dayWeatherComponent.scale
+            }
+            Label {
+                id: minTemp
+                horizontalAlignment: Text.AlignHCenter
+                verticalAlignment: Text.AlignVCenter
+                width:parent.width/9*3
+                height: parent.height
+                text: i18n.tr("Min.")+"\n"+dayWeatherComponent.temperatureMin+"°"+dayWeatherComponent.scale
+            }
+        }
+    }
+}
+

=== added file 'resources/images/02-day.png'
Binary files resources/images/02-day.png	1970-01-01 00:00:00 +0000 and resources/images/02-day.png	2013-03-09 15:42:21 +0000 differ
=== modified file 'weather.qml'
--- weather.qml	2013-03-08 16:08:49 +0000
+++ weather.qml	2013-03-09 15:42:21 +0000
@@ -27,15 +27,55 @@
             
             // Tab content begins here
             page: Page {
-                Column {
-                    id: column1
-                    anchors.centerIn: parent
-                    Components.CurrentWeather {
-                        condition: 801
-                        currentTemp: 20
-                        minTemp: 12
-                        maxTemp: 25
-                        metric: true
+                Rectangle {
+                    id: startPage
+                    width: parent.width
+                    height: parent.height
+                    Flickable {
+                        width: parent.width
+                        height: parent.height
+                        contentHeight: column1.height
+                        Column {
+                            id: column1
+                            width: parent.width
+                            Components.DateComponent {
+                                dateRelative: "Today"
+                                dateString:"Saturday, 9th February"
+                                borderTopVisible: false
+                            }
+                            Components.CurrentWeather {
+                                condition: 801
+                                currentTemp: 20
+                                minTemp: 12
+                                maxTemp: 25
+                                metric: true
+                            }
+                            Components.DateComponent {
+                                dateRelative: "Tomorrow"
+                                dateString:"Sunday, 10th February"
+                            }
+                            Components.DayWeatherComponent {
+                                temperature: 22
+                                temperatureMin: 11
+                                condition: 801
+                            }
+                            Components.DateComponent {
+                                dateString:"Monday, 11th February"
+                            }
+                            Components.DayWeatherComponent {
+                                temperature: 22
+                                temperatureMin: 11
+                                condition: 801
+                            }
+                            Components.DateComponent {
+                                dateString:"Tuesday, 12th February"
+                            }
+                            Components.DayWeatherComponent {
+                                temperature: 22
+                                temperatureMin: 11
+                                condition: 801
+                            }
+                        }
                     }
                 }
             }