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

[Raúl Yeguas]

Solved bug 1187801: Daily weather should snap in view.
Daily weather is changed to a list where each element is like the current weather element and snaps for each day when scrolling.

Solved bug 1187801: Daily weather should snap in view.
Daily weather is changed to a list where each element is like the current weather element and snaps for each day when scrolling.

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

PASSED: Continuous integration, rev:73
http://91.189.93.70:8080/job/ubuntu-weather-app-ci/20/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-precise-amd64-ci/12
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-quantal-amd64-ci/19
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-raring-amd64-ci/19
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-saucy-amd64-ci/12

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-weather-app-ci/20/rebuild

review: Approve (continuous-integration)

[Martin Borho (martin-borho)]

Great, well done!

review: Approve

=== modified file 'components/LocationTab.qml'
--- components/LocationTab.qml	2013-07-20 16:52:37 +0000
+++ components/LocationTab.qml	2013-07-22 19:29:40 +0000
@@ -23,6 +23,9 @@
 Tab {
     id: locationTab
     objectName: "LocationTab"
+
+    anchors.fill: parent
+
     property int locationIndex: 0
     property var locationData: {}
 
@@ -47,25 +50,14 @@
         // set location data as property
         locationData = locData;
 
-        // set today date
-        todayDateComponent.dateString = formatTimestamp(currentData.timestamp, 'dddd, dd MMMM yyyy')+" - "
-                                            + formatTimestampToTime(currentData.timestamp, 'HH:mm');
-        todayDateComponent.renderText()
-
-        // set current Condition
-        currentCondition.condition = currentData.condition.id;
-        currentCondition.icon = currentData.condition.icon;
-        currentCondition.currentTemp =  currentData[units].temp;
-        currentCondition.minTemp = todayForeCast[units].min;
-        currentCondition.maxTemp = todayForeCast[units].max;
-
         // set daily forecasts
-        for(var x=1;x<dailyLength;x++) {
+        for(var x=0;x<dailyLength;x++) {
             dayForecastModel.append({
                 dateRel: "",//Tomorrow",
                 date: formatTimestamp(dailyForecasts[x].timestamp, 'dddd, dd MMMM yyyy'),
                 temp: dailyForecasts[x][units].max,
                 tempMin: dailyForecasts[x][units].min,
+                tempMax: dailyForecasts[x][units].max,
                 cond: dailyForecasts[x].condition.id,
                 condIcon: dailyForecasts[x].condition.icon
             });
@@ -75,52 +67,60 @@
     // Menu for options
     page: Page {
         id: locationPage
+        isLeaf: true
+        anchors.top: locationTab.top
         anchors.fill: parent
 
-        ListModel {
-            id: dayForecastModel
-        }
-
-        Flickable {
-            id: flickable
+
+        Rectangle {
+            id: listContainer
+
             anchors.fill: parent
-            contentHeight: flickContent.height;
-            Rectangle {
-                id: flickContent
-                width:parent.width
-                height: childrenRect.height
-                color: "transparent"
-                DateComponent {
-                    id: todayDateComponent
-                    //dateRelative: i18n.tr("Today")
-                    borderTopVisible: false
-                }
-                CurrentWeather {
-                    id: currentCondition
-                    anchors.top: todayDateComponent.bottom
-                }
-                ListView {
-                    id: dailyForecastList
-                    width: parent.width;
-                    height:childrenRect.height
-                    anchors.top: currentCondition.bottom
-                    model:dayForecastModel
-                    interactive: false
-                    delegate: Item {
-                        id: dailyForecastItem
-                        width:parent.width
+            // TODO: Fix that hardcoded value
+            anchors.topMargin: units.gu(9.5)
+            color: "transparent"
+
+            ListModel {
+                id: dayForecastModel
+            }
+
+            ListView {
+                id: dailyForecastList
+                anchors.fill: parent
+                anchors.top: parent.top
+
+                model:dayForecastModel
+
+                snapMode: ListView.SnapOneItem
+                verticalLayoutDirection: ListView.TopToBottom
+                flickableDirection: Flickable.VerticalFlick
+
+                clip: true
+
+                delegate: Item {
+                    id: dailyForecastItem
+                    width:parent.width
+                    height: listContainer.height
+
+                    Rectangle {
+                        width: parent.width
                         height: childrenRect.height
+                        anchors.verticalCenter: parent.verticalCenter
+                        color: "transparent"
+
                         DateComponent {
                             id: dateComponent
                             dateRelative: dateRel
                             dateString: date
+                            borderTopVisible: false
                         }
-                        DayWeatherComponent {
+                        CurrentWeather {
+                            currentTemp: temp
+                            minTemp: tempMin
+                            maxTemp: tempMax
+                            icon: condIcon
+                            condition: cond
                             anchors.top: dateComponent.bottom
-                            temperature: temp
-                            temperatureMin: tempMin
-                            condition: cond
-                            icon: condIcon
                         }
                     }
                 }
@@ -128,6 +128,8 @@
         }
 
 
+
+
         tools: ToolbarItems {
             id: pageTools
             ToolbarButton {