Merge lp:~ahayzen/ubuntu-weather-app/transparent-legacy-listitems into lp:ubuntu-weather-app

[Andrew Hayzen]

* Set PageWithBottomEdge.qml background colour to match
* Make the listitems transparent so that they don't appear white on the LocationsPage

* Set PageWithBottomEdge.qml background colour to match
* Make the listitems transparent so that they don't appear white on the LocationsPage

[lp:~ahayzen/ubuntu-weather-app/transparent-legacy-listitems]

130. By Andrew Hayzen on 2015-09-29

* Fix for typo

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

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

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

review: Approve (continuous-integration)

[Victor Thompson (vthompson)]

The background color of the page with bottom edge doesn't seem to be the same color as the main app. Shouldn't we adjust that to be white as well?

review: Needs Information

[Victor Thompson (vthompson)]

The difference in color is rather hard to notice on the device, so let's stick with the update as proposed in this mp. LGTM!

review: Approve

=== modified file 'app/components/PageWithBottomEdge.qml'
--- app/components/PageWithBottomEdge.qml	2015-06-18 01:45:57 +0000
+++ app/components/PageWithBottomEdge.qml	2015-09-29 16:20:24 +0000
@@ -273,7 +273,7 @@
         readonly property int pageStartY: 0
 
         z: 1
-        color: Theme.palette.normal.background
+        color: weatherApp.backgroundColor
         clip: true
         anchors {
             left: parent.left

=== modified file 'app/components/WeatherListItem.qml'
--- app/components/WeatherListItem.qml	2015-06-21 15:02:05 +0000
+++ app/components/WeatherListItem.qml	2015-09-29 16:20:24 +0000
@@ -22,6 +22,7 @@
 
 ListItemWithActions {
     id: root
+    color: "transparent"
 
     property int listItemIndex: index
     property bool multiselectable: false

=== modified file 'debian/changelog'
--- debian/changelog	2015-09-14 19:59:26 +0000
+++ debian/changelog	2015-09-29 16:20:24 +0000
@@ -47,6 +47,7 @@
   * Fix for wind test failing and some selects not waiting for visible=True (LP: #1492321)
   * Add LocationPane helper to the autopilot tests
   * Various tidy ups to improve readability and code commentary of autopilot code
+  * ListItem transparent and PageWithBottomEdge colour correct so that they don't appear white on the LocationsPage
 
   [ Carla Sella ]
   * Create autopilot test which shows the day delegate (LP: #1452491)

=== modified file 'po/com.ubuntu.weather.pot'
--- po/com.ubuntu.weather.pot	2015-08-28 21:54:22 +0000
+++ po/com.ubuntu.weather.pot	2015-09-29 16:20:24 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: ubuntu-weather-app\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-28 16:51-0500\n"
+"POT-Creation-Date: 2015-09-29 17:15+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -18,31 +18,31 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: ../app/components/DayDelegateExtraInfo.qml:45
+#: ../app/components/DayDelegateExtraInfo.qml:51
 msgid "Chance of rain"
 msgstr ""
 
-#: ../app/components/DayDelegateExtraInfo.qml:52
+#: ../app/components/DayDelegateExtraInfo.qml:58
 msgid "Winds"
 msgstr ""
 
-#: ../app/components/DayDelegateExtraInfo.qml:60
+#: ../app/components/DayDelegateExtraInfo.qml:67
 msgid "UV Index"
 msgstr ""
 
-#: ../app/components/DayDelegateExtraInfo.qml:66
+#: ../app/components/DayDelegateExtraInfo.qml:73
 msgid "Pollen"
 msgstr ""
 
-#: ../app/components/DayDelegateExtraInfo.qml:73
+#: ../app/components/DayDelegateExtraInfo.qml:80
 msgid "Humidity"
 msgstr ""
 
-#: ../app/components/DayDelegateExtraInfo.qml:80
+#: ../app/components/DayDelegateExtraInfo.qml:87
 msgid "Sunrise"
 msgstr ""
 
-#: ../app/components/DayDelegateExtraInfo.qml:87
+#: ../app/components/DayDelegateExtraInfo.qml:94
 msgid "Sunset"
 msgstr ""
 
@@ -110,23 +110,23 @@
 msgid "Search city"
 msgstr ""
 
-#: ../app/ui/AddLocationPage.qml:295
+#: ../app/ui/AddLocationPage.qml:297
 msgid "No city found"
 msgstr ""
 
-#: ../app/ui/AddLocationPage.qml:308
+#: ../app/ui/AddLocationPage.qml:310
 msgid "Couldn't load weather data, please try later again!"
 msgstr ""
 
-#: ../app/ui/AddLocationPage.qml:318
+#: ../app/ui/AddLocationPage.qml:320
 msgid "Location already added."
 msgstr ""
 
-#: ../app/ui/AddLocationPage.qml:321
+#: ../app/ui/AddLocationPage.qml:323
 msgid "OK"
 msgstr ""
 
-#: ../app/ui/HomePage.qml:31 ../app/ui/LocationsPage.qml:31
+#: ../app/ui/HomePage.qml:31 ../app/ui/LocationsPage.qml:29
 msgid "Locations"
 msgstr ""