Merge lp:~vthompson/ubuntu-weather-app/fix-1469460 into lp:ubuntu-weather-app

Proposed by Victor Thompson on 2015-08-28
Status: Merged
Approved by: Andrew Hayzen on 2015-09-14
Approved revision: 113
Merged at revision: 123
Proposed branch: lp:~vthompson/ubuntu-weather-app/fix-1469460
Merge into: lp:ubuntu-weather-app
Diff against target: 76 lines (+8/-1)
3 files modified
app/ui/AddLocationPage.qml (+2/-0)
app/ui/LocationsPage.qml (+5/-1)
debian/changelog (+1/-0)
To merge this branch: bzr merge lp:~vthompson/ubuntu-weather-app/fix-1469460
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve on 2015-09-11
Andrew Hayzen 2015-08-28 Approve on 2015-09-10
Review via email: mp+269451@code.launchpad.net

Commit message

* Make sure the text elides on the LocationsPage and the AddLocationPage.

Description of the change

* Make sure the text elides on the LocationsPage and the AddLocationPage.

This was taken from the blocked ListItems branch and improved to also elide for Current location and AddLocationPage ListItems.

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

The current location width seems to be to big, causing it to elide over the icon unlike the others. Also should this be added to the AddLocationPage delegates?

review: Needs Information
Andrew Hayzen (ahayzen) wrote :

LGTM :-)

review: Approve
113. By Victor Thompson on 2015-09-10

Merge and resolve conflicts.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'app/ui/AddLocationPage.qml'
2--- app/ui/AddLocationPage.qml 2015-08-11 00:58:15 +0000
3+++ app/ui/AddLocationPage.qml 2015-09-10 23:44:17 +0000
4@@ -236,6 +236,7 @@
5 elide: Text.ElideRight
6 fontSize: "medium"
7 text: name
8+ width: parent.width
9 }
10
11 Label {
12@@ -243,6 +244,7 @@
13 elide: Text.ElideRight
14 fontSize: "xx-small"
15 text: areaLabel
16+ width: parent.width
17 }
18 }
19
20
21=== modified file 'app/ui/LocationsPage.qml'
22--- app/ui/LocationsPage.qml 2015-09-05 22:50:32 +0000
23+++ app/ui/LocationsPage.qml 2015-09-10 23:44:17 +0000
24@@ -89,7 +89,7 @@
25 anchors {
26 left: parent.left
27 right: currentWeatherImage.left
28- rightMargin: units.gu(1)
29+ rightMargin: units.gu(3)
30 verticalCenter: parent.verticalCenter
31 }
32
33@@ -104,6 +104,7 @@
34 elide: Text.ElideRight
35 fontSize: "medium"
36 text: i18n.tr("Current Location")
37+ width: parent.width
38 }
39 Label {
40 id: currentLocationName2
41@@ -118,6 +119,7 @@
42 fontSize: "small"
43 font.weight: Font.Light
44 text: name + ", " + (adminName1 == name ? countryName : adminName1)
45+ width: parent.width
46 }
47 }
48
49@@ -204,6 +206,7 @@
50 elide: Text.ElideRight
51 fontSize: "medium"
52 text: name
53+ width: parent.width
54 }
55 Label {
56 id: locationName2
57@@ -212,6 +215,7 @@
58 fontSize: "small"
59 font.weight: Font.Light
60 text: adminName1 == name ? countryName : adminName1
61+ width: parent.width
62 }
63 }
64
65
66=== modified file 'debian/changelog'
67--- debian/changelog 2015-09-05 22:54:51 +0000
68+++ debian/changelog 2015-09-10 23:44:17 +0000
69@@ -25,6 +25,7 @@
70 * Get the condition text to be translated from the OWM API. (LP: #1487793)
71 * Add a Network Error State Component for when a connection error takes place.
72 * Allow the LocationsPage to be flickable. (LP: #1490044)
73+ * Make sure the text elides on the LocationsPage and the AddLocationPage. (LP: #1469460)
74
75 [ Andrew Hayzen ]
76 * Add mocked locations for autopilot and add a test using the data

Subscribers

People subscribed via source and target branches

to all changes: