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
1=== modified file 'app/components/DayDelegate.qml'
2--- app/components/DayDelegate.qml 2015-10-07 18:56:07 +0000
3+++ app/components/DayDelegate.qml 2015-10-16 00:14:38 +0000
4@@ -168,10 +168,7 @@
5 active: false
6 anchors {
7 bottomMargin: units.gu(2)
8- left: parent.left
9- leftMargin: units.gu(2)
10- right: parent.right
11- rightMargin: units.gu(2)
12+ horizontalCenter: parent.horizontalCenter
13 top: mainInfo.bottom
14 }
15 asynchronous: true
16
17=== modified file 'app/components/ForecastDetailsDelegate.qml'
18--- app/components/ForecastDetailsDelegate.qml 2015-07-25 21:53:40 +0000
19+++ app/components/ForecastDetailsDelegate.qml 2015-10-16 00:14:38 +0000
20@@ -39,11 +39,11 @@
21 Label {
22 id: forecastLabel
23 elide: Text.ElideRight
24+ width: units.gu(16)
25+ }
26+
27+ Label {
28+ id: forecastValue
29 width: units.gu(14)
30 }
31-
32- Label {
33- id: forecastValue
34- width: units.gu(10)
35- }
36 }
37
38=== modified file 'app/components/HomeTempInfo.qml'
39--- app/components/HomeTempInfo.qml 2015-10-13 15:46:56 +0000
40+++ app/components/HomeTempInfo.qml 2015-10-16 00:14:38 +0000
41@@ -145,10 +145,7 @@
42 id: expandedInfo
43 active: false
44 anchors {
45- left: parent.left
46- leftMargin: units.gu(2)
47- right: parent.right
48- rightMargin: units.gu(2)
49+ horizontalCenter: parent.horizontalCenter
50 top: labelColumn.bottom
51 topMargin: units.gu(2)
52 }
53
54=== modified file 'debian/changelog'
55--- debian/changelog 2015-10-15 10:39:42 +0000
56+++ debian/changelog 2015-10-16 00:14:38 +0000
57@@ -26,6 +26,8 @@
58 * Add a Network Error State Component for when a connection error takes place.
59 * Allow the LocationsPage to be flickable. (LP: #1490044)
60 * Make sure the text elides on the LocationsPage and the AddLocationPage. (LP: #1469460)
61+ * Make the first column of the day delegate extra info wider to accommodate other
62+ languages.
63
64 [ Andrew Hayzen ]
65 * Add mocked locations for autopilot and add a test using the data

Subscribers

People subscribed via source and target branches

to all changes: