Merge lp:~vthompson/ubuntu-weather-app/reboot-day-details-width into lp:ubuntu-weather-app

Proposed by Victor Thompson on 2015-09-13
Status: Merged
Approved by: Andrew Hayzen on 2015-10-18
Approved revision: 129
Merged at revision: 141
Proposed branch: lp:~vthompson/ubuntu-weather-app/reboot-day-details-width
Merge into: lp:ubuntu-weather-app
Diff against target: 65 lines (+9/-13)
4 files modified
app/components/DayDelegate.qml (+1/-4)
app/components/ForecastDetailsDelegate.qml (+5/-5)
app/components/HomeTempInfo.qml (+1/-4)
debian/changelog (+2/-0)
To merge this branch: bzr merge lp:~vthompson/ubuntu-weather-app/reboot-day-details-width
Reviewer Review Type Date Requested Status
Andrew Hayzen 2015-09-13 Approve on 2015-10-18
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve on 2015-10-16
Review via email: mp+270918@code.launchpad.net

Commit message

* Make the first column of the day delegate extra info wider to accommodate other languages.

Description of the change

* Make the first column of the day delegate extra info wider to accommodate other languages.

For instance, this is what the expanded info looks like in German on a Nexus 4: http://i.imgur.com/wzGeC6y.png

To post a comment you must log in.
Andrew Hayzen (ahayzen) wrote :

Can we not change the width of the left column to fill the full width, otherwise we're just gonna have the some issue when there is another language with a longer string so...

width: parent.width - icon.width - forecastValue.width

As the text is aligned right this will then work for larger displays.

review: Needs Information
Victor Thompson (vthompson) wrote :

That might look odd on larger displays. At what point in time did we align these items to the left? I thought originally we had it centered.

128. By Victor Thompson on 2015-10-16

Merge of trunk

129. By Victor Thompson on 2015-10-16

Update to include today expandable

review: Approve (continuous-integration)
Andrew Hayzen (ahayzen) wrote :

LGTM, we can investigate larger displays when we do the convergent designs

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'app/components/DayDelegate.qml'
--- app/components/DayDelegate.qml 2015-10-07 18:56:07 +0000
+++ app/components/DayDelegate.qml 2015-10-16 00:14:38 +0000
@@ -168,10 +168,7 @@
168 active: false168 active: false
169 anchors {169 anchors {
170 bottomMargin: units.gu(2)170 bottomMargin: units.gu(2)
171 left: parent.left171 horizontalCenter: parent.horizontalCenter
172 leftMargin: units.gu(2)
173 right: parent.right
174 rightMargin: units.gu(2)
175 top: mainInfo.bottom172 top: mainInfo.bottom
176 }173 }
177 asynchronous: true174 asynchronous: true
178175
=== modified file 'app/components/ForecastDetailsDelegate.qml'
--- app/components/ForecastDetailsDelegate.qml 2015-07-25 21:53:40 +0000
+++ app/components/ForecastDetailsDelegate.qml 2015-10-16 00:14:38 +0000
@@ -39,11 +39,11 @@
39 Label {39 Label {
40 id: forecastLabel40 id: forecastLabel
41 elide: Text.ElideRight41 elide: Text.ElideRight
42 width: units.gu(16)
43 }
44
45 Label {
46 id: forecastValue
42 width: units.gu(14)47 width: units.gu(14)
43 }48 }
44
45 Label {
46 id: forecastValue
47 width: units.gu(10)
48 }
49}49}
5050
=== modified file 'app/components/HomeTempInfo.qml'
--- app/components/HomeTempInfo.qml 2015-10-13 15:46:56 +0000
+++ app/components/HomeTempInfo.qml 2015-10-16 00:14:38 +0000
@@ -145,10 +145,7 @@
145 id: expandedInfo145 id: expandedInfo
146 active: false146 active: false
147 anchors {147 anchors {
148 left: parent.left148 horizontalCenter: parent.horizontalCenter
149 leftMargin: units.gu(2)
150 right: parent.right
151 rightMargin: units.gu(2)
152 top: labelColumn.bottom149 top: labelColumn.bottom
153 topMargin: units.gu(2)150 topMargin: units.gu(2)
154 }151 }
155152
=== modified file 'debian/changelog'
--- debian/changelog 2015-10-15 10:39:42 +0000
+++ debian/changelog 2015-10-16 00:14:38 +0000
@@ -26,6 +26,8 @@
26 * Add a Network Error State Component for when a connection error takes place.26 * Add a Network Error State Component for when a connection error takes place.
27 * Allow the LocationsPage to be flickable. (LP: #1490044)27 * Allow the LocationsPage to be flickable. (LP: #1490044)
28 * Make sure the text elides on the LocationsPage and the AddLocationPage. (LP: #1469460)28 * Make sure the text elides on the LocationsPage and the AddLocationPage. (LP: #1469460)
29 * Make the first column of the day delegate extra info wider to accommodate other
30 languages.
2931
30 [ Andrew Hayzen ]32 [ Andrew Hayzen ]
31 * Add mocked locations for autopilot and add a test using the data33 * Add mocked locations for autopilot and add a test using the data

Subscribers

People subscribed via source and target branches

to all changes: