Ubuntu Weather App

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

  1. reboot-uc1.3-bump
  2. Merge into reboot
Proposed by Andrew Hayzen
Status: Merged
Approved by: Victor Thompson
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
Jenkins Bot continuous-integration Approve
Bartosz Kosiorek (community) Approve
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Andrew Hayzen Abstain
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.
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

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)
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :

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 updated
155. By Andrew Hayzen

* Merge of trunk

156. By Andrew Hayzen

* Update changelog

Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :

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)
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

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)
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

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)
Revision history for this message
Andrew Hayzen (ahayzen) wrote :

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 updated
157. By Andrew Hayzen

* Tweaks to bottomEdge for autopilot

Revision history for this message
Andrew Hayzen (ahayzen) wrote :

This is now passing autopilot :-)

autopilot PASS

review: Abstain
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :

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)
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

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)
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

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)
Revision history for this message
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
Revision history for this message
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
Revision history for this message
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

Revision history for this message
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
Revision history for this message
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
lp:~ahayzen/ubuntu-weather-app/reboot-uc1.3-bump updated
158. By Andrew Hayzen

* Fix deprecate warnings and title for desktop

159. By Andrew Hayzen

* Merge of trunk

Revision history for this message
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

Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :

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)
Revision history for this message
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
Revision history for this message
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
Revision history for this message
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

Revision history for this message
Bartosz Kosiorek (gang65) wrote :

It looks perfectly for me. Thanks

review: Approve
Revision history for this message
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
lp:~ahayzen/ubuntu-weather-app/reboot-uc1.3-bump updated
160. By Andrew Hayzen

* Bump merged component

Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :

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 updated
161. By Andrew Hayzen

* Update .pot file

Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :

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 updated
162. By Andrew Hayzen

* Show header in splash to minimise slide up effect

Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :

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 updated
163. By Andrew Hayzen

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

Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :

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 updated
164. By Andrew Hayzen

* Reduce bounce animation of content when pushing a page

Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :

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 updated
165. By Andrew Hayzen

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

Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :

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 updated
166. By Andrew Hayzen

* Add extra code commentary

Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :

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)
Revision history for this message
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
=== 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 @@
19import QtLocation 5.319import QtLocation 5.3
20import QtPositioning 5.220import QtPositioning 5.2
21import QtQuick 2.421import QtQuick 2.4
22import Ubuntu.Components 1.222import Ubuntu.Components 1.3
23import "../data/WeatherApi.js" as WeatherApi23import "../data/WeatherApi.js" as WeatherApi
2424
2525
2626
=== 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 @@
17 */17 */
1818
19import QtQuick 2.419import QtQuick 2.4
20import Ubuntu.Components 1.220import Ubuntu.Components 1.3
2121
22ListItem {22ListItem {
23 id: dayDelegate23 id: dayDelegate
2424
=== 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 @@
17 */17 */
1818
19import QtQuick 2.419import QtQuick 2.4
20import Ubuntu.Components 1.220import Ubuntu.Components 1.3
2121
2222
23Column {23Column {
2424
=== 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 @@
17 */17 */
1818
19import QtQuick 2.419import QtQuick 2.4
20import Ubuntu.Components 1.220import Ubuntu.Components 1.3
21import Ubuntu.Components.ListItems 1.0 as ListItem21import Ubuntu.Components.ListItems 1.0 as ListItem
2222
23/*23/*
2424
=== 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 @@
17 */17 */
1818
19import QtQuick 2.419import QtQuick 2.4
20import Ubuntu.Components 1.220import Ubuntu.Components 1.3
2121
22Column {22Column {
23 id: fakeHeader23 id: fakeHeader
2424
25 height: units.gu(9)25 height: units.gu(6.125)
2626
27 Rectangle {27 Rectangle {
28 height: units.gu(7)28 height: units.gu(6)
29 width: parent.width29 width: parent.width
30 color: Theme.palette.normal.background30 color: Theme.palette.normal.background
31 }31 }
3232
33 Rectangle {33 Rectangle {
34 color: "#C9C9C9"34 color: "#C9C9C9"
35 height: units.gu(2)35 height: units.gu(0.125)
36 anchors.left: parent.left36 anchors.left: parent.left
37 anchors.right: parent.right37 anchors.right: parent.right
38 }38 }
3939
=== 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 @@
4141
42// FastScroll.qml42// FastScroll.qml
43import QtQuick 2.443import QtQuick 2.4
44import Ubuntu.Components 1.244import Ubuntu.Components 1.3
45import "FastScroll.js" as Sections45import "FastScroll.js" as Sections
4646
47Item {47Item {
4848
=== 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 @@
17 */17 */
1818
19import QtQuick 2.419import QtQuick 2.4
20import Ubuntu.Components 1.220import Ubuntu.Components 1.3
2121
22Row {22Row {
23 height: icon.height23 height: icon.height
2424
=== 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 @@
1818
19import QtQuick 2.419import QtQuick 2.4
20import QtQuick.Layouts 1.120import QtQuick.Layouts 1.1
21import Ubuntu.Components 1.221import Ubuntu.Components 1.3
2222
23RowLayout {23RowLayout {
24 id: headerRow24 id: headerRow
2525
=== 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 @@
17 */17 */
1818
19import QtQuick 2.419import QtQuick 2.4
20import Ubuntu.Components 1.220import Ubuntu.Components 1.3
2121
22Item {22Item {
23 height: units.gu(32)23 height: units.gu(32)
2424
=== 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 @@
17 */17 */
1818
19import QtQuick 2.419import QtQuick 2.4
20import Ubuntu.Components 1.220import Ubuntu.Components 1.3
2121
22ListView {22ListView {
23 id: homeHourly23 id: homeHourly
2424
=== 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 @@
17 */17 */
1818
19import QtQuick 2.419import QtQuick 2.4
20import Ubuntu.Components 1.220import Ubuntu.Components 1.3
21import "../components"21import "../components"
2222
2323
2424
=== 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 @@
17 */17 */
1818
19import QtQuick 2.419import QtQuick 2.4
20import Ubuntu.Components 1.220import Ubuntu.Components 1.3
2121
22Item {22Item {
23 id: homeTempInfoItem23 id: homeTempInfoItem
2424
=== 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 @@
15 */15 */
1616
17import QtQuick 2.417import QtQuick 2.4
18import Ubuntu.Components 1.218import Ubuntu.Components 1.3
1919
20CheckBox {20CheckBox {
21 checked: root.selected21 checked: root.selected
2222
=== 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 @@
17 */17 */
1818
19import QtQuick 2.419import QtQuick 2.4
20import Ubuntu.Components 1.220import Ubuntu.Components 1.3
2121
22Action {22Action {
23 id: removeAction23 id: removeAction
2424
=== 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 @@
18 */18 */
1919
20import QtQuick 2.420import QtQuick 2.4
21import Ubuntu.Components 1.221import Ubuntu.Components 1.3
2222
2323
24Item {24Item {
2525
=== 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 @@
15 */15 */
1616
17import QtQuick 2.417import QtQuick 2.4
18import Ubuntu.Components 1.218import Ubuntu.Components 1.3
19import Ubuntu.Components.ListItems 1.0 as ListItem19import Ubuntu.Components.ListItems 1.0 as ListItem
2020
2121
2222
=== 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 @@
17 */17 */
1818
19import QtQuick 2.419import QtQuick 2.4
20import Ubuntu.Components 1.220import Ubuntu.Components 1.3
2121
22Rectangle {22Rectangle {
23 id: indicator23 id: indicator
2424
=== 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 @@
17 */17 */
1818
19import QtQuick 2.419import QtQuick 2.4
20import Ubuntu.Components 1.220import Ubuntu.Components 1.3
21import "../components"21import "../components"
2222
2323
2424
=== 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 @@
17 */17 */
1818
19import QtQuick 2.419import QtQuick 2.4
20import Ubuntu.Components 1.220import Ubuntu.Components 1.3
2121
22PageHeadState {22PageHeadState {
23 id: selectionState23 id: selectionState
2424
=== 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 @@
18 */18 */
1919
20import QtQuick 2.420import QtQuick 2.4
21import Ubuntu.Components 1.221import Ubuntu.Components 1.3
2222
2323
24WeatherListView {24WeatherListView {
2525
=== 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 @@
17 */17 */
1818
19import QtQuick 2.419import QtQuick 2.4
20import Ubuntu.Components 1.220import Ubuntu.Components 1.3
21import "../components"21import "../components"
2222
2323
2424
=== 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 @@
17 */17 */
1818
19import QtQuick 2.419import QtQuick 2.4
20import Ubuntu.Components 1.220import Ubuntu.Components 1.5
21import "../components"21import "../components"
2222
2323
2424
=== 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 @@
63*/63*/
6464
65import QtQuick 2.465import QtQuick 2.4
66import Ubuntu.Components 1.266import Ubuntu.Components 1.3
6767
68Page {68Page {
69 id: page69 id: page
@@ -77,7 +77,8 @@
77 property bool reloadBottomEdgePage: true77 property bool reloadBottomEdgePage: true
7878
79 readonly property alias bottomEdgePage: edgeLoader.item79 readonly property alias bottomEdgePage: edgeLoader.item
80 readonly property bool isReady: ((bottomEdge.y === fakeHeader.height) && bottomEdgePageLoaded && edgeLoader.item.active) // CUSTOM change to flag to allow for FakeHeader height80 // FIXME: 6.125 is the header.height
81 readonly property bool isReady: ((bottomEdge.y === units.gu(6.125)) && bottomEdgePageLoaded && edgeLoader.item.active) // CUSTOM change to flag to allow for FakeHeader height
81 readonly property bool isCollapsed: (bottomEdge.y === page.height)82 readonly property bool isCollapsed: (bottomEdge.y === page.height)
82 readonly property bool bottomEdgePageLoaded: (edgeLoader.status == Loader.Ready)83 readonly property bool bottomEdgePageLoaded: (edgeLoader.status == Loader.Ready)
8384
@@ -85,7 +86,7 @@
85 property int _areaWhenExpanded: 086 property int _areaWhenExpanded: 0
8687
87 // CUSTOM properties to allow changing of color88 // CUSTOM properties to allow changing of color
88 property alias tipColor: tip.color89 property alias tipColor: tip.backgroundColor // CUSTOM color => backgroundColor
89 property alias tipLabelColor: tipLabel.color90 property alias tipLabelColor: tipLabel.color
9091
91 signal bottomEdgeReleased()92 signal bottomEdgeReleased()
@@ -108,7 +109,7 @@
108 edgeLoader.item.active = true109 edgeLoader.item.active = true
109 page.pageStack.push(edgeLoader.item)110 page.pageStack.push(edgeLoader.item)
110 if (edgeLoader.item.flickable) {111 if (edgeLoader.item.flickable) {
111 edgeLoader.item.flickable.contentY = -page.header.height112 edgeLoader.item.flickable.contentY = -units.gu(6.125) // FIXME: 6.125 is the header.height
112 edgeLoader.item.flickable.returnToBounds()113 edgeLoader.item.flickable.returnToBounds()
113 }114 }
114 if (edgeLoader.item.ready)115 if (edgeLoader.item.ready)
@@ -180,7 +181,7 @@
180 z: 1181 z: 1
181 width: tipLabel.paintedWidth + units.gu(6)182 width: tipLabel.paintedWidth + units.gu(6)
182 height: bottomEdge.tipHeight + units.gu(1)183 height: bottomEdge.tipHeight + units.gu(1)
183 color: Theme.palette.normal.overlay184 backgroundColor: Theme.palette.normal.overlay // CUSTOM color => backgroundColor
184 Label {185 Label {
185 id: tipLabel186 id: tipLabel
186187
@@ -278,7 +279,8 @@
278 left: parent.left279 left: parent.left
279 right: parent.right280 right: parent.right
280 }281 }
281 y: -fakeHeader.height + (fakeHeader.height * (page.height - bottomEdge.y)) / (page.height - fakeHeader.height)282 // FIXME: 6.125 is the header.height
283 y: -units.gu(6.125) + (units.gu(6.125) * (page.height - bottomEdge.y)) / (page.height - units.gu(6.125))
282 z: bgVisual.z + 1284 z: bgVisual.z + 1
283285
284 Behavior on y {286 Behavior on y {
@@ -294,7 +296,7 @@
294296
295 readonly property int tipHeight: units.gu(3)297 readonly property int tipHeight: units.gu(3)
296 // CUSTOM value298 // CUSTOM value
297 readonly property int pageStartY: fakeHeader.height299 readonly property int pageStartY: units.gu(6.125) // FIXME: 6.125 is the header.height
298300
299 z: 1301 z: 1
300 color: Theme.palette.normal.background302 color: Theme.palette.normal.background
@@ -318,7 +320,7 @@
318 // CUSTOM320 // CUSTOM
319 PropertyChanges {321 PropertyChanges {
320 target: fakeHeader322 target: fakeHeader
321 y: -fakeHeader.height323 y: -units.gu(6.125) // FIXME: 6.125 is the header.height
322 }324 }
323 },325 },
324 State {326 State {
@@ -366,7 +368,8 @@
366 SmoothedAnimation {368 SmoothedAnimation {
367 target: edgeLoader369 target: edgeLoader
368 property: "anchors.topMargin"370 property: "anchors.topMargin"
369 to: - units.gu(4)371 // CUSTOM make small to reduce 'bump' when pushing
372 to: -0.1 // FIXME: 6.125 is header height
370 duration: UbuntuAnimation.FastDuration373 duration: UbuntuAnimation.FastDuration
371 easing.type: Easing.Linear374 easing.type: Easing.Linear
372 }375 }
@@ -418,6 +421,9 @@
418 tip.forceActiveFocus()421 tip.forceActiveFocus()
419 }422 }
420423
424 // CUSTOM reset the topMargin for next pull
425 edgeLoader.anchors.topMargin = units.gu(6.125)
426
421 // notify427 // notify
422 page.bottomEdgeDismissed()428 page.bottomEdgeDismissed()
423429
@@ -441,14 +447,19 @@
441 id: edgeLoader447 id: edgeLoader
442448
443 asynchronous: true449 asynchronous: true
444 anchors.fill: parent450 anchors {
451 fill: parent
452 topMargin: units.gu(6.125) // CUSTOM
453 }
445 //WORKAROUND: The SDK move the page contents down to allocate space for the header we need to avoid that during the page dragging454 //WORKAROUND: The SDK move the page contents down to allocate space for the header we need to avoid that during the page dragging
455 /* // CUSTOM
446 Binding {456 Binding {
447 target: edgeLoader.status === Loader.Ready ? edgeLoader : null457 target: edgeLoader.status === Loader.Ready ? edgeLoader : null
448 property: "anchors.topMargin"458 property: "anchors.topMargin"
449 value: edgeLoader.item && edgeLoader.item.flickable ? edgeLoader.item.flickable.contentY : 0459 value: edgeLoader.item && edgeLoader.item.flickable ? edgeLoader.item.flickable.contentY : 0
450 when: !page.isReady460 when: !page.isReady
451 }461 }
462 */
452463
453 onLoaded: {464 onLoaded: {
454 tip.forceActiveFocus()465 tip.forceActiveFocus()
455466
=== 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 @@
17 */17 */
1818
19import QtQuick 2.419import QtQuick 2.4
20import Ubuntu.Components 1.220import Ubuntu.Components 1.3
2121
2222
23AbstractButton {23AbstractButton {
2424
=== 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 @@
1818
19import QtQuick 2.419import QtQuick 2.4
20import QtQuick.Layouts 1.120import QtQuick.Layouts 1.1
21import Ubuntu.Components 1.221import Ubuntu.Components 1.3
2222
23ListItem {23ListItem {
24 id: listItem24 id: listItem
2525
=== 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 @@
18 */18 */
1919
20import QtQuick 2.420import QtQuick 2.4
21import Ubuntu.Components 1.221import Ubuntu.Components 1.3
2222
23ListItemWithActions {23ListItemWithActions {
24 id: root24 id: root
2525
=== 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 @@
18 */18 */
1919
20import QtQuick 2.420import QtQuick 2.4
21import Ubuntu.Components 1.221import Ubuntu.Components 1.3
2222
2323
24ListView {24ListView {
2525
=== 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 @@
1818
19import QtQuick 2.419import QtQuick 2.4
20import Qt.labs.settings 1.020import Qt.labs.settings 1.0
21import Ubuntu.Components 1.221import Ubuntu.Components 1.3
22import "components"22import "components"
23import "data" as Data23import "data" as Data
24import "data/WeatherApi.js" as WeatherApi24import "data/WeatherApi.js" as WeatherApi
2525
=== 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 @@
17 */17 */
1818
19import QtQuick 2.419import QtQuick 2.4
20import Ubuntu.Components 1.220import Ubuntu.Components 1.3
21import Ubuntu.Components.Popups 1.021import Ubuntu.Components.Popups 1.3
22import "../components"22import "../components"
23import "../data/CitiesList.js" as Cities23import "../data/CitiesList.js" as Cities
24import "../data/WeatherApi.js" as WeatherApi24import "../data/WeatherApi.js" as WeatherApi
@@ -180,13 +180,15 @@
180180
181 ListView {181 ListView {
182 id: locationList182 id: locationList
183 anchors {
184 fill: parent
185 rightMargin: fastScroll.showing ? fastScroll.width - units.gu(1) : 0
186 topMargin: units.gu(2)
187 }
188
183 objectName: "locationList"189 objectName: "locationList"
184
185 clip: true190 clip: true
186 currentIndex: -1191 currentIndex: -1
187 anchors.fill: parent
188 anchors.rightMargin: fastScroll.showing ? fastScroll.width - units.gu(1)
189 : 0
190192
191 function getSectionText(index) {193 function getSectionText(index) {
192 return citiesModel.get(index).name.substring(0,1)194 return citiesModel.get(index).name.substring(0,1)
193195
=== 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 @@
17 */17 */
1818
19import QtQuick 2.419import QtQuick 2.4
20import Ubuntu.Components 1.220import Ubuntu.Components 1.3
21import "../components"21import "../components"
22import "../data/keys.js" as Keys22import "../data/keys.js" as Keys
2323
@@ -84,6 +84,12 @@
84 return new Date(dateData.year, dateData.month, dateData.date, dateData.hours, dateData.minutes)84 return new Date(dateData.year, dateData.month, dateData.date, dateData.hours, dateData.minutes)
85 }85 }
8686
87 // Do not show the Page Header
88 head {
89 locked: true
90 visible: false
91 }
92
87 /*93 /*
88 Background for the PageWithBottomEdge94 Background for the PageWithBottomEdge
89 */95 */
9096
=== 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 @@
17 */17 */
1818
19import QtQuick 2.419import QtQuick 2.4
20import Ubuntu.Components 1.220import Ubuntu.Components 1.3
21import Ubuntu.Components.ListItems 0.1 as ListItem21import Ubuntu.Components.ListItems 0.1 as ListItem
22import "../components"22import "../components"
23import "../data/suncalc.js" as SunCalc23import "../data/suncalc.js" as SunCalc
2424
=== 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 @@
17 */17 */
1818
19import QtQuick 2.419import QtQuick 2.4
20import Ubuntu.Components 1.220import Ubuntu.Components 1.3
21import Ubuntu.Components.ListItems 0.1 as ListItem21import Ubuntu.Components.ListItems 0.1 as ListItem
22import "../components"22import "../components"
23import "../components/ListItemActions"23import "../components/ListItemActions"
@@ -66,7 +66,7 @@
66 anchors {66 anchors {
67 fill: parent67 fill: parent
68 // TODO: Fix this offset68 // TODO: Fix this offset
69 topMargin: locationsPage.header ? -locationsPage.header.height : 069 topMargin: -units.gu(6.125) // FIXME: 6.125 is the header.height
70 }70 }
71 model: ListModel {71 model: ListModel {
72 id: locationsModel72 id: locationsModel
7373
=== 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 @@
17 */17 */
1818
19import QtQuick 2.419import QtQuick 2.4
20import Ubuntu.Components 1.220import Ubuntu.Components 1.3
21import "../components"21import "../components"
2222
23Page {23Page {
2424
=== 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 @@
17 */17 */
1818
19import QtQuick 2.419import QtQuick 2.4
20import Ubuntu.Components 1.220import Ubuntu.Components 1.3
21import "../../components"21import "../../components"
22import "../../data/keys.js" as Keys22import "../../data/keys.js" as Keys
2323
2424
=== 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 @@
17 */17 */
1818
19import QtQuick 2.419import QtQuick 2.4
20import Ubuntu.Components 1.220import Ubuntu.Components 1.3
21import Ubuntu.Components.ListItems 1.0 as ListItem21import Ubuntu.Components.ListItems 1.0 as ListItem
2222
23Page {23Page {
2424
=== 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 @@
17 */17 */
1818
19import QtQuick 2.419import QtQuick 2.4
20import Ubuntu.Components 1.220import Ubuntu.Components 1.3
21import "../../components"21import "../../components"
2222
23Page {23Page {
2424
=== 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 @@
17 */17 */
1818
19import QtQuick 2.419import QtQuick 2.4
20import Ubuntu.Components 1.220import Ubuntu.Components 1.3
21import "../../components"21import "../../components"
2222
23Page {23Page {
2424
=== 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 @@
22
3 [ Andrew Hayzen ]3 [ Andrew Hayzen ]
4 * Bump version to 3.14 * Bump version to 3.1
5 * Update app to use the Ubuntu Components version 1.3 (LP: #1508363)
56
6 [ Bartosz Kosiorek ]7 [ Bartosz Kosiorek ]
7 * Change message text according to Ubuntu UX comment (LP: #1493466)8 * Change message text according to Ubuntu UX comment (LP: #1493466)
89
=== 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 @@
1{1{
2 "architecture": "all",2 "architecture": "all",
3 "description": "A weather forecast application for Ubuntu with support for multiple online weather data sources",3 "description": "A weather forecast application for Ubuntu with support for multiple online weather data sources",
4 "framework": "ubuntu-sdk-15.04-qml",4 "framework": "ubuntu-sdk-15.04.1-qml",
5 "hooks": {5 "hooks": {
6 "weather": {6 "weather": {
7 "apparmor": "ubuntu-weather-app.apparmor",7 "apparmor": "ubuntu-weather-app.apparmor",
88
=== 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 @@
8msgstr ""8msgstr ""
9"Project-Id-Version: ubuntu-weather-app\n"9"Project-Id-Version: ubuntu-weather-app\n"
10"Report-Msgid-Bugs-To: \n"10"Report-Msgid-Bugs-To: \n"
11"POT-Creation-Date: 2015-11-09 19:59-0600\n"11"POT-Creation-Date: 2015-11-26 02:04+0000\n"
12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14"Language-Team: LANGUAGE <LL@li.org>\n"14"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -120,23 +120,23 @@
120msgid "Search city"120msgid "Search city"
121msgstr ""121msgstr ""
122122
123#: ../app/ui/AddLocationPage.qml:297123#: ../app/ui/AddLocationPage.qml:299
124msgid "No city found"124msgid "No city found"
125msgstr ""125msgstr ""
126126
127#: ../app/ui/AddLocationPage.qml:310127#: ../app/ui/AddLocationPage.qml:312
128msgid "Couldn't load weather data, please try later again!"128msgid "Couldn't load weather data, please try later again!"
129msgstr ""129msgstr ""
130130
131#: ../app/ui/AddLocationPage.qml:320131#: ../app/ui/AddLocationPage.qml:322
132msgid "Location already added."132msgid "Location already added."
133msgstr ""133msgstr ""
134134
135#: ../app/ui/AddLocationPage.qml:323135#: ../app/ui/AddLocationPage.qml:325
136msgid "OK"136msgid "OK"
137msgstr ""137msgstr ""
138138
139#: ../app/ui/HomePage.qml:31 ../app/ui/LocationsPage.qml:29139#: ../app/ui/HomePage.qml:32 ../app/ui/LocationsPage.qml:29
140msgid "Locations"140msgid "Locations"
141msgstr ""141msgstr ""
142142
143143
=== 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 @@
85 self.bottomEdgePageLoaded.wait_for(True)85 self.bottomEdgePageLoaded.wait_for(True)
8686
87 try:87 try:
88 action_item = self.wait_select_single(objectName='bottomEdgeTip')88 action_item = self.wait_select_single("UCUbuntuShape",
89 objectName='bottomEdgeTip')
89 action_item.visible.wait_for(True)90 action_item.visible.wait_for(True)
91
92 # Pick the middle horizontally and vertically of the bottomEdgeTip
90 start_x = (action_item.globalRect.x +93 start_x = (action_item.globalRect.x +
91 (action_item.globalRect.width * 0.5))94 (action_item.globalRect.width * 0.5))
92 start_y = action_item.globalRect.y95 start_y = (action_item.globalRect.y +
96 (action_item.globalRect.height * 0.5))
93 stop_y = start_y - (self.height * 0.7)97 stop_y = start_y - (self.height * 0.7)
98
94 self.pointing_device.drag(start_x, start_y,99 self.pointing_device.drag(start_x, start_y,
95 start_x, stop_y, rate=2)100 start_x, stop_y, rate=2)
96 self.isReady.wait_for(True)101 self.isReady.wait_for(True)
@@ -130,7 +135,7 @@
130 return header.select_single("TextField", objectName="searchField")135 return header.select_single("TextField", objectName="searchField")
131136
132 def is_empty_label_visible(self):137 def is_empty_label_visible(self):
133 return self.select_single("Label", objectName="noCity").visible138 return self.select_single("UCLabel", objectName="noCity").visible
134139
135 def search(self, value):140 def search(self, value):
136 self.click_search_action()141 self.click_search_action()
@@ -226,7 +231,7 @@
226231
227 def get_settings_button(self):232 def get_settings_button(self):
228 return self.select_single(233 return self.select_single(
229 "AbstractButton", objectName="settingsButton")234 "UCAbstractButton", objectName="settingsButton")
230235
231236
232class LocationsPage(Page):237class LocationsPage(Page):
@@ -308,7 +313,7 @@
308313
309class WeatherListItem(UbuntuUIToolkitCustomProxyObjectBase):314class WeatherListItem(UbuntuUIToolkitCustomProxyObjectBase):
310 def get_name(self):315 def get_name(self):
311 return self.select_single("Label", objectName="name").text316 return self.select_single("UCLabel", objectName="name").text
312317
313 @click_object318 @click_object
314 def select_remove(self):319 def select_remove(self):
315320
=== 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 @@
10X-Ubuntu-Touch=true10X-Ubuntu-Touch=true
11X-Ubuntu-Default-Department-ID=accessories11X-Ubuntu-Default-Department-ID=accessories
12X-Ubuntu-Splash-Color=#F5F5F512X-Ubuntu-Splash-Color=#F5F5F5
13X-Ubuntu-Splash-Show-Header=true
13X-Ubuntu-Supported-Orientations=portrait14X-Ubuntu-Supported-Orientations=portrait

Subscribers

People subscribed via source and target branches

to all changes: