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

Proposed by Victor Thompson on 2015-08-30
Status: Merged
Approved by: Andrew Hayzen on 2015-09-10
Approved revision: 113
Merged at revision: 119
Proposed branch: lp:~vthompson/ubuntu-weather-app/fix-1490044-locationspage-flickable
Merge into: lp:ubuntu-weather-app
Diff against target: 33 lines (+3/-2)
2 files modified
app/ui/LocationsPage.qml (+2/-2)
debian/changelog (+1/-0)
To merge this branch: bzr merge lp:~vthompson/ubuntu-weather-app/fix-1490044-locationspage-flickable
Reviewer Review Type Date Requested Status
Andrew Hayzen 2015-08-30 Approve on 2015-09-10
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve on 2015-09-05
Review via email: mp+269585@code.launchpad.net

Commit message

* Allow the LocationsPage to be flickable.

Description of the change

* Allow the LocationsPage to be flickable.

To post a comment you must log in.
Andrew Hayzen (ahayzen) wrote :

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

review: Needs Information
112. By Victor Thompson on 2015-09-05

Use header height

Victor Thompson (vthompson) wrote :

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.

113. By Victor Thompson on 2015-09-05

Merge and resolve conflict

Andrew Hayzen (ahayzen) wrote :

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'app/ui/LocationsPage.qml'
2--- app/ui/LocationsPage.qml 2015-08-19 22:44:54 +0000
3+++ app/ui/LocationsPage.qml 2015-09-05 22:55:00 +0000
4@@ -26,8 +26,6 @@
5 Page {
6 id: locationsPage
7 objectName: "locationsPage"
8- // Set to null otherwise the first delegate appears +header.height down the page
9- flickable: null
10 title: i18n.tr("Locations")
11
12 state: locationsListView.state === "multiselectable" ? "selection" : "default"
13@@ -64,6 +62,8 @@
14 id: locationsListView
15 anchors {
16 fill: parent
17+ // TODO: Fix this offset
18+ topMargin: -locationsPage.header.height
19 }
20 model: ListModel {
21 id: locationsModel
22
23=== modified file 'debian/changelog'
24--- debian/changelog 2015-09-04 23:04:30 +0000
25+++ debian/changelog 2015-09-05 22:55:00 +0000
26@@ -24,6 +24,7 @@
27 * Lock app in portrait mode
28 * Get the condition text to be translated from the OWM API. (LP: #1487793)
29 * Add a Network Error State Component for when a connection error takes place.
30+ * Allow the LocationsPage to be flickable. (LP: #1490044)
31
32 [ Andrew Hayzen ]
33 * Add mocked locations for autopilot and add a test using the data

Subscribers

People subscribed via source and target branches

to all changes: