Merge lp:~vthompson/ubuntu-weather-app/reboot-current-location-ui-changes into lp:ubuntu-weather-app

[Victor Thompson]

Update LocationsPage layout to better match the design spec.

Update LocationsPage layout to better match the design spec.

[lp:~vthompson/ubuntu-weather-app/reboot-current-location-ui-changes]

50. By Victor Thompson on 2015-06-05

Merge of prereq branch and resolve conflict.

51. By Victor Thompson on 2015-06-05

Make secondary label lighter in color

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

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

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

review: Approve (continuous-integration)

[Andrew Hayzen (ahayzen)]

LGTM, as discussed we'll attempt to make the 'current' location non-removable/reorderable/multiselectable either by moving into another view/component or within the view itself. This will be investigated after moving to the new listitems.

review: Approve

=== modified file 'app/ui/LocationsPage.qml'
--- app/ui/LocationsPage.qml	2015-06-05 23:16:06 +0000
+++ app/ui/LocationsPage.qml	2015-06-05 23:16:07 +0000
@@ -87,21 +87,38 @@
                     rightMargin: units.gu(2)
                 }
 
-                Label {
-                    id: locationName
+                Column {
                     anchors {
                         left: parent.left
                         right: weatherImage.visible ? weatherImage.left : parent.right
                         rightMargin: units.gu(1)
                         verticalCenter: parent.verticalCenter
                     }
-                    elide: Text.ElideRight
-                    text: name
+
+                    Label {
+                        id: locationName
+                        elide: Text.ElideRight
+                        fontSize: "medium"
+                        text: index != 0 ? name : i18n.tr("Current Location")
+                    }
+                    Label {
+                        id: locationName2
+                        color: UbuntuColors.lightGrey
+                        elide: Text.ElideRight
+                        fontSize: "small"
+                        font.weight: Font.Light
+                        text: index != 0 ? (adminName1 == name ? countryName : adminName1)
+                                         : name + ", " + (adminName1 == name ? countryName : adminName1)
+                    }
                 }
 
                 Icon {
                     id: weatherImage
-                    anchors.centerIn: parent
+                    anchors {
+                        right: parent.right
+                        rightMargin: units.gu(12)
+                        verticalCenter: parent.verticalCenter
+                    }
                     name: icon
                     height: units.gu(3)
                     width: units.gu(3)
@@ -143,6 +160,9 @@
             data = weatherApp.locationsList[i];
             loc = {
                 "name": data.location.name,
+                "adminName1": data.location.adminName1,
+                "areaLabel": data.location.areaLabel,
+                "countryName": data.location.countryName,
                 "temp": Math.round(data.data[0].current[tempUnits].temp).toString(),
                 "icon": iconMap[data.data[0].current.icon]
             }
 
=== modified file 'po/com.ubuntu.weather.pot'
--- po/com.ubuntu.weather.pot	2015-06-03 17:49:50 +0000
+++ po/com.ubuntu.weather.pot	2015-06-05 23:16:07 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: ubuntu-weather-app\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-05-29 05:21+0100\n"
+"POT-Creation-Date: 2015-06-05 18:04-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -102,6 +102,10 @@
 msgid "Locations"
 msgstr ""
 
+#: ../app/ui/LocationsPage.qml:102
+msgid "Current Location"
+msgstr ""
+
 #: ../app/ui/SettingsPage.qml:24
 msgid "Settings"
 msgstr ""