Merge lp:~martin-borho/ubuntu-weather-app/1363023-header-overlay-textcolor into lp:ubuntu-weather-app/obsolete.trunk

Proposed by Martin Borho on 2014-08-29
Status: Merged
Approved by: Alan Pope 🍺🐧🐱 πŸ¦„ on 2014-09-05
Approved revision: 344
Merged at revision: 358
Proposed branch: lp:~martin-borho/ubuntu-weather-app/1363023-header-overlay-textcolor
Merge into: lp:ubuntu-weather-app/obsolete.trunk
Prerequisite: lp:~martin-borho/ubuntu-weather-app/pagestack
Diff against target: 99 lines (+9/-11)
4 files modified
components/LocationManagerPage.qml (+0/-4)
components/LocationTab.qml (+1/-1)
components/SettingsPage.qml (+0/-3)
ubuntu-weather-app.qml (+8/-3)
To merge this branch: bzr merge lp:~martin-borho/ubuntu-weather-app/1363023-header-overlay-textcolor
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve on 2014-09-05
Ubuntu Weather Developers 2014-08-29 Pending
Review via email: mp+232698@code.launchpad.net

Commit message

Fixed text color of the header overlay menus.

Description of the change

Fixed text color of the header overlay menus.

To post a comment you must log in.

Looks like we need a merge to trunk..

343. By Martin Borho on 2014-09-05

merged from parent branch

344. By Martin Borho on 2014-09-05

merged from trunk

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'components/LocationManagerPage.qml'
2--- components/LocationManagerPage.qml 2014-09-04 17:20:53 +0000
3+++ components/LocationManagerPage.qml 2014-09-05 10:04:44 +0000
4@@ -66,8 +66,6 @@
5 lookupItemAddButton.visible = true
6 mainView.shortCutsLimited = false;
7 if(locationModel.count > 0) {
8- // reset text color
9- Theme.palette.selected.backgroundText = "#f4f4e8"
10 popFromStack(refresh)
11 }
12 }
13@@ -77,13 +75,11 @@
14 mainView.shortCutsLimited = true;
15 locationsRemoved.clear();
16 loadData();
17- Theme.palette.selected.backgroundText = "#656565"
18 }
19
20 Connections { target: mainView; onEscapeKey: popFromStack()}
21
22 function popFromStack(refresh) {
23- Theme.palette.selected.backgroundText = "#f3f3e7"
24 pageStack.pop()
25 // refresh at least from storage, to prevent header content from disapearing
26 refreshData(!refresh, refresh);
27
28=== modified file 'components/LocationTab.qml'
29--- components/LocationTab.qml 2014-09-02 07:21:28 +0000
30+++ components/LocationTab.qml 2014-09-05 10:04:44 +0000
31@@ -127,7 +127,7 @@
32 isLeaf: true
33 anchors.fill: parent
34 anchors.topMargin: units.gu(9.5)
35-
36+ head.foregroundColor: "#FFFFFF"
37 head.actions: [
38 Action {
39 id: refreshAction
40
41=== modified file 'components/SettingsPage.qml'
42--- components/SettingsPage.qml 2014-08-16 18:15:01 +0000
43+++ components/SettingsPage.qml 2014-09-05 10:04:44 +0000
44@@ -49,7 +49,6 @@
45 Connections { target: mainView; onEscapeKey: popFromStack()}
46
47 function popFromStack() {
48- Theme.palette.selected.backgroundText = "#f3f3e7"
49 pageStack.pop()
50 }
51
52@@ -78,8 +77,6 @@
53 fillWindSelector();
54 fillPrecipSelector();
55 mainView.shortCutsLimited = true;
56- Theme.palette.selected.backgroundText = "#656565"
57- //Theme.palette.selected.background = "#656565"
58 }
59
60 Rectangle {
61
62=== modified file 'ubuntu-weather-app.qml'
63--- ubuntu-weather-app.qml 2014-09-04 20:26:16 +0000
64+++ ubuntu-weather-app.qml 2014-09-05 10:04:44 +0000
65@@ -167,12 +167,15 @@
66 locBeforeLen = locationsList.length,
67 focusToLast = (locBeforeLen > 0 && locLength > locBeforeLen) ? true : false;
68 refresh.visible = false;
69+
70+ // assure the right color is set again after reload, see refresh()
71+ Theme.palette.selected.backgroundText = "#656565";
72+
73 // show locationmanager when no location is added
74 if(locLength === 0) {
75 showLocationManager()
76 return;
77- }
78-
79+ }
80 locationsList = locations;
81 if(tabsObject !== null) {
82 tabsObject.destroy()
83@@ -200,6 +203,8 @@
84 storage.getLocations(buildTabs);
85 } else {
86 storage.getLocations(function(locations) {
87+ // set this color temporary to white, to keep sandwich icon white until tabs are rebuild
88+ Theme.palette.selected.backgroundText = "#FFFFFF";
89 WeatherApi.sendRequest({
90 action: "updateData",
91 params: {
92@@ -226,7 +231,7 @@
93 //storage.clearDB();
94 //storage.clearSetting('units');
95
96- //Theme.palette.selected.backgroundText = "#000000";
97+ Theme.palette.selected.backgroundText = "#656565";
98 Theme.palette.normal.backgroundText = "#FFFFFF";
99 Theme.palette.normal.background = "#ECECEC"
100

Subscribers

People subscribed via source and target branches