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

[Andrew Hayzen]

* Update app to use the Ubuntu Components version 1.3

* 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.

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

FAILED: Continuous integration, rev:154
http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-ci/289/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-vivid-amd64-ci/289/console

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

review: Needs Fixing (continuous-integration)

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

FAILED: Continuous integration, rev:154
https://core-apps-jenkins.ubuntu.com/job/weather-app-ci/10/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/100/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/weather-app-ci/10/rebuild

review: Needs Fixing (continuous-integration)

[lp:~ahayzen/ubuntu-weather-app/reboot-uc1.3-bump]

155. By Andrew Hayzen on 2015-11-02

* Merge of trunk

156. By Andrew Hayzen on 2015-11-02

* Update changelog

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

PASSED: Continuous integration, rev:156
https://core-apps-jenkins.ubuntu.com/job/weather-app-ci/11/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/101/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/weather-app-ci/11/rebuild

review: Approve (continuous-integration)

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

PASSED: Continuous integration, rev:156
http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-ci/290/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-vivid-amd64-ci/290

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

review: Approve (continuous-integration)

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

PASSED: Continuous integration, rev:156
http://91.189.93.70:8080/job/ubuntu-weather-app-ci/322/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-vivid-amd64-ci/30

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

review: Approve (continuous-integration)

[Andrew Hayzen (ahayzen)]

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

review: Needs Fixing

[lp:~ahayzen/ubuntu-weather-app/reboot-uc1.3-bump]

157. By Andrew Hayzen on 2015-11-03

* Tweaks to bottomEdge for autopilot

[Andrew Hayzen (ahayzen)]

This is now passing autopilot :-)

autopilot PASS

review: Abstain

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

PASSED: Continuous integration, rev:157
https://core-apps-jenkins.ubuntu.com/job/weather-app-ci/12/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/102/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/weather-app-ci/12/rebuild

review: Approve (continuous-integration)

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

PASSED: Continuous integration, rev:157
http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-ci/291/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-vivid-amd64-ci/291

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

review: Approve (continuous-integration)

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

PASSED: Continuous integration, rev:157
http://91.189.93.70:8080/job/ubuntu-weather-app-ci/323/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-vivid-amd64-ci/31

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

review: Approve (continuous-integration)

[Victor Thompson (vthompson)]

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)]

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)]

@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)]

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...

review: Needs Fixing

[Bartosz Kosiorek (gang65)]

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

[lp:~ahayzen/ubuntu-weather-app/reboot-uc1.3-bump]

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)]

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

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

PASSED: Continuous integration, rev:159
https://core-apps-jenkins.ubuntu.com/job/weather-app-ci/16/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/127/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/weather-app-ci/16/rebuild

review: Approve (continuous-integration)

[Bartosz Kosiorek (gang65)]

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)]

@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)]

@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)]

It looks perfectly for me. Thanks

review: Approve

[Victor Thompson (vthompson)]

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

[lp:~ahayzen/ubuntu-weather-app/reboot-uc1.3-bump]

160. By Andrew Hayzen on 2015-11-12

* Bump merged component

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

PASSED: Continuous integration, rev:160
https://core-apps-jenkins.ubuntu.com/job/weather-app-ci/17/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/128/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/weather-app-ci/17/rebuild

review: Approve (continuous-integration)

[lp:~ahayzen/ubuntu-weather-app/reboot-uc1.3-bump]

161. By Andrew Hayzen on 2015-11-12

* Update .pot file

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

PASSED: Continuous integration, rev:161
https://core-apps-jenkins.ubuntu.com/job/weather-app-ci/18/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/129/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/weather-app-ci/18/rebuild

review: Approve (continuous-integration)

[lp:~ahayzen/ubuntu-weather-app/reboot-uc1.3-bump]

162. By Andrew Hayzen on 2015-11-26

* Show header in splash to minimise slide up effect

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

PASSED: Continuous integration, rev:162
https://core-apps-jenkins.ubuntu.com/job/weather-app-ci/21/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/179/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/weather-app-ci/21/rebuild

review: Approve (continuous-integration)

[lp:~ahayzen/ubuntu-weather-app/reboot-uc1.3-bump]

163. By Andrew Hayzen on 2015-11-26

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

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

PASSED: Continuous integration, rev:163
https://core-apps-jenkins.ubuntu.com/job/weather-app-ci/22/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/180/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/weather-app-ci/22/rebuild

review: Approve (continuous-integration)

[lp:~ahayzen/ubuntu-weather-app/reboot-uc1.3-bump]

164. By Andrew Hayzen on 2015-11-26

* Reduce bounce animation of content when pushing a page

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

PASSED: Continuous integration, rev:164
https://core-apps-jenkins.ubuntu.com/job/weather-app-ci/23/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/181/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/weather-app-ci/23/rebuild

review: Approve (continuous-integration)

[lp:~ahayzen/ubuntu-weather-app/reboot-uc1.3-bump]

165. By Andrew Hayzen on 2015-11-26

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

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

PASSED: Continuous integration, rev:165
https://core-apps-jenkins.ubuntu.com/job/weather-app-ci/24/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/182/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/weather-app-ci/24/rebuild

review: Approve (continuous-integration)

[lp:~ahayzen/ubuntu-weather-app/reboot-uc1.3-bump]

166. By Andrew Hayzen on 2015-11-26

* Add extra code commentary

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

PASSED: Continuous integration, rev:166
https://core-apps-jenkins.ubuntu.com/job/weather-app-ci/25/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/183/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/weather-app-ci/25/rebuild

review: Approve (continuous-integration)

[Victor Thompson (vthompson)]

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

=== modified file 'app/components/CurrentLocation.qml'
--- app/components/CurrentLocation.qml	2015-07-27 00:57:57 +0000
+++ app/components/CurrentLocation.qml	2015-11-26 02:38:41 +0000
@@ -19,7 +19,7 @@
 import QtLocation 5.3
 import QtPositioning 5.2
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 import "../data/WeatherApi.js" as WeatherApi
 
 

=== modified file 'app/components/DayDelegate.qml'
--- app/components/DayDelegate.qml	2015-10-16 00:12:57 +0000
+++ app/components/DayDelegate.qml	2015-11-26 02:38:41 +0000
@@ -17,7 +17,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 ListItem {
     id: dayDelegate

=== modified file 'app/components/DayDelegateExtraInfo.qml'
--- app/components/DayDelegateExtraInfo.qml	2015-09-29 15:21:55 +0000
+++ app/components/DayDelegateExtraInfo.qml	2015-11-26 02:38:41 +0000
@@ -17,7 +17,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 
 Column {

=== modified file 'app/components/ExpandableListItem.qml'
--- app/components/ExpandableListItem.qml	2015-06-18 01:42:03 +0000
+++ app/components/ExpandableListItem.qml	2015-11-26 02:38:41 +0000
@@ -17,7 +17,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 import Ubuntu.Components.ListItems 1.0 as ListItem
 
 /*

=== modified file 'app/components/FakeHeader.qml'
--- app/components/FakeHeader.qml	2015-10-18 15:48:28 +0000
+++ app/components/FakeHeader.qml	2015-11-26 02:38:41 +0000
@@ -17,22 +17,22 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 Column {
     id: fakeHeader
 
-    height: units.gu(9)
+    height: units.gu(6.125)
 
     Rectangle {
-        height: units.gu(7)
+        height: units.gu(6)
         width: parent.width
         color: Theme.palette.normal.background
     }
 
     Rectangle {
         color: "#C9C9C9"
-        height: units.gu(2)
+        height: units.gu(0.125)
         anchors.left: parent.left
         anchors.right: parent.right
     }

=== modified file 'app/components/FastScroll.qml'
--- app/components/FastScroll.qml	2015-06-18 01:42:03 +0000
+++ app/components/FastScroll.qml	2015-11-26 02:38:41 +0000
@@ -41,7 +41,7 @@
 
 // FastScroll.qml
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 import "FastScroll.js" as Sections
 
 Item {

=== modified file 'app/components/ForecastDetailsDelegate.qml'
--- app/components/ForecastDetailsDelegate.qml	2015-10-09 18:35:21 +0000
+++ app/components/ForecastDetailsDelegate.qml	2015-11-26 02:38:41 +0000
@@ -17,7 +17,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 Row {
     height: icon.height

=== modified file 'app/components/HeaderRow.qml'
--- app/components/HeaderRow.qml	2015-07-27 21:41:09 +0000
+++ app/components/HeaderRow.qml	2015-11-26 02:38:41 +0000
@@ -18,7 +18,7 @@
 
 import QtQuick 2.4
 import QtQuick.Layouts 1.1
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 RowLayout {
     id: headerRow

=== modified file 'app/components/HomeGraphic.qml'
--- app/components/HomeGraphic.qml	2015-06-18 01:42:03 +0000
+++ app/components/HomeGraphic.qml	2015-11-26 02:38:41 +0000
@@ -17,7 +17,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 Item {
     height: units.gu(32)

=== modified file 'app/components/HomeHourly.qml'
--- app/components/HomeHourly.qml	2015-08-20 19:47:45 +0000
+++ app/components/HomeHourly.qml	2015-11-26 02:38:41 +0000
@@ -17,7 +17,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 ListView {
     id: homeHourly

=== modified file 'app/components/HomePageEmptyStateComponent.qml'
--- app/components/HomePageEmptyStateComponent.qml	2015-07-30 04:10:44 +0000
+++ app/components/HomePageEmptyStateComponent.qml	2015-11-26 02:38:41 +0000
@@ -17,7 +17,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 import "../components"
 
 

=== modified file 'app/components/HomeTempInfo.qml'
--- app/components/HomeTempInfo.qml	2015-10-16 00:14:28 +0000
+++ app/components/HomeTempInfo.qml	2015-11-26 02:38:41 +0000
@@ -17,7 +17,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 Item {
     id: homeTempInfoItem

=== modified file 'app/components/ListItemActions/CheckBox.qml'
--- app/components/ListItemActions/CheckBox.qml	2015-06-18 01:45:57 +0000
+++ app/components/ListItemActions/CheckBox.qml	2015-11-26 02:38:41 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 CheckBox {
     checked: root.selected

=== modified file 'app/components/ListItemActions/Remove.qml'
--- app/components/ListItemActions/Remove.qml	2015-06-18 01:42:03 +0000
+++ app/components/ListItemActions/Remove.qml	2015-11-26 02:38:41 +0000
@@ -17,7 +17,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 Action {
     id: removeAction

=== modified file 'app/components/ListItemReorderComponent.qml'
--- app/components/ListItemReorderComponent.qml	2015-06-18 01:42:03 +0000
+++ app/components/ListItemReorderComponent.qml	2015-11-26 02:38:41 +0000
@@ -18,7 +18,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 
 Item {

=== modified file 'app/components/ListItemWithActions.qml'
--- app/components/ListItemWithActions.qml	2015-06-18 01:42:03 +0000
+++ app/components/ListItemWithActions.qml	2015-11-26 02:38:41 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 import Ubuntu.Components.ListItems 1.0 as ListItem
 
 

=== modified file 'app/components/LoadingIndicator.qml'
--- app/components/LoadingIndicator.qml	2015-06-18 01:42:03 +0000
+++ app/components/LoadingIndicator.qml	2015-11-26 02:38:41 +0000
@@ -17,7 +17,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 Rectangle {
     id: indicator

=== modified file 'app/components/LocationsPageEmptyStateComponent.qml'
--- app/components/LocationsPageEmptyStateComponent.qml	2015-07-30 04:10:44 +0000
+++ app/components/LocationsPageEmptyStateComponent.qml	2015-11-26 02:38:41 +0000
@@ -17,7 +17,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 import "../components"
 
 

=== modified file 'app/components/MultiSelectHeadState.qml'
--- app/components/MultiSelectHeadState.qml	2015-06-18 01:42:03 +0000
+++ app/components/MultiSelectHeadState.qml	2015-11-26 02:38:41 +0000
@@ -17,7 +17,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 PageHeadState {
     id: selectionState

=== modified file 'app/components/MultiSelectListView.qml'
--- app/components/MultiSelectListView.qml	2015-06-18 01:42:03 +0000
+++ app/components/MultiSelectListView.qml	2015-11-26 02:38:41 +0000
@@ -18,7 +18,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 
 WeatherListView {

=== modified file 'app/components/NetworkErrorStateComponent.qml'
--- app/components/NetworkErrorStateComponent.qml	2015-10-19 03:05:53 +0000
+++ app/components/NetworkErrorStateComponent.qml	2015-11-26 02:38:41 +0000
@@ -17,7 +17,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 import "../components"
 
 

=== modified file 'app/components/NoAPIKeyErrorStateComponent.qml'
--- app/components/NoAPIKeyErrorStateComponent.qml	2015-11-10 02:02:19 +0000
+++ app/components/NoAPIKeyErrorStateComponent.qml	2015-11-26 02:38:41 +0000
@@ -17,7 +17,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.5
 import "../components"
 
 

=== modified file 'app/components/PageWithBottomEdge.qml'
--- app/components/PageWithBottomEdge.qml	2015-10-18 15:48:28 +0000
+++ app/components/PageWithBottomEdge.qml	2015-11-26 02:38:41 +0000
@@ -63,7 +63,7 @@
 */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 Page {
     id: page
@@ -77,7 +77,8 @@
     property bool reloadBottomEdgePage: true
 
     readonly property alias bottomEdgePage: edgeLoader.item
-    readonly property bool isReady: ((bottomEdge.y === fakeHeader.height) && bottomEdgePageLoaded && edgeLoader.item.active) // CUSTOM change to flag to allow for FakeHeader height
+    // FIXME: 6.125 is the header.height
+    readonly property bool isReady: ((bottomEdge.y === units.gu(6.125)) && bottomEdgePageLoaded && edgeLoader.item.active) // CUSTOM change to flag to allow for FakeHeader height
     readonly property bool isCollapsed: (bottomEdge.y === page.height)
     readonly property bool bottomEdgePageLoaded: (edgeLoader.status == Loader.Ready)
 
@@ -85,7 +86,7 @@
     property int _areaWhenExpanded: 0
 
     // CUSTOM properties to allow changing of color
-    property alias tipColor: tip.color
+    property alias tipColor: tip.backgroundColor  // CUSTOM color => backgroundColor
     property alias tipLabelColor: tipLabel.color
 
     signal bottomEdgeReleased()
@@ -108,7 +109,7 @@
             edgeLoader.item.active = true
             page.pageStack.push(edgeLoader.item)
             if (edgeLoader.item.flickable) {
-                edgeLoader.item.flickable.contentY = -page.header.height
+                edgeLoader.item.flickable.contentY = -units.gu(6.125)  // FIXME: 6.125 is the header.height
                 edgeLoader.item.flickable.returnToBounds()
             }
             if (edgeLoader.item.ready)
@@ -180,7 +181,7 @@
         z: 1
         width: tipLabel.paintedWidth + units.gu(6)
         height: bottomEdge.tipHeight + units.gu(1)
-        color: Theme.palette.normal.overlay
+        backgroundColor: Theme.palette.normal.overlay  // CUSTOM color => backgroundColor
         Label {
             id: tipLabel
 
@@ -278,7 +279,8 @@
             left: parent.left
             right: parent.right
         }
-        y: -fakeHeader.height + (fakeHeader.height * (page.height - bottomEdge.y)) / (page.height - fakeHeader.height)
+        // FIXME: 6.125 is the header.height
+        y: -units.gu(6.125) + (units.gu(6.125) * (page.height - bottomEdge.y)) / (page.height - units.gu(6.125))
         z: bgVisual.z + 1
 
         Behavior on y {
@@ -294,7 +296,7 @@
 
         readonly property int tipHeight: units.gu(3)
         // CUSTOM value
-        readonly property int pageStartY: fakeHeader.height
+        readonly property int pageStartY: units.gu(6.125)  // FIXME: 6.125 is the header.height
 
         z: 1
         color: Theme.palette.normal.background
@@ -318,7 +320,7 @@
                 // CUSTOM
                 PropertyChanges {
                     target: fakeHeader
-                    y: -fakeHeader.height
+                    y: -units.gu(6.125)  // FIXME: 6.125 is the header.height
                 }
             },
             State {
@@ -366,7 +368,8 @@
                     SmoothedAnimation {
                         target: edgeLoader
                         property: "anchors.topMargin"
-                        to: - units.gu(4)
+                        // CUSTOM make small to reduce 'bump' when pushing
+                        to: -0.1  // FIXME: 6.125 is header height
                         duration: UbuntuAnimation.FastDuration
                         easing.type: Easing.Linear
                     }
@@ -418,6 +421,9 @@
                                 tip.forceActiveFocus()
                             }
 
+                            // CUSTOM reset the topMargin for next pull
+                            edgeLoader.anchors.topMargin = units.gu(6.125)
+
                             // notify
                             page.bottomEdgeDismissed()
 
@@ -441,14 +447,19 @@
             id: edgeLoader
 
             asynchronous: true
-            anchors.fill: parent
+            anchors {
+                fill: parent
+                topMargin: units.gu(6.125)  // CUSTOM
+            }
             //WORKAROUND: The SDK move the page contents down to allocate space for the header we need to avoid that during the page dragging
+            /*  // CUSTOM
             Binding {
                 target: edgeLoader.status === Loader.Ready ? edgeLoader : null
                 property: "anchors.topMargin"
                 value:  edgeLoader.item && edgeLoader.item.flickable ? edgeLoader.item.flickable.contentY : 0
                 when: !page.isReady
             }
+            */
 
             onLoaded: {
                 tip.forceActiveFocus()

=== modified file 'app/components/SettingsButton.qml'
--- app/components/SettingsButton.qml	2015-09-05 00:03:33 +0000
+++ app/components/SettingsButton.qml	2015-11-26 02:38:41 +0000
@@ -17,7 +17,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 
 AbstractButton {

=== modified file 'app/components/StandardListItem.qml'
--- app/components/StandardListItem.qml	2015-06-21 14:54:05 +0000
+++ app/components/StandardListItem.qml	2015-11-26 02:38:41 +0000
@@ -18,7 +18,7 @@
 
 import QtQuick 2.4
 import QtQuick.Layouts 1.1
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 ListItem {
     id: listItem

=== modified file 'app/components/WeatherListItem.qml'
--- app/components/WeatherListItem.qml	2015-09-29 16:09:21 +0000
+++ app/components/WeatherListItem.qml	2015-11-26 02:38:41 +0000
@@ -18,7 +18,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 ListItemWithActions {
     id: root

=== modified file 'app/components/WeatherListView.qml'
--- app/components/WeatherListView.qml	2015-06-18 01:42:03 +0000
+++ app/components/WeatherListView.qml	2015-11-26 02:38:41 +0000
@@ -18,7 +18,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 
 ListView {

=== modified file 'app/ubuntu-weather-app.qml'
--- app/ubuntu-weather-app.qml	2015-10-14 23:31:23 +0000
+++ app/ubuntu-weather-app.qml	2015-11-26 02:38:41 +0000
@@ -18,7 +18,7 @@
 
 import QtQuick 2.4
 import Qt.labs.settings 1.0
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 import "components"
 import "data" as Data
 import "data/WeatherApi.js" as WeatherApi

=== modified file 'app/ui/AddLocationPage.qml'
--- app/ui/AddLocationPage.qml	2015-09-02 23:36:17 +0000
+++ app/ui/AddLocationPage.qml	2015-11-26 02:38:41 +0000
@@ -17,8 +17,8 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
-import Ubuntu.Components.Popups 1.0
+import Ubuntu.Components 1.3
+import Ubuntu.Components.Popups 1.3
 import "../components"
 import "../data/CitiesList.js" as Cities
 import "../data/WeatherApi.js" as WeatherApi
@@ -180,13 +180,15 @@
 
     ListView {
         id: locationList
+        anchors {
+            fill: parent
+            rightMargin: fastScroll.showing ? fastScroll.width - units.gu(1) : 0
+            topMargin: units.gu(2)
+        }
+
         objectName: "locationList"
-
         clip: true
         currentIndex: -1
-        anchors.fill: parent
-        anchors.rightMargin: fastScroll.showing ? fastScroll.width - units.gu(1)
-                                                : 0
 
         function getSectionText(index) {
             return citiesModel.get(index).name.substring(0,1)

=== modified file 'app/ui/HomePage.qml'
--- app/ui/HomePage.qml	2015-11-10 02:13:04 +0000
+++ app/ui/HomePage.qml	2015-11-26 02:38:41 +0000
@@ -17,7 +17,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 import "../components"
 import "../data/keys.js" as Keys
 
@@ -84,6 +84,12 @@
         return new Date(dateData.year, dateData.month, dateData.date, dateData.hours, dateData.minutes)
     }
 
+    // Do not show the Page Header
+    head {
+        locked: true
+        visible: false
+    }
+
     /*
       Background for the PageWithBottomEdge
     */

=== modified file 'app/ui/LocationPane.qml'
--- app/ui/LocationPane.qml	2015-10-22 15:17:02 +0000
+++ app/ui/LocationPane.qml	2015-11-26 02:38:41 +0000
@@ -17,7 +17,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 import Ubuntu.Components.ListItems 0.1 as ListItem
 import "../components"
 import "../data/suncalc.js" as SunCalc

=== modified file 'app/ui/LocationsPage.qml'
--- app/ui/LocationsPage.qml	2015-10-22 12:49:35 +0000
+++ app/ui/LocationsPage.qml	2015-11-26 02:38:41 +0000
@@ -17,7 +17,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 import Ubuntu.Components.ListItems 0.1 as ListItem
 import "../components"
 import "../components/ListItemActions"
@@ -66,7 +66,7 @@
         anchors {
             fill: parent
             // TODO: Fix this offset
-            topMargin: locationsPage.header ? -locationsPage.header.height : 0
+            topMargin: -units.gu(6.125)  // FIXME: 6.125 is the header.height
         }
         model: ListModel {
             id: locationsModel

=== modified file 'app/ui/SettingsPage.qml'
--- app/ui/SettingsPage.qml	2015-08-10 08:13:31 +0000
+++ app/ui/SettingsPage.qml	2015-11-26 02:38:41 +0000
@@ -17,7 +17,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 import "../components"
 
 Page {

=== modified file 'app/ui/settings/DataProviderPage.qml'
--- app/ui/settings/DataProviderPage.qml	2015-10-14 23:31:23 +0000
+++ app/ui/settings/DataProviderPage.qml	2015-11-26 02:38:41 +0000
@@ -17,7 +17,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 import "../../components"
 import "../../data/keys.js" as Keys
 

=== modified file 'app/ui/settings/LocationPage.qml'
--- app/ui/settings/LocationPage.qml	2015-07-27 00:57:57 +0000
+++ app/ui/settings/LocationPage.qml	2015-11-26 02:38:41 +0000
@@ -17,7 +17,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 import Ubuntu.Components.ListItems 1.0 as ListItem
 
 Page {

=== modified file 'app/ui/settings/RefreshIntervalPage.qml'
--- app/ui/settings/RefreshIntervalPage.qml	2015-06-21 14:54:05 +0000
+++ app/ui/settings/RefreshIntervalPage.qml	2015-11-26 02:38:41 +0000
@@ -17,7 +17,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 import "../../components"
 
 Page {

=== modified file 'app/ui/settings/UnitsPage.qml'
--- app/ui/settings/UnitsPage.qml	2015-08-10 16:27:31 +0000
+++ app/ui/settings/UnitsPage.qml	2015-11-26 02:38:41 +0000
@@ -17,7 +17,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 import "../../components"
 
 Page {

=== modified file 'debian/changelog'
--- debian/changelog	2015-11-10 02:02:19 +0000
+++ debian/changelog	2015-11-26 02:38:41 +0000
@@ -2,6 +2,7 @@
 
   [ Andrew Hayzen ]
   * Bump version to 3.1
+  * Update app to use the Ubuntu Components version 1.3 (LP: #1508363)
 
   [ Bartosz Kosiorek ]
   * Change message text according to Ubuntu UX comment (LP: #1493466)

=== modified file 'manifest.json.in'
--- manifest.json.in	2015-10-24 19:24:48 +0000
+++ manifest.json.in	2015-11-26 02:38:41 +0000
@@ -1,7 +1,7 @@
 {
     "architecture": "all",
     "description": "A weather forecast application for Ubuntu with support for multiple online weather data sources",
-    "framework": "ubuntu-sdk-15.04-qml",
+    "framework": "ubuntu-sdk-15.04.1-qml",
     "hooks": {
         "weather": {
             "apparmor": "ubuntu-weather-app.apparmor",

=== modified file 'po/com.ubuntu.weather.pot'
--- po/com.ubuntu.weather.pot	2015-11-10 02:02:19 +0000
+++ po/com.ubuntu.weather.pot	2015-11-26 02:38:41 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: ubuntu-weather-app\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-11-09 19:59-0600\n"
+"POT-Creation-Date: 2015-11-26 02:04+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -120,23 +120,23 @@
 msgid "Search city"
 msgstr ""
 
-#: ../app/ui/AddLocationPage.qml:297
+#: ../app/ui/AddLocationPage.qml:299
 msgid "No city found"
 msgstr ""
 
-#: ../app/ui/AddLocationPage.qml:310
+#: ../app/ui/AddLocationPage.qml:312
 msgid "Couldn't load weather data, please try later again!"
 msgstr ""
 
-#: ../app/ui/AddLocationPage.qml:320
+#: ../app/ui/AddLocationPage.qml:322
 msgid "Location already added."
 msgstr ""
 
-#: ../app/ui/AddLocationPage.qml:323
+#: ../app/ui/AddLocationPage.qml:325
 msgid "OK"
 msgstr ""
 
-#: ../app/ui/HomePage.qml:31 ../app/ui/LocationsPage.qml:29
+#: ../app/ui/HomePage.qml:32 ../app/ui/LocationsPage.qml:29
 msgid "Locations"
 msgstr ""
 

=== modified file 'tests/autopilot/ubuntu_weather_app/__init__.py'
--- tests/autopilot/ubuntu_weather_app/__init__.py	2015-10-22 12:49:35 +0000
+++ tests/autopilot/ubuntu_weather_app/__init__.py	2015-11-26 02:38:41 +0000
@@ -85,12 +85,17 @@
         self.bottomEdgePageLoaded.wait_for(True)
 
         try:
-            action_item = self.wait_select_single(objectName='bottomEdgeTip')
+            action_item = self.wait_select_single("UCUbuntuShape",
+                                                  objectName='bottomEdgeTip')
             action_item.visible.wait_for(True)
+
+            # Pick the middle horizontally and vertically of the bottomEdgeTip
             start_x = (action_item.globalRect.x +
                        (action_item.globalRect.width * 0.5))
-            start_y = action_item.globalRect.y
+            start_y = (action_item.globalRect.y +
+                       (action_item.globalRect.height * 0.5))
             stop_y = start_y - (self.height * 0.7)
+
             self.pointing_device.drag(start_x, start_y,
                                       start_x, stop_y, rate=2)
             self.isReady.wait_for(True)
@@ -130,7 +135,7 @@
         return header.select_single("TextField", objectName="searchField")
 
     def is_empty_label_visible(self):
-        return self.select_single("Label", objectName="noCity").visible
+        return self.select_single("UCLabel", objectName="noCity").visible
 
     def search(self, value):
         self.click_search_action()
@@ -226,7 +231,7 @@
 
     def get_settings_button(self):
         return self.select_single(
-            "AbstractButton", objectName="settingsButton")
+            "UCAbstractButton", objectName="settingsButton")
 
 
 class LocationsPage(Page):
@@ -308,7 +313,7 @@
 
 class WeatherListItem(UbuntuUIToolkitCustomProxyObjectBase):
     def get_name(self):
-        return self.select_single("Label", objectName="name").text
+        return self.select_single("UCLabel", objectName="name").text
 
     @click_object
     def select_remove(self):

=== modified file 'ubuntu-weather-app.desktop.in.in'
--- ubuntu-weather-app.desktop.in.in	2015-10-24 19:35:02 +0000
+++ ubuntu-weather-app.desktop.in.in	2015-11-26 02:38:41 +0000
@@ -10,4 +10,5 @@
 X-Ubuntu-Touch=true
 X-Ubuntu-Default-Department-ID=accessories
 X-Ubuntu-Splash-Color=#F5F5F5
+X-Ubuntu-Splash-Show-Header=true
 X-Ubuntu-Supported-Orientations=portrait