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

Proposed by Victor Thompson on 2015-06-05
Status: Merged
Approved by: Andrew Hayzen on 2015-06-09
Approved revision: 51
Merged at revision: 49
Proposed branch: lp:~vthompson/ubuntu-weather-app/reboot-current-location-ui-changes
Merge into: lp:ubuntu-weather-app
Prerequisite: lp:~vthompson/ubuntu-weather-app/reboot-manage-current-location
Diff against target: 81 lines (+30/-6)
2 files modified
app/ui/LocationsPage.qml (+25/-5)
po/com.ubuntu.weather.pot (+5/-1)
To merge this branch: bzr merge lp:~vthompson/ubuntu-weather-app/reboot-current-location-ui-changes
Reviewer Review Type Date Requested Status
Andrew Hayzen 2015-06-05 Approve on 2015-06-09
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve on 2015-06-05
Review via email: mp+261299@code.launchpad.net

Commit message

Update LocationsPage layout to better match the design spec.

Description of the change

Update LocationsPage layout to better match the design spec.

To post a comment you must log in.
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

Andrew Hayzen (ahayzen) wrote :

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
87 rightMargin: units.gu(2)87 rightMargin: units.gu(2)
88 }88 }
8989
90 Label {90 Column {
91 id: locationName
92 anchors {91 anchors {
93 left: parent.left92 left: parent.left
94 right: weatherImage.visible ? weatherImage.left : parent.right93 right: weatherImage.visible ? weatherImage.left : parent.right
95 rightMargin: units.gu(1)94 rightMargin: units.gu(1)
96 verticalCenter: parent.verticalCenter95 verticalCenter: parent.verticalCenter
97 }96 }
98 elide: Text.ElideRight97
99 text: name98 Label {
99 id: locationName
100 elide: Text.ElideRight
101 fontSize: "medium"
102 text: index != 0 ? name : i18n.tr("Current Location")
103 }
104 Label {
105 id: locationName2
106 color: UbuntuColors.lightGrey
107 elide: Text.ElideRight
108 fontSize: "small"
109 font.weight: Font.Light
110 text: index != 0 ? (adminName1 == name ? countryName : adminName1)
111 : name + ", " + (adminName1 == name ? countryName : adminName1)
112 }
100 }113 }
101114
102 Icon {115 Icon {
103 id: weatherImage116 id: weatherImage
104 anchors.centerIn: parent117 anchors {
118 right: parent.right
119 rightMargin: units.gu(12)
120 verticalCenter: parent.verticalCenter
121 }
105 name: icon122 name: icon
106 height: units.gu(3)123 height: units.gu(3)
107 width: units.gu(3)124 width: units.gu(3)
@@ -143,6 +160,9 @@
143 data = weatherApp.locationsList[i];160 data = weatherApp.locationsList[i];
144 loc = {161 loc = {
145 "name": data.location.name,162 "name": data.location.name,
163 "adminName1": data.location.adminName1,
164 "areaLabel": data.location.areaLabel,
165 "countryName": data.location.countryName,
146 "temp": Math.round(data.data[0].current[tempUnits].temp).toString(),166 "temp": Math.round(data.data[0].current[tempUnits].temp).toString(),
147 "icon": iconMap[data.data[0].current.icon]167 "icon": iconMap[data.data[0].current.icon]
148 }168 }
149169
=== 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 @@
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-05-29 05:21+0100\n"11"POT-Creation-Date: 2015-06-05 18:04-0500\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"
@@ -102,6 +102,10 @@
102msgid "Locations"102msgid "Locations"
103msgstr ""103msgstr ""
104104
105#: ../app/ui/LocationsPage.qml:102
106msgid "Current Location"
107msgstr ""
108
105#: ../app/ui/SettingsPage.qml:24109#: ../app/ui/SettingsPage.qml:24
106msgid "Settings"110msgid "Settings"
107msgstr ""111msgstr ""

Subscribers

People subscribed via source and target branches

to all changes: