Merge lp:~ahayzen/ubuntu-weather-app/reboot-uc1.3-bump into lp:ubuntu-weather-app

Proposed by Andrew Hayzen on 2015-11-02
Status: Merged
Approved by: Victor Thompson on 2015-11-26
Approved revision: 166
Merged at revision: 180
Proposed branch: lp:~ahayzen/ubuntu-weather-app/reboot-uc1.3-bump
Merge into: lp:ubuntu-weather-app
Diff against target: 776 lines (+93/-67)
42 files modified
app/components/CurrentLocation.qml (+1/-1)
app/components/DayDelegate.qml (+1/-1)
app/components/DayDelegateExtraInfo.qml (+1/-1)
app/components/ExpandableListItem.qml (+1/-1)
app/components/FakeHeader.qml (+4/-4)
app/components/FastScroll.qml (+1/-1)
app/components/ForecastDetailsDelegate.qml (+1/-1)
app/components/HeaderRow.qml (+1/-1)
app/components/HomeGraphic.qml (+1/-1)
app/components/HomeHourly.qml (+1/-1)
app/components/HomePageEmptyStateComponent.qml (+1/-1)
app/components/HomeTempInfo.qml (+1/-1)
app/components/ListItemActions/CheckBox.qml (+1/-1)
app/components/ListItemActions/Remove.qml (+1/-1)
app/components/ListItemReorderComponent.qml (+1/-1)
app/components/ListItemWithActions.qml (+1/-1)
app/components/LoadingIndicator.qml (+1/-1)
app/components/LocationsPageEmptyStateComponent.qml (+1/-1)
app/components/MultiSelectHeadState.qml (+1/-1)
app/components/MultiSelectListView.qml (+1/-1)
app/components/NetworkErrorStateComponent.qml (+1/-1)
app/components/NoAPIKeyErrorStateComponent.qml (+1/-1)
app/components/PageWithBottomEdge.qml (+21/-10)
app/components/SettingsButton.qml (+1/-1)
app/components/StandardListItem.qml (+1/-1)
app/components/WeatherListItem.qml (+1/-1)
app/components/WeatherListView.qml (+1/-1)
app/ubuntu-weather-app.qml (+1/-1)
app/ui/AddLocationPage.qml (+8/-6)
app/ui/HomePage.qml (+7/-1)
app/ui/LocationPane.qml (+1/-1)
app/ui/LocationsPage.qml (+2/-2)
app/ui/SettingsPage.qml (+1/-1)
app/ui/settings/DataProviderPage.qml (+1/-1)
app/ui/settings/LocationPage.qml (+1/-1)
app/ui/settings/RefreshIntervalPage.qml (+1/-1)
app/ui/settings/UnitsPage.qml (+1/-1)
debian/changelog (+1/-0)
manifest.json.in (+1/-1)
po/com.ubuntu.weather.pot (+6/-6)
tests/autopilot/ubuntu_weather_app/__init__.py (+10/-5)
ubuntu-weather-app.desktop.in.in (+1/-0)
To merge this branch: bzr merge lp:~ahayzen/ubuntu-weather-app/reboot-uc1.3-bump
Reviewer Review Type Date Requested Status
Victor Thompson Approve on 2015-11-26
Jenkins Bot continuous-integration Approve on 2015-11-26
Bartosz Kosiorek (community) 2015-11-06 Approve on 2015-11-11
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve on 2015-11-03
Andrew Hayzen Abstain on 2015-11-03
Review via email: mp+276466@code.launchpad.net

Commit message

* Update app to use the Ubuntu Components version 1.3

Description of the change

* Update app to use the Ubuntu Components version 1.3

I think I've managed to tweak the FakeHeader and PageWithBottomEdge to match the new header height and styling requirements :-)

Please test AP locally as well.

To post a comment you must log in.
review: Needs Fixing (continuous-integration)
review: Needs Fixing (continuous-integration)
155. By Andrew Hayzen on 2015-11-02

* Merge of trunk

156. By Andrew Hayzen on 2015-11-02

* Update changelog

review: Approve (continuous-integration)
review: Approve (continuous-integration)
review: Approve (continuous-integration)
Andrew Hayzen (ahayzen) wrote :

AP tests failing alot due to bottomEdge .isReady being incorrect and other issues.

review: Needs Fixing
157. By Andrew Hayzen on 2015-11-03

* Tweaks to bottomEdge for autopilot

Andrew Hayzen (ahayzen) wrote :

This is now passing autopilot :-)

autopilot PASS

review: Abstain
review: Approve (continuous-integration)
review: Approve (continuous-integration)
review: Approve (continuous-integration)
Victor Thompson (vthompson) wrote :

IMO the startup animation where the header hides and the animation of the header when swiping from the bottom edge are a bit annoying.

It would at least seem like the animation of closing the fake header has the wrong height (height of the old header) initially.

Other than that this seems mostly fine, as I can't find any actual regressions.

review: Needs Information
Bartosz Kosiorek (gang65) wrote :

I would like to test weather app, but unfortunately I have an errors:

qml: Sent request URL: http://api.openweathermap.org/data/2.5/forecast/daily?cnt=10&units=metric&lat=51.74507&lon=19.50717&lang=pl
qml: retry of http://api.openweathermap.org/data/2.5/forecast?units=metric&lat=51.74507&lon=19.50717&lang=pl
qml: Sent request URL: http://api.openweathermap.org/data/2.5/forecast?units=metric&lat=51.74507&lon=19.50717&lang=pl
qml: {"msg":"wrong response http code, got 401","request":{"type":"current","url":"http://api.openweathermap.org/data/2.5/weather?units=metric&lat=51.74507&lon=19.50717&lang=pl&APPID="}}
qml: wrong response http code, got 401 / http://api.openweathermap.org/data/2.5/weather?units=metric&lat=51.74507&lon=19.50717&lang=pl&APPID=
qml: {"msg":"wrong response http code, got 401","request":{"type":"daily","url":"http://api.openweathermap.org/data/2.5/forecast/daily?cnt=10&units=metric&lat=51.74507&lon=19.50717&lang=pl&APPID="}}

According to documentation:
http://openweathermap.org/faq#error401

Starting from 9 October 2015 our API requires a valid APPID for access. Note that this does not mean that our API is subscription-only now - please take a minute to register a free account to receive a key.

We are sorry for inconvenience but this is a necessary measure that will help us deliver our services to you faster and more reliably.

For FOSS developers: we welcome free and open source software and are willing to help you. If you want to use OWM data in your free software application please register an API key and file a ticket describing your application and API key registered. OWM will review your request lift access limits for your key if used in open source application.

@Victor Do you know how to resolve this issue?

review: Needs Information
Andrew Hayzen (ahayzen) wrote :

@Bartosz, we now have a MP [0] which adds instructions of how to add an OWM key :-)

0 - https://code.launchpad.net/~popey/ubuntu-weather-app/update-readme-owm-key/+merge/276974

Bartosz Kosiorek (gang65) wrote :
Download full text (3.7 KiB)

Thanks Andrew.

I made some testing of this branch and here is what I found:
1. Missing title for Desktop. With new SDK, the title is working correctly if you hide header
    title: i18n.tr("Weather")

2. There are obsolete warning:
file:///home/kosiorek/dev/core/reboot-uc1.3-bump/app/components/PageWithBottomEdge.qml:149:5: QML UbuntuShape: 'color' is deprecated. Use 'backgroundColor', 'secondaryBackgroundColor' and 'backgroundMode' instead.

3. There are undefined types errors in Location Pane:
file:///home/kosiorek/dev/core/reboot-uc1.3-bump/app/ui/LocationPane.qml:182: TypeError: Cannot read property '0' of undefined
file:///home/kosiorek/dev/core/reboot-uc1.3-bump/app/ui/LocationPane.qml:182: TypeError: Cannot read property '0' of undefined
file:///home/kosiorek/dev/core/reboot-uc1.3-bump/app/ui/LocationPane.qml:182: TypeError: Cannot read property '0' of undefined
file:///home/kosiorek/dev/core/reboot-uc1.3-bump/app/ui/LocationPane.qml:182: TypeError: Cannot read property '0' of undefined

4. There are undefined types errors in HomeTempInfo.qml:
file:///home/kosiorek/dev/core/reboot-uc1.3-bump/app/components/HomeTempInfo.qml:111: TypeError: Cannot read property 'condition' of undefined
file:///home/kosiorek/dev/core/reboot-uc1.3-bump/app/components/HomeTempInfo.qml:131: TypeError: Cannot read property 'low' of undefined
file:///home/kosiorek/dev/core/reboot-uc1.3-bump/app/components/HomeTempInfo.qml:138: TypeError: Cannot read property 'high' of undefined
file:///home/kosiorek/dev/core/reboot-uc1.3-bump/app/components/HomeTempInfo.qml:111: TypeError: Cannot read property 'condition' of undefined
file:///home/kosiorek/dev/core/reboot-uc1.3-bump/app/components/HomeTempInfo.qml:131: TypeError: Cannot read property 'low' of undefined
file:///home/kosiorek/dev/core/reboot-uc1.3-bump/app/components/HomeTempInfo.qml:138: TypeError: Cannot read property 'high' of undefined
file:///home/kosiorek/dev/core/reboot-uc1.3-bump/app/components/HomeTempInfo.qml:111: TypeError: Cannot read property 'condition' of undefined
file:///home/kosiorek/dev/core/reboot-uc1.3-bump/app/components/HomeTempInfo.qml:131: TypeError: Cannot read property 'low' of undefined
file:///home/kosiorek/dev/core/reboot-uc1.3-bump/app/components/HomeTempInfo.qml:138: TypeError: Cannot read property 'high' of undefined
file:///home/kosiorek/dev/core/reboot-uc1.3-bump/app/components/HomeTempInfo.qml:111: TypeError: Cannot read property 'condition' of undefined
file:///home/kosiorek/dev/core/reboot-uc1.3-bump/app/components/HomeTempInfo.qml:131: TypeError: Cannot read property 'low' of undefined
file:///home/kosiorek/dev/core/reboot-uc1.3-bump/app/components/HomeTempInfo.qml:138: TypeError: Cannot read property 'high' of undefined
file:///home/kosiorek/dev/core/reboot-uc1.3-bump/app/components/HomeTempInfo.qml:111: TypeError: Cannot read property 'condition' of undefined
file:///home/kosiorek/dev/core/reboot-uc1.3-bump/app/components/HomeTempInfo.qml:131: TypeError: Cannot read property 'low' of undefined
file:///home/kosiorek/dev/core/reboot-uc1.3-bump/app/components/HomeTempInfo.qml:138: TypeError: Cannot read property 'high' of undefined
file:///home/kosiorek/dev/core/reboot-uc1...

Read more...

review: Needs Fixing
Bartosz Kosiorek (gang65) wrote :

There are also following deprecate warnings:
file:///usr/lib/x86_64-linux-gnu/qt5/qml/Ubuntu/Components/ListItems/1.2/IconVisual.qml:52:5: QML UbuntuShape: 'image' is deprecated. Use 'source' instead.
file:///usr/lib/x86_64-linux-gnu/qt5/qml/Ubuntu/Components/ListItems/1.2/IconVisual.qml:52:5: QML UbuntuShape: 'stretched' is deprecated. Use 'sourceFillMode' instead
file:///usr/lib/x86_64-linux-gnu/qt5/qml/Ubuntu/Components/ListItems/1.2/IconVisual.qml:52:5: QML UbuntuShape: 'horizontalAlignment' is deprecated. Use 'sourceHorizontalAlignment' instead
file:///usr/lib/x86_64-linux-gnu/qt5/qml/Ubuntu/Components/ListItems/1.2/IconVisual.qml:52:5: QML UbuntuShape: 'horizontalAlignment' is deprecated. Use 'sourceVerticalAlignment' instead

review: Needs Fixing
158. By Andrew Hayzen on 2015-11-11

* Fix deprecate warnings and title for desktop

159. By Andrew Hayzen on 2015-11-11

* Merge of trunk

Andrew Hayzen (ahayzen) wrote :

1) Added title to the HomePage.qml
2) Fixed the bottomEdge issues
3) Not been able to reproduce this one yet, could you provide exact steps
4) Same as 3)
5) These look like issues due to the old listitems (note /Ubuntu/Components/ListItems/1.2/ not 1.3) still being used in the settings pages and will be fixed once [1] is done in the follow up branch after this one.

Meanwhile there appear to be offset issues in the LocationPage when switching on/off the auto detect location, which I believe partially existed before. I have minimised the issues when actually on the LocationPage, but it looks like I need to force the bottomEdge hint to reload when the location detection is toggled. As the offset is incorrect after switching until the app is restarted. I'll investigate this :-)

1 - https://code.launchpad.net/~ubuntu-weather-dev/ubuntu-weather-app/reboot-finish-listitem-migration/+merge/266981

review: Approve (continuous-integration)
Bartosz Kosiorek (gang65) wrote :

See my inline comments.

Also after clicking on city (from city list), I have following error:
file:///usr/lib/x86_64-linux-gnu/qt5/qml/Ubuntu/Components/1.3/PageWrapperUtils.js:90: TypeError: Cannot read property 'createObject' of null

review: Needs Fixing
Bartosz Kosiorek (gang65) wrote :

@Andrew @Victor
Could you please also take a look at:
https://code.launchpad.net/~gang65/ubuntu-clock-app/ubuntu-clock-app-uitk1.3

:-)
Thanks

review: Needs Fixing
Andrew Hayzen (ahayzen) wrote :

@Bartosz, as the PageWithBottomEdge is an 'upstream' component to us, any modifications we make to the code we try to add a // CUSTOM comment next to them, and any code we remove we try to comment out rather than remove. This is to ease upgrading and help merge conflicts when changes are made upstream, so in this case we would comment out that block and add // CUSTOM as the block is upstream here [2].

Also IIRC the PageWrapperUtils.js:90: TypeError: Cannot read property 'createObject' of null is coming from somewhere in the SDK, we get the same in the music-app and can probably be safely ignored for now unless we can find the specific line causing it.

2 - http://bazaar.launchpad.net/~phablet-team/address-book-app/trunk/view/head:/src/imports/Ubuntu/Contacts/PageWithBottomEdge.qml#L392

Bartosz Kosiorek (gang65) wrote :

It looks perfectly for me. Thanks

review: Approve
Victor Thompson (vthompson) wrote :

Please also bump the new NoAPIKeyErrorStateComponent to 1.3

I still see all the same odd header behaviors.

I'm not sure I agree with using "Weather" as the title. The title on the desktop did not change with this MP, so fixing it here doesn't seem necessary. I don't think the user should see "Weather" as the header is hidden/shown.

I think you need to rebuild the pot file? It seems your mp is removing some stuff.

review: Needs Fixing
160. By Andrew Hayzen on 2015-11-12

* Bump merged component

review: Approve (continuous-integration)
161. By Andrew Hayzen on 2015-11-12

* Update .pot file

review: Approve (continuous-integration)
162. By Andrew Hayzen on 2015-11-26

* Show header in splash to minimise slide up effect

review: Approve (continuous-integration)
163. By Andrew Hayzen on 2015-11-26

* Remove Weather from title for now due to incorrect header animation

review: Approve (continuous-integration)
164. By Andrew Hayzen on 2015-11-26

* Reduce bounce animation of content when pushing a page

review: Approve (continuous-integration)
165. By Andrew Hayzen on 2015-11-26

* Fix the bottom edge hint topMargin being incorrect on the second pull

review: Approve (continuous-integration)
166. By Andrew Hayzen on 2015-11-26

* Add extra code commentary

review: Approve (continuous-integration)
Victor Thompson (vthompson) wrote :

Thanks for the extra fixes and code commentary. I think we still should work on resolving the issues with the FakeHeader, but for now this is great... as our header/BottomEdge transition wasn't consistent with all other apps previously, so I don't mind it being somewhat "different" for the time being.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'app/components/CurrentLocation.qml'
2--- app/components/CurrentLocation.qml 2015-07-27 00:57:57 +0000
3+++ app/components/CurrentLocation.qml 2015-11-26 02:38:41 +0000
4@@ -19,7 +19,7 @@
5 import QtLocation 5.3
6 import QtPositioning 5.2
7 import QtQuick 2.4
8-import Ubuntu.Components 1.2
9+import Ubuntu.Components 1.3
10 import "../data/WeatherApi.js" as WeatherApi
11
12
13
14=== modified file 'app/components/DayDelegate.qml'
15--- app/components/DayDelegate.qml 2015-10-16 00:12:57 +0000
16+++ app/components/DayDelegate.qml 2015-11-26 02:38:41 +0000
17@@ -17,7 +17,7 @@
18 */
19
20 import QtQuick 2.4
21-import Ubuntu.Components 1.2
22+import Ubuntu.Components 1.3
23
24 ListItem {
25 id: dayDelegate
26
27=== modified file 'app/components/DayDelegateExtraInfo.qml'
28--- app/components/DayDelegateExtraInfo.qml 2015-09-29 15:21:55 +0000
29+++ app/components/DayDelegateExtraInfo.qml 2015-11-26 02:38:41 +0000
30@@ -17,7 +17,7 @@
31 */
32
33 import QtQuick 2.4
34-import Ubuntu.Components 1.2
35+import Ubuntu.Components 1.3
36
37
38 Column {
39
40=== modified file 'app/components/ExpandableListItem.qml'
41--- app/components/ExpandableListItem.qml 2015-06-18 01:42:03 +0000
42+++ app/components/ExpandableListItem.qml 2015-11-26 02:38:41 +0000
43@@ -17,7 +17,7 @@
44 */
45
46 import QtQuick 2.4
47-import Ubuntu.Components 1.2
48+import Ubuntu.Components 1.3
49 import Ubuntu.Components.ListItems 1.0 as ListItem
50
51 /*
52
53=== modified file 'app/components/FakeHeader.qml'
54--- app/components/FakeHeader.qml 2015-10-18 15:48:28 +0000
55+++ app/components/FakeHeader.qml 2015-11-26 02:38:41 +0000
56@@ -17,22 +17,22 @@
57 */
58
59 import QtQuick 2.4
60-import Ubuntu.Components 1.2
61+import Ubuntu.Components 1.3
62
63 Column {
64 id: fakeHeader
65
66- height: units.gu(9)
67+ height: units.gu(6.125)
68
69 Rectangle {
70- height: units.gu(7)
71+ height: units.gu(6)
72 width: parent.width
73 color: Theme.palette.normal.background
74 }
75
76 Rectangle {
77 color: "#C9C9C9"
78- height: units.gu(2)
79+ height: units.gu(0.125)
80 anchors.left: parent.left
81 anchors.right: parent.right
82 }
83
84=== modified file 'app/components/FastScroll.qml'
85--- app/components/FastScroll.qml 2015-06-18 01:42:03 +0000
86+++ app/components/FastScroll.qml 2015-11-26 02:38:41 +0000
87@@ -41,7 +41,7 @@
88
89 // FastScroll.qml
90 import QtQuick 2.4
91-import Ubuntu.Components 1.2
92+import Ubuntu.Components 1.3
93 import "FastScroll.js" as Sections
94
95 Item {
96
97=== modified file 'app/components/ForecastDetailsDelegate.qml'
98--- app/components/ForecastDetailsDelegate.qml 2015-10-09 18:35:21 +0000
99+++ app/components/ForecastDetailsDelegate.qml 2015-11-26 02:38:41 +0000
100@@ -17,7 +17,7 @@
101 */
102
103 import QtQuick 2.4
104-import Ubuntu.Components 1.2
105+import Ubuntu.Components 1.3
106
107 Row {
108 height: icon.height
109
110=== modified file 'app/components/HeaderRow.qml'
111--- app/components/HeaderRow.qml 2015-07-27 21:41:09 +0000
112+++ app/components/HeaderRow.qml 2015-11-26 02:38:41 +0000
113@@ -18,7 +18,7 @@
114
115 import QtQuick 2.4
116 import QtQuick.Layouts 1.1
117-import Ubuntu.Components 1.2
118+import Ubuntu.Components 1.3
119
120 RowLayout {
121 id: headerRow
122
123=== modified file 'app/components/HomeGraphic.qml'
124--- app/components/HomeGraphic.qml 2015-06-18 01:42:03 +0000
125+++ app/components/HomeGraphic.qml 2015-11-26 02:38:41 +0000
126@@ -17,7 +17,7 @@
127 */
128
129 import QtQuick 2.4
130-import Ubuntu.Components 1.2
131+import Ubuntu.Components 1.3
132
133 Item {
134 height: units.gu(32)
135
136=== modified file 'app/components/HomeHourly.qml'
137--- app/components/HomeHourly.qml 2015-08-20 19:47:45 +0000
138+++ app/components/HomeHourly.qml 2015-11-26 02:38:41 +0000
139@@ -17,7 +17,7 @@
140 */
141
142 import QtQuick 2.4
143-import Ubuntu.Components 1.2
144+import Ubuntu.Components 1.3
145
146 ListView {
147 id: homeHourly
148
149=== modified file 'app/components/HomePageEmptyStateComponent.qml'
150--- app/components/HomePageEmptyStateComponent.qml 2015-07-30 04:10:44 +0000
151+++ app/components/HomePageEmptyStateComponent.qml 2015-11-26 02:38:41 +0000
152@@ -17,7 +17,7 @@
153 */
154
155 import QtQuick 2.4
156-import Ubuntu.Components 1.2
157+import Ubuntu.Components 1.3
158 import "../components"
159
160
161
162=== modified file 'app/components/HomeTempInfo.qml'
163--- app/components/HomeTempInfo.qml 2015-10-16 00:14:28 +0000
164+++ app/components/HomeTempInfo.qml 2015-11-26 02:38:41 +0000
165@@ -17,7 +17,7 @@
166 */
167
168 import QtQuick 2.4
169-import Ubuntu.Components 1.2
170+import Ubuntu.Components 1.3
171
172 Item {
173 id: homeTempInfoItem
174
175=== modified file 'app/components/ListItemActions/CheckBox.qml'
176--- app/components/ListItemActions/CheckBox.qml 2015-06-18 01:45:57 +0000
177+++ app/components/ListItemActions/CheckBox.qml 2015-11-26 02:38:41 +0000
178@@ -15,7 +15,7 @@
179 */
180
181 import QtQuick 2.4
182-import Ubuntu.Components 1.2
183+import Ubuntu.Components 1.3
184
185 CheckBox {
186 checked: root.selected
187
188=== modified file 'app/components/ListItemActions/Remove.qml'
189--- app/components/ListItemActions/Remove.qml 2015-06-18 01:42:03 +0000
190+++ app/components/ListItemActions/Remove.qml 2015-11-26 02:38:41 +0000
191@@ -17,7 +17,7 @@
192 */
193
194 import QtQuick 2.4
195-import Ubuntu.Components 1.2
196+import Ubuntu.Components 1.3
197
198 Action {
199 id: removeAction
200
201=== modified file 'app/components/ListItemReorderComponent.qml'
202--- app/components/ListItemReorderComponent.qml 2015-06-18 01:42:03 +0000
203+++ app/components/ListItemReorderComponent.qml 2015-11-26 02:38:41 +0000
204@@ -18,7 +18,7 @@
205 */
206
207 import QtQuick 2.4
208-import Ubuntu.Components 1.2
209+import Ubuntu.Components 1.3
210
211
212 Item {
213
214=== modified file 'app/components/ListItemWithActions.qml'
215--- app/components/ListItemWithActions.qml 2015-06-18 01:42:03 +0000
216+++ app/components/ListItemWithActions.qml 2015-11-26 02:38:41 +0000
217@@ -15,7 +15,7 @@
218 */
219
220 import QtQuick 2.4
221-import Ubuntu.Components 1.2
222+import Ubuntu.Components 1.3
223 import Ubuntu.Components.ListItems 1.0 as ListItem
224
225
226
227=== modified file 'app/components/LoadingIndicator.qml'
228--- app/components/LoadingIndicator.qml 2015-06-18 01:42:03 +0000
229+++ app/components/LoadingIndicator.qml 2015-11-26 02:38:41 +0000
230@@ -17,7 +17,7 @@
231 */
232
233 import QtQuick 2.4
234-import Ubuntu.Components 1.2
235+import Ubuntu.Components 1.3
236
237 Rectangle {
238 id: indicator
239
240=== modified file 'app/components/LocationsPageEmptyStateComponent.qml'
241--- app/components/LocationsPageEmptyStateComponent.qml 2015-07-30 04:10:44 +0000
242+++ app/components/LocationsPageEmptyStateComponent.qml 2015-11-26 02:38:41 +0000
243@@ -17,7 +17,7 @@
244 */
245
246 import QtQuick 2.4
247-import Ubuntu.Components 1.2
248+import Ubuntu.Components 1.3
249 import "../components"
250
251
252
253=== modified file 'app/components/MultiSelectHeadState.qml'
254--- app/components/MultiSelectHeadState.qml 2015-06-18 01:42:03 +0000
255+++ app/components/MultiSelectHeadState.qml 2015-11-26 02:38:41 +0000
256@@ -17,7 +17,7 @@
257 */
258
259 import QtQuick 2.4
260-import Ubuntu.Components 1.2
261+import Ubuntu.Components 1.3
262
263 PageHeadState {
264 id: selectionState
265
266=== modified file 'app/components/MultiSelectListView.qml'
267--- app/components/MultiSelectListView.qml 2015-06-18 01:42:03 +0000
268+++ app/components/MultiSelectListView.qml 2015-11-26 02:38:41 +0000
269@@ -18,7 +18,7 @@
270 */
271
272 import QtQuick 2.4
273-import Ubuntu.Components 1.2
274+import Ubuntu.Components 1.3
275
276
277 WeatherListView {
278
279=== modified file 'app/components/NetworkErrorStateComponent.qml'
280--- app/components/NetworkErrorStateComponent.qml 2015-10-19 03:05:53 +0000
281+++ app/components/NetworkErrorStateComponent.qml 2015-11-26 02:38:41 +0000
282@@ -17,7 +17,7 @@
283 */
284
285 import QtQuick 2.4
286-import Ubuntu.Components 1.2
287+import Ubuntu.Components 1.3
288 import "../components"
289
290
291
292=== modified file 'app/components/NoAPIKeyErrorStateComponent.qml'
293--- app/components/NoAPIKeyErrorStateComponent.qml 2015-11-10 02:02:19 +0000
294+++ app/components/NoAPIKeyErrorStateComponent.qml 2015-11-26 02:38:41 +0000
295@@ -17,7 +17,7 @@
296 */
297
298 import QtQuick 2.4
299-import Ubuntu.Components 1.2
300+import Ubuntu.Components 1.5
301 import "../components"
302
303
304
305=== modified file 'app/components/PageWithBottomEdge.qml'
306--- app/components/PageWithBottomEdge.qml 2015-10-18 15:48:28 +0000
307+++ app/components/PageWithBottomEdge.qml 2015-11-26 02:38:41 +0000
308@@ -63,7 +63,7 @@
309 */
310
311 import QtQuick 2.4
312-import Ubuntu.Components 1.2
313+import Ubuntu.Components 1.3
314
315 Page {
316 id: page
317@@ -77,7 +77,8 @@
318 property bool reloadBottomEdgePage: true
319
320 readonly property alias bottomEdgePage: edgeLoader.item
321- readonly property bool isReady: ((bottomEdge.y === fakeHeader.height) && bottomEdgePageLoaded && edgeLoader.item.active) // CUSTOM change to flag to allow for FakeHeader height
322+ // FIXME: 6.125 is the header.height
323+ readonly property bool isReady: ((bottomEdge.y === units.gu(6.125)) && bottomEdgePageLoaded && edgeLoader.item.active) // CUSTOM change to flag to allow for FakeHeader height
324 readonly property bool isCollapsed: (bottomEdge.y === page.height)
325 readonly property bool bottomEdgePageLoaded: (edgeLoader.status == Loader.Ready)
326
327@@ -85,7 +86,7 @@
328 property int _areaWhenExpanded: 0
329
330 // CUSTOM properties to allow changing of color
331- property alias tipColor: tip.color
332+ property alias tipColor: tip.backgroundColor // CUSTOM color => backgroundColor
333 property alias tipLabelColor: tipLabel.color
334
335 signal bottomEdgeReleased()
336@@ -108,7 +109,7 @@
337 edgeLoader.item.active = true
338 page.pageStack.push(edgeLoader.item)
339 if (edgeLoader.item.flickable) {
340- edgeLoader.item.flickable.contentY = -page.header.height
341+ edgeLoader.item.flickable.contentY = -units.gu(6.125) // FIXME: 6.125 is the header.height
342 edgeLoader.item.flickable.returnToBounds()
343 }
344 if (edgeLoader.item.ready)
345@@ -180,7 +181,7 @@
346 z: 1
347 width: tipLabel.paintedWidth + units.gu(6)
348 height: bottomEdge.tipHeight + units.gu(1)
349- color: Theme.palette.normal.overlay
350+ backgroundColor: Theme.palette.normal.overlay // CUSTOM color => backgroundColor
351 Label {
352 id: tipLabel
353
354@@ -278,7 +279,8 @@
355 left: parent.left
356 right: parent.right
357 }
358- y: -fakeHeader.height + (fakeHeader.height * (page.height - bottomEdge.y)) / (page.height - fakeHeader.height)
359+ // FIXME: 6.125 is the header.height
360+ y: -units.gu(6.125) + (units.gu(6.125) * (page.height - bottomEdge.y)) / (page.height - units.gu(6.125))
361 z: bgVisual.z + 1
362
363 Behavior on y {
364@@ -294,7 +296,7 @@
365
366 readonly property int tipHeight: units.gu(3)
367 // CUSTOM value
368- readonly property int pageStartY: fakeHeader.height
369+ readonly property int pageStartY: units.gu(6.125) // FIXME: 6.125 is the header.height
370
371 z: 1
372 color: Theme.palette.normal.background
373@@ -318,7 +320,7 @@
374 // CUSTOM
375 PropertyChanges {
376 target: fakeHeader
377- y: -fakeHeader.height
378+ y: -units.gu(6.125) // FIXME: 6.125 is the header.height
379 }
380 },
381 State {
382@@ -366,7 +368,8 @@
383 SmoothedAnimation {
384 target: edgeLoader
385 property: "anchors.topMargin"
386- to: - units.gu(4)
387+ // CUSTOM make small to reduce 'bump' when pushing
388+ to: -0.1 // FIXME: 6.125 is header height
389 duration: UbuntuAnimation.FastDuration
390 easing.type: Easing.Linear
391 }
392@@ -418,6 +421,9 @@
393 tip.forceActiveFocus()
394 }
395
396+ // CUSTOM reset the topMargin for next pull
397+ edgeLoader.anchors.topMargin = units.gu(6.125)
398+
399 // notify
400 page.bottomEdgeDismissed()
401
402@@ -441,14 +447,19 @@
403 id: edgeLoader
404
405 asynchronous: true
406- anchors.fill: parent
407+ anchors {
408+ fill: parent
409+ topMargin: units.gu(6.125) // CUSTOM
410+ }
411 //WORKAROUND: The SDK move the page contents down to allocate space for the header we need to avoid that during the page dragging
412+ /* // CUSTOM
413 Binding {
414 target: edgeLoader.status === Loader.Ready ? edgeLoader : null
415 property: "anchors.topMargin"
416 value: edgeLoader.item && edgeLoader.item.flickable ? edgeLoader.item.flickable.contentY : 0
417 when: !page.isReady
418 }
419+ */
420
421 onLoaded: {
422 tip.forceActiveFocus()
423
424=== modified file 'app/components/SettingsButton.qml'
425--- app/components/SettingsButton.qml 2015-09-05 00:03:33 +0000
426+++ app/components/SettingsButton.qml 2015-11-26 02:38:41 +0000
427@@ -17,7 +17,7 @@
428 */
429
430 import QtQuick 2.4
431-import Ubuntu.Components 1.2
432+import Ubuntu.Components 1.3
433
434
435 AbstractButton {
436
437=== modified file 'app/components/StandardListItem.qml'
438--- app/components/StandardListItem.qml 2015-06-21 14:54:05 +0000
439+++ app/components/StandardListItem.qml 2015-11-26 02:38:41 +0000
440@@ -18,7 +18,7 @@
441
442 import QtQuick 2.4
443 import QtQuick.Layouts 1.1
444-import Ubuntu.Components 1.2
445+import Ubuntu.Components 1.3
446
447 ListItem {
448 id: listItem
449
450=== modified file 'app/components/WeatherListItem.qml'
451--- app/components/WeatherListItem.qml 2015-09-29 16:09:21 +0000
452+++ app/components/WeatherListItem.qml 2015-11-26 02:38:41 +0000
453@@ -18,7 +18,7 @@
454 */
455
456 import QtQuick 2.4
457-import Ubuntu.Components 1.2
458+import Ubuntu.Components 1.3
459
460 ListItemWithActions {
461 id: root
462
463=== modified file 'app/components/WeatherListView.qml'
464--- app/components/WeatherListView.qml 2015-06-18 01:42:03 +0000
465+++ app/components/WeatherListView.qml 2015-11-26 02:38:41 +0000
466@@ -18,7 +18,7 @@
467 */
468
469 import QtQuick 2.4
470-import Ubuntu.Components 1.2
471+import Ubuntu.Components 1.3
472
473
474 ListView {
475
476=== modified file 'app/ubuntu-weather-app.qml'
477--- app/ubuntu-weather-app.qml 2015-10-14 23:31:23 +0000
478+++ app/ubuntu-weather-app.qml 2015-11-26 02:38:41 +0000
479@@ -18,7 +18,7 @@
480
481 import QtQuick 2.4
482 import Qt.labs.settings 1.0
483-import Ubuntu.Components 1.2
484+import Ubuntu.Components 1.3
485 import "components"
486 import "data" as Data
487 import "data/WeatherApi.js" as WeatherApi
488
489=== modified file 'app/ui/AddLocationPage.qml'
490--- app/ui/AddLocationPage.qml 2015-09-02 23:36:17 +0000
491+++ app/ui/AddLocationPage.qml 2015-11-26 02:38:41 +0000
492@@ -17,8 +17,8 @@
493 */
494
495 import QtQuick 2.4
496-import Ubuntu.Components 1.2
497-import Ubuntu.Components.Popups 1.0
498+import Ubuntu.Components 1.3
499+import Ubuntu.Components.Popups 1.3
500 import "../components"
501 import "../data/CitiesList.js" as Cities
502 import "../data/WeatherApi.js" as WeatherApi
503@@ -180,13 +180,15 @@
504
505 ListView {
506 id: locationList
507+ anchors {
508+ fill: parent
509+ rightMargin: fastScroll.showing ? fastScroll.width - units.gu(1) : 0
510+ topMargin: units.gu(2)
511+ }
512+
513 objectName: "locationList"
514-
515 clip: true
516 currentIndex: -1
517- anchors.fill: parent
518- anchors.rightMargin: fastScroll.showing ? fastScroll.width - units.gu(1)
519- : 0
520
521 function getSectionText(index) {
522 return citiesModel.get(index).name.substring(0,1)
523
524=== modified file 'app/ui/HomePage.qml'
525--- app/ui/HomePage.qml 2015-11-10 02:13:04 +0000
526+++ app/ui/HomePage.qml 2015-11-26 02:38:41 +0000
527@@ -17,7 +17,7 @@
528 */
529
530 import QtQuick 2.4
531-import Ubuntu.Components 1.2
532+import Ubuntu.Components 1.3
533 import "../components"
534 import "../data/keys.js" as Keys
535
536@@ -84,6 +84,12 @@
537 return new Date(dateData.year, dateData.month, dateData.date, dateData.hours, dateData.minutes)
538 }
539
540+ // Do not show the Page Header
541+ head {
542+ locked: true
543+ visible: false
544+ }
545+
546 /*
547 Background for the PageWithBottomEdge
548 */
549
550=== modified file 'app/ui/LocationPane.qml'
551--- app/ui/LocationPane.qml 2015-10-22 15:17:02 +0000
552+++ app/ui/LocationPane.qml 2015-11-26 02:38:41 +0000
553@@ -17,7 +17,7 @@
554 */
555
556 import QtQuick 2.4
557-import Ubuntu.Components 1.2
558+import Ubuntu.Components 1.3
559 import Ubuntu.Components.ListItems 0.1 as ListItem
560 import "../components"
561 import "../data/suncalc.js" as SunCalc
562
563=== modified file 'app/ui/LocationsPage.qml'
564--- app/ui/LocationsPage.qml 2015-10-22 12:49:35 +0000
565+++ app/ui/LocationsPage.qml 2015-11-26 02:38:41 +0000
566@@ -17,7 +17,7 @@
567 */
568
569 import QtQuick 2.4
570-import Ubuntu.Components 1.2
571+import Ubuntu.Components 1.3
572 import Ubuntu.Components.ListItems 0.1 as ListItem
573 import "../components"
574 import "../components/ListItemActions"
575@@ -66,7 +66,7 @@
576 anchors {
577 fill: parent
578 // TODO: Fix this offset
579- topMargin: locationsPage.header ? -locationsPage.header.height : 0
580+ topMargin: -units.gu(6.125) // FIXME: 6.125 is the header.height
581 }
582 model: ListModel {
583 id: locationsModel
584
585=== modified file 'app/ui/SettingsPage.qml'
586--- app/ui/SettingsPage.qml 2015-08-10 08:13:31 +0000
587+++ app/ui/SettingsPage.qml 2015-11-26 02:38:41 +0000
588@@ -17,7 +17,7 @@
589 */
590
591 import QtQuick 2.4
592-import Ubuntu.Components 1.2
593+import Ubuntu.Components 1.3
594 import "../components"
595
596 Page {
597
598=== modified file 'app/ui/settings/DataProviderPage.qml'
599--- app/ui/settings/DataProviderPage.qml 2015-10-14 23:31:23 +0000
600+++ app/ui/settings/DataProviderPage.qml 2015-11-26 02:38:41 +0000
601@@ -17,7 +17,7 @@
602 */
603
604 import QtQuick 2.4
605-import Ubuntu.Components 1.2
606+import Ubuntu.Components 1.3
607 import "../../components"
608 import "../../data/keys.js" as Keys
609
610
611=== modified file 'app/ui/settings/LocationPage.qml'
612--- app/ui/settings/LocationPage.qml 2015-07-27 00:57:57 +0000
613+++ app/ui/settings/LocationPage.qml 2015-11-26 02:38:41 +0000
614@@ -17,7 +17,7 @@
615 */
616
617 import QtQuick 2.4
618-import Ubuntu.Components 1.2
619+import Ubuntu.Components 1.3
620 import Ubuntu.Components.ListItems 1.0 as ListItem
621
622 Page {
623
624=== modified file 'app/ui/settings/RefreshIntervalPage.qml'
625--- app/ui/settings/RefreshIntervalPage.qml 2015-06-21 14:54:05 +0000
626+++ app/ui/settings/RefreshIntervalPage.qml 2015-11-26 02:38:41 +0000
627@@ -17,7 +17,7 @@
628 */
629
630 import QtQuick 2.4
631-import Ubuntu.Components 1.2
632+import Ubuntu.Components 1.3
633 import "../../components"
634
635 Page {
636
637=== modified file 'app/ui/settings/UnitsPage.qml'
638--- app/ui/settings/UnitsPage.qml 2015-08-10 16:27:31 +0000
639+++ app/ui/settings/UnitsPage.qml 2015-11-26 02:38:41 +0000
640@@ -17,7 +17,7 @@
641 */
642
643 import QtQuick 2.4
644-import Ubuntu.Components 1.2
645+import Ubuntu.Components 1.3
646 import "../../components"
647
648 Page {
649
650=== modified file 'debian/changelog'
651--- debian/changelog 2015-11-10 02:02:19 +0000
652+++ debian/changelog 2015-11-26 02:38:41 +0000
653@@ -2,6 +2,7 @@
654
655 [ Andrew Hayzen ]
656 * Bump version to 3.1
657+ * Update app to use the Ubuntu Components version 1.3 (LP: #1508363)
658
659 [ Bartosz Kosiorek ]
660 * Change message text according to Ubuntu UX comment (LP: #1493466)
661
662=== modified file 'manifest.json.in'
663--- manifest.json.in 2015-10-24 19:24:48 +0000
664+++ manifest.json.in 2015-11-26 02:38:41 +0000
665@@ -1,7 +1,7 @@
666 {
667 "architecture": "all",
668 "description": "A weather forecast application for Ubuntu with support for multiple online weather data sources",
669- "framework": "ubuntu-sdk-15.04-qml",
670+ "framework": "ubuntu-sdk-15.04.1-qml",
671 "hooks": {
672 "weather": {
673 "apparmor": "ubuntu-weather-app.apparmor",
674
675=== modified file 'po/com.ubuntu.weather.pot'
676--- po/com.ubuntu.weather.pot 2015-11-10 02:02:19 +0000
677+++ po/com.ubuntu.weather.pot 2015-11-26 02:38:41 +0000
678@@ -8,7 +8,7 @@
679 msgstr ""
680 "Project-Id-Version: ubuntu-weather-app\n"
681 "Report-Msgid-Bugs-To: \n"
682-"POT-Creation-Date: 2015-11-09 19:59-0600\n"
683+"POT-Creation-Date: 2015-11-26 02:04+0000\n"
684 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
685 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
686 "Language-Team: LANGUAGE <LL@li.org>\n"
687@@ -120,23 +120,23 @@
688 msgid "Search city"
689 msgstr ""
690
691-#: ../app/ui/AddLocationPage.qml:297
692+#: ../app/ui/AddLocationPage.qml:299
693 msgid "No city found"
694 msgstr ""
695
696-#: ../app/ui/AddLocationPage.qml:310
697+#: ../app/ui/AddLocationPage.qml:312
698 msgid "Couldn't load weather data, please try later again!"
699 msgstr ""
700
701-#: ../app/ui/AddLocationPage.qml:320
702+#: ../app/ui/AddLocationPage.qml:322
703 msgid "Location already added."
704 msgstr ""
705
706-#: ../app/ui/AddLocationPage.qml:323
707+#: ../app/ui/AddLocationPage.qml:325
708 msgid "OK"
709 msgstr ""
710
711-#: ../app/ui/HomePage.qml:31 ../app/ui/LocationsPage.qml:29
712+#: ../app/ui/HomePage.qml:32 ../app/ui/LocationsPage.qml:29
713 msgid "Locations"
714 msgstr ""
715
716
717=== modified file 'tests/autopilot/ubuntu_weather_app/__init__.py'
718--- tests/autopilot/ubuntu_weather_app/__init__.py 2015-10-22 12:49:35 +0000
719+++ tests/autopilot/ubuntu_weather_app/__init__.py 2015-11-26 02:38:41 +0000
720@@ -85,12 +85,17 @@
721 self.bottomEdgePageLoaded.wait_for(True)
722
723 try:
724- action_item = self.wait_select_single(objectName='bottomEdgeTip')
725+ action_item = self.wait_select_single("UCUbuntuShape",
726+ objectName='bottomEdgeTip')
727 action_item.visible.wait_for(True)
728+
729+ # Pick the middle horizontally and vertically of the bottomEdgeTip
730 start_x = (action_item.globalRect.x +
731 (action_item.globalRect.width * 0.5))
732- start_y = action_item.globalRect.y
733+ start_y = (action_item.globalRect.y +
734+ (action_item.globalRect.height * 0.5))
735 stop_y = start_y - (self.height * 0.7)
736+
737 self.pointing_device.drag(start_x, start_y,
738 start_x, stop_y, rate=2)
739 self.isReady.wait_for(True)
740@@ -130,7 +135,7 @@
741 return header.select_single("TextField", objectName="searchField")
742
743 def is_empty_label_visible(self):
744- return self.select_single("Label", objectName="noCity").visible
745+ return self.select_single("UCLabel", objectName="noCity").visible
746
747 def search(self, value):
748 self.click_search_action()
749@@ -226,7 +231,7 @@
750
751 def get_settings_button(self):
752 return self.select_single(
753- "AbstractButton", objectName="settingsButton")
754+ "UCAbstractButton", objectName="settingsButton")
755
756
757 class LocationsPage(Page):
758@@ -308,7 +313,7 @@
759
760 class WeatherListItem(UbuntuUIToolkitCustomProxyObjectBase):
761 def get_name(self):
762- return self.select_single("Label", objectName="name").text
763+ return self.select_single("UCLabel", objectName="name").text
764
765 @click_object
766 def select_remove(self):
767
768=== modified file 'ubuntu-weather-app.desktop.in.in'
769--- ubuntu-weather-app.desktop.in.in 2015-10-24 19:35:02 +0000
770+++ ubuntu-weather-app.desktop.in.in 2015-11-26 02:38:41 +0000
771@@ -10,4 +10,5 @@
772 X-Ubuntu-Touch=true
773 X-Ubuntu-Default-Department-ID=accessories
774 X-Ubuntu-Splash-Color=#F5F5F5
775+X-Ubuntu-Splash-Show-Header=true
776 X-Ubuntu-Supported-Orientations=portrait

Subscribers

People subscribed via source and target branches

to all changes: