Merge lp:~neokore/ubuntu-weather-app/improveSheetsText into lp:ubuntu-weather-app/obsolete.trunk

Proposed by Raúl Yeguas on 2013-07-23
Status: Merged
Approved by: Martin Borho on 2013-07-24
Approved revision: 76
Merged at revision: 76
Proposed branch: lp:~neokore/ubuntu-weather-app/improveSheetsText
Merge into: lp:ubuntu-weather-app/obsolete.trunk
Diff against target: 83 lines (+17/-5)
2 files modified
components/LocationManagerSheet.qml (+7/-3)
components/SettingsSheet.qml (+10/-2)
To merge this branch: bzr merge lp:~neokore/ubuntu-weather-app/improveSheetsText
Reviewer Review Type Date Requested Status
Martin Borho 2013-07-23 Approve on 2013-07-24
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve on 2013-07-23
Review via email: mp+176521@code.launchpad.net

Commit message

Changed text color for settigns and location sheets to improve its readability.

Description of the change

Changed text color for settings and location sheets to improve its readability.
By now it's a bit tricky unless the SDK let us change this values or I learn to use themes correctly.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'components/LocationManagerSheet.qml'
2--- components/LocationManagerSheet.qml 2013-07-19 11:39:31 +0000
3+++ components/LocationManagerSheet.qml 2013-07-23 21:24:31 +0000
4@@ -34,8 +34,9 @@
5 property int initial_sum: 0
6
7 Component.onCompleted: {
8- locationsRemoved.clear()
9- loadData()
10+ locationsRemoved.clear();
11+ loadData();
12+ Theme.palette.selected.backgroundText = "#656565"
13 }
14
15 function loadData() {
16@@ -136,7 +137,8 @@
17 width: parent.width
18 clip:true
19 color:"transparent"
20- height: units.gu(40)
21+ height: units.gu(45)
22+
23 ListView {
24 objectName: "LocationList"
25 anchors.fill: parent
26@@ -210,6 +212,7 @@
27 currentLocationItem.visible = false
28 locationLookupItem.visible = true
29 lookupItemAddButton.visible = true
30+ Theme.palette.selected.backgroundText = "#f4f4e8"
31 }
32
33 onCancelClicked: {
34@@ -219,6 +222,7 @@
35 // opening the sheet
36 mainView.refreshData()
37 }
38+ Theme.palette.selected.backgroundText = "#f4f4e8"
39 }
40
41 AddLocationSheet {
42
43=== modified file 'components/SettingsSheet.qml'
44--- components/SettingsSheet.qml 2013-07-20 16:52:37 +0000
45+++ components/SettingsSheet.qml 2013-07-23 21:24:31 +0000
46@@ -22,12 +22,11 @@
47 import Ubuntu.Components.ListItems 0.1 as ListItem
48
49 Component {
50-
51 ComposerSheet {
52 id: sheet
53 objectName: "SettingsSheet"
54 title: i18n.tr("Settings")
55- contentsHeight: parent.height
56+ contentsHeight: parent.height
57
58 container: ListItem.ValueSelector {
59 id: unitsSelector
60@@ -37,6 +36,10 @@
61 selectedIndex: (settings["units"] === "imperial") ? 1 : 0;
62 }
63
64+ Component.onCompleted: {
65+ Theme.palette.selected.backgroundText = "#656565"
66+ }
67+
68 onConfirmClicked: {
69 var refresh = false,
70 selectedUnit = (unitsSelector.selectedIndex === 0) ? "metric" : "imperial";
71@@ -57,7 +60,12 @@
72 refreshData(true);
73 });
74 }
75+ Theme.palette.selected.backgroundText = "#f4f4e8"
76 PopupUtils.close(sheet)
77 }
78+
79+ onCancelClicked: {
80+ Theme.palette.selected.backgroundText = "#f4f4e8"
81+ }
82 }
83 }

Subscribers

People subscribed via source and target branches