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

[Martin Borho]

Moved tab content on page top.

Tried to remove the space between top and page content in LocationTab. Using transparent Rectangle on top to avoid that the tab content is visbile in header background.

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

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

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

review: Approve (continuous-integration)

[Raúl Yeguas (neokore)]

That's a good trick.
To shorten it, maybe we could replace "Rectangle {id: headerSpacer ... }" with a anchors.topMargin: units.gu(9.5) on locationPage, what do you think?

review: Approve

[lp:~martin-borho/ubuntu-weather-app/TabPage-spacer]

75. By Martin Borho on 2013-07-22

replaced spacer Rectangle with a topMargin for Page in Tab

[Martin Borho (martin-borho)]

Even better! Replaced the Rectangle with a topMargin for the Page.

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

PASSED: Continuous integration, rev:75
http://91.189.93.70:8080/job/ubuntu-weather-app-ci/22/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-precise-amd64-ci/14
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-quantal-amd64-ci/21
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-raring-amd64-ci/21
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-saucy-amd64-ci/14

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

review: Approve (continuous-integration)

=== modified file 'components/LocationTab.qml'
--- components/LocationTab.qml	2013-07-22 19:26:39 +0000
+++ components/LocationTab.qml	2013-07-22 21:43:24 +0000
@@ -68,68 +68,56 @@
     page: Page {
         id: locationPage
         isLeaf: true
-        anchors.top: locationTab.top
         anchors.fill: parent
-
-
-        Rectangle {
-            id: listContainer
-
-            anchors.fill: parent
-            // 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
-                        }
-                        CurrentWeather {
-                            currentTemp: temp
-                            minTemp: tempMin
-                            maxTemp: tempMax
-                            icon: condIcon
-                            condition: cond
-                            anchors.top: dateComponent.bottom
-                        }
+        anchors.topMargin: units.gu(9.5)
+
+        ListModel {
+            id: dayForecastModel
+        }
+
+        ListView {
+            id: dailyForecastList
+            width: parent.width
+            height:parent.height
+            model:dayForecastModel
+
+            snapMode: ListView.SnapOneItem
+            verticalLayoutDirection: ListView.TopToBottom
+            flickableDirection: Flickable.VerticalFlick
+
+            clip: true
+
+            delegate: Item {
+                id: dailyForecastItem
+                width:parent.width
+                height: locationPage.height
+
+                Rectangle {
+                    id: listRectangle
+                    width: parent.width
+                    height: dailyForecastList.height
+                    anchors.verticalCenter: parent.verticalCenter
+                    color: "transparent"
+
+                    DateComponent {
+                        id: dateComponent
+                        dateRelative: dateRel
+                        dateString: date
+                        borderTopVisible: false
+                    }
+                    CurrentWeather {
+                        currentTemp: temp
+                        minTemp: tempMin
+                        maxTemp: tempMax
+                        icon: condIcon
+                        condition: cond
+                        anchors.top: dateComponent.bottom
                     }
                 }
             }
         }
 
 
-
-
         tools: ToolbarItems {
             id: pageTools
             ToolbarButton {