Merge lp:~vthompson/ubuntu-weather-app/fix-1490044-locationspage-flickable into lp:ubuntu-weather-app

[Victor Thompson]

* Allow the LocationsPage to be flickable.

* Allow the LocationsPage to be flickable.

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

PASSED: Continuous integration, rev:111
http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-ci/237/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-utopic-amd64-ci/207
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-vivid-amd64-ci/237

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

review: Approve (continuous-integration)

[Andrew Hayzen (ahayzen)]

One inline comment, otherwise it fixes the issue of the content appearing in the bg of the header

review: Needs Information

[lp:~vthompson/ubuntu-weather-app/fix-1490044-locationspage-flickable]

112. By Victor Thompson on 2015-09-05

Use header height

[Victor Thompson (vthompson)]

The behavior seems a bit different on a 15.10 desktop vs the device. On 15.10 the offset doesn't appear to be needed. I think we'll eventually need to remove this offset when whatever on wily fixes this lands in vivid.

[lp:~vthompson/ubuntu-weather-app/fix-1490044-locationspage-flickable]

113. By Victor Thompson on 2015-09-05

Merge and resolve conflict

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

PASSED: Continuous integration, rev:113
http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-ci/244/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-utopic-amd64-ci/214
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-vivid-amd64-ci/244

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

review: Approve (continuous-integration)

[Andrew Hayzen (ahayzen)]

LGTM on vivid desktop. I investigated before trying to fix it so that the header is shown/hidden when scrolling, but that broke other things, this should be investigated at a later stage.

review: Approve

=== modified file 'app/ui/LocationsPage.qml'
--- app/ui/LocationsPage.qml	2015-08-19 22:44:54 +0000
+++ app/ui/LocationsPage.qml	2015-09-05 22:55:00 +0000
@@ -26,8 +26,6 @@
 Page {
     id: locationsPage
     objectName: "locationsPage"
-    // Set to null otherwise the first delegate appears +header.height down the page
-    flickable: null
     title: i18n.tr("Locations")
 
     state: locationsListView.state === "multiselectable" ? "selection" : "default"
@@ -64,6 +62,8 @@
         id: locationsListView
         anchors {
             fill: parent
+            // TODO: Fix this offset
+            topMargin: -locationsPage.header.height
         }
         model: ListModel {
             id: locationsModel

=== modified file 'debian/changelog'
--- debian/changelog	2015-09-04 23:04:30 +0000
+++ debian/changelog	2015-09-05 22:55:00 +0000
@@ -24,6 +24,7 @@
   * Lock app in portrait mode
   * Get the condition text to be translated from the OWM API. (LP: #1487793)
   * Add a Network Error State Component for when a connection error takes place.
+  * Allow the LocationsPage to be flickable. (LP: #1490044)
 
   [ Andrew Hayzen ]
   * Add mocked locations for autopilot and add a test using the data