Merge lp:~mterry/dialer-app/no-ubuntu-colors into lp:dialer-app

Proposed by Michael Terry on 2016-06-14
Status: Needs review
Proposed branch: lp:~mterry/dialer-app/no-ubuntu-colors
Merge into: lp:dialer-app
Diff against target: 378 lines (+31/-38)
17 files modified
src/qml/DialerPage/CallButton.qml (+2/-2)
src/qml/DialerPage/CustomButton.qml (+1/-1)
src/qml/DialerPage/DialerPage.qml (+2/-2)
src/qml/DialerPage/KeypadButton.qml (+2/-2)
src/qml/DialerPage/KeypadEntry.qml (+3/-3)
src/qml/Dialogs/DisableFlightModeDialog.qml (+1/-2)
src/qml/Dialogs/NoDefaultSIMCardDialog.qml (+1/-3)
src/qml/Dialogs/NotificationDialog.qml (+0/-1)
src/qml/Dialogs/SetDefaultSIMCardDialog.qml (+1/-2)
src/qml/Dialogs/SimLockedDialog.qml (+3/-3)
src/qml/HistoryPage/HistoryDelegate.qml (+1/-1)
src/qml/HistoryPage/HistoryDetailsPage.qml (+2/-2)
src/qml/HistoryPage/SwipeItemDemo.qml (+2/-2)
src/qml/LiveCallPage/ConferenceCallDisplay.qml (+3/-3)
src/qml/LiveCallPage/HangupButton.qml (+2/-4)
src/qml/LiveCallPage/LiveCall.qml (+4/-4)
src/qml/LiveCallPage/MultiCallDisplay.qml (+1/-1)
To merge this branch: bzr merge lp:~mterry/dialer-app/no-ubuntu-colors
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Pending
Ubuntu Phablet Team 2016-06-14 Pending
Review via email: mp+297412@code.launchpad.net

Commit message

Fix colors to use theme colors more consistently.

Description of the change

See bug 1581047 for full rationale.

Here is a list of potentially noticeable changes:

- Orange buttons are now green.
- Some less important buttons that were orange are now neutral grey: DisableFlightModeDialog cancel, NoDefaultSIMCardDialog no and later, NotificationDialog close, and SetDefaultSIMCardDialog no.
- Call button went from a dark green to theme green.
- Hangup button no longer changes to half-opacity orange when pressed. Instead it simply changes to half-opacity theme red. Didn't seem necessary to also change color on top of opacity when pressing.
- KeypadEntry cursor went from orange to blue, the new theme color for text cursors.
- Unrelated to color, but I was right there, so... SimLockedDialog's Ok button is now spelled OK. (OK and Okay are words, Ok is not.)

And some less noticeable changes:

- Simply switching hard-coded names to theme equivalents (like darkGrey to backgroundSecondaryColor; same color, new name)
- Small changes like off-brand "red" to theme red

To post a comment you must log in.
532. By Michael Terry on 2016-06-15

Don't change color of button sublabels

Unmerged revisions

532. By Michael Terry on 2016-06-15

Don't change color of button sublabels

531. By Michael Terry on 2016-06-14

Don't use UbuntuColors

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/qml/DialerPage/CallButton.qml'
2--- src/qml/DialerPage/CallButton.qml 2015-09-07 15:40:45 +0000
3+++ src/qml/DialerPage/CallButton.qml 2016-06-15 13:28:04 +0000
4@@ -22,7 +22,7 @@
5 AbstractButton {
6 id: button
7
8- readonly property string defaultColor: "#0F8B21"
9+ readonly property string defaultColor: theme.palette.normal.positive
10 property alias iconRotation: icon.rotation
11 property alias color: shape.color
12
13@@ -49,7 +49,7 @@
14 width: units.gu(3)
15 height: units.gu(3)
16 name: "call-start"
17- color: "white"
18+ color: theme.palette.normal.positiveText
19 z: 1
20 }
21 }
22
23=== modified file 'src/qml/DialerPage/CustomButton.qml'
24--- src/qml/DialerPage/CustomButton.qml 2015-09-07 15:40:45 +0000
25+++ src/qml/DialerPage/CustomButton.qml 2016-06-15 13:28:04 +0000
26@@ -27,7 +27,7 @@
27 Icon {
28 id: buttonIcon
29 anchors.centerIn: parent
30- color: UbuntuColors.darkGrey
31+ color: theme.palette.normal.backgroundSecondaryText
32 }
33 color: "transparent"
34 }
35
36=== modified file 'src/qml/DialerPage/DialerPage.qml'
37--- src/qml/DialerPage/DialerPage.qml 2016-04-29 21:29:29 +0000
38+++ src/qml/DialerPage/DialerPage.qml 2016-06-15 13:28:04 +0000
39@@ -377,7 +377,7 @@
40 bottomMargin: units.gu(1)
41 }
42 text: contactWatcher.isUnknown ? "" : contactWatcher.alias
43- color: UbuntuColors.darkGrey
44+ color: theme.palette.normal.backgroundSecondaryText
45 opacity: text != "" ? 1 : 0
46 fontSize: "small"
47 Behavior on opacity {
48@@ -495,7 +495,7 @@
49 PropertyAction {
50 target: callButton
51 property: "color"
52- value: "red"
53+ value: theme.palette.normal.negative
54 }
55
56 ParallelAnimation {
57
58=== modified file 'src/qml/DialerPage/KeypadButton.qml'
59--- src/qml/DialerPage/KeypadButton.qml 2015-09-07 15:40:45 +0000
60+++ src/qml/DialerPage/KeypadButton.qml 2016-06-15 13:28:04 +0000
61@@ -71,7 +71,7 @@
62 height: paintedHeight
63 font.pixelSize: units.dp(30)
64 verticalAlignment: Text.AlignTop
65- color: UbuntuColors.darkGrey
66+ color: theme.palette.normal.backgroundSecondaryText
67 }
68
69 Label {
70@@ -82,7 +82,7 @@
71 anchors.horizontalCenter: parent.horizontalCenter
72 horizontalAlignment: Text.AlignHCenter
73 fontSize: "x-small"
74- color: UbuntuColors.darkGrey
75+ color: theme.palette.normal.backgroundSecondaryText
76 }
77
78 Icon {
79
80=== modified file 'src/qml/DialerPage/KeypadEntry.qml'
81--- src/qml/DialerPage/KeypadEntry.qml 2016-04-29 21:10:46 +0000
82+++ src/qml/DialerPage/KeypadEntry.qml 2016-06-15 13:28:04 +0000
83@@ -102,7 +102,7 @@
84 horizontalAlignment: (text.length < 19 ? TextInput.AlignHCenter : TextInput.AlignRight)
85 font.pixelSize: maximumFontSize
86 font.family: "Ubuntu"
87- color: UbuntuColors.darkGrey
88+ color: theme.palette.normal.backgroundSecondaryText
89 focus: false
90 cursorVisible: true
91 clip: true
92@@ -117,7 +117,7 @@
93 anchors.top: parent.top
94 anchors.bottom: parent.bottom
95 width: units.dp(3)
96- color: "#DD4814"
97+ color: theme.palette.normal.positionText
98 visible: input.text !== ""
99 }
100
101@@ -158,7 +158,7 @@
102 text: ""
103 font.pixelSize: input.maximumFontSize
104 fontSizeMode: Text.HorizontalFit
105- color: UbuntuColors.darkGrey
106+ color: theme.palette.normal.backgroundSecondaryText
107 opacity: 0.9
108 horizontalAlignment: Text.AlignHCenter
109 }
110
111=== modified file 'src/qml/Dialogs/DisableFlightModeDialog.qml'
112--- src/qml/Dialogs/DisableFlightModeDialog.qml 2015-09-07 15:40:45 +0000
113+++ src/qml/Dialogs/DisableFlightModeDialog.qml 2016-06-15 13:28:04 +0000
114@@ -36,7 +36,6 @@
115 Button {
116 objectName: "disableFlightModeDialogCancelButton"
117 text: i18n.tr("Cancel")
118- color: UbuntuColors.orange
119 onClicked: {
120 PopupUtils.close(dialogue)
121 Qt.inputMethod.hide()
122@@ -45,7 +44,7 @@
123 Button {
124 objectName: "disableFlightModeDialogDisableButton"
125 text: i18n.tr("Disable")
126- color: UbuntuColors.orange
127+ color: theme.palette.normal.positive
128 onClicked: {
129 telepathyHelper.flightMode = false
130 PopupUtils.open(flightModeProgressDialog, mainView, {})
131
132=== modified file 'src/qml/Dialogs/NoDefaultSIMCardDialog.qml'
133--- src/qml/Dialogs/NoDefaultSIMCardDialog.qml 2015-09-07 15:40:45 +0000
134+++ src/qml/Dialogs/NoDefaultSIMCardDialog.qml 2016-06-15 13:28:04 +0000
135@@ -38,7 +38,7 @@
136 model: telepathyHelper.activeAccounts
137 delegate: Label {
138 text: modelData.displayName
139- color: UbuntuColors.orange
140+ color: theme.palette.normal.positive
141 MouseArea {
142 anchors.fill: parent
143 onClicked: {
144@@ -68,7 +68,6 @@
145 Button {
146 objectName: "noNoSimCardDefaultDialog"
147 text: i18n.tr("No")
148- color: UbuntuColors.orange
149 onClicked: {
150 dualSimSettings.mainViewDontAskCount = 3
151 PopupUtils.close(dialogue)
152@@ -78,7 +77,6 @@
153 Button {
154 objectName: "laterNoSimCardDefaultDialog"
155 text: i18n.tr("Later")
156- color: UbuntuColors.orange
157 onClicked: {
158 PopupUtils.close(dialogue)
159 dualSimSettings.mainViewDontAskCount++
160
161=== modified file 'src/qml/Dialogs/NotificationDialog.qml'
162--- src/qml/Dialogs/NotificationDialog.qml 2015-09-07 15:40:45 +0000
163+++ src/qml/Dialogs/NotificationDialog.qml 2016-06-15 13:28:04 +0000
164@@ -27,7 +27,6 @@
165 Button {
166 objectName: "closeDialog"
167 text: i18n.tr("Close")
168- color: UbuntuColors.orange
169 onClicked: {
170 PopupUtils.close(dialogue)
171 Qt.inputMethod.hide()
172
173=== modified file 'src/qml/Dialogs/SetDefaultSIMCardDialog.qml'
174--- src/qml/Dialogs/SetDefaultSIMCardDialog.qml 2015-09-07 15:40:45 +0000
175+++ src/qml/Dialogs/SetDefaultSIMCardDialog.qml 2016-06-15 13:28:04 +0000
176@@ -38,7 +38,6 @@
177 Button {
178 objectName: "setDefaultSimCardDialogNo"
179 text: i18n.tr("No")
180- color: UbuntuColors.orange
181 onClicked: {
182 PopupUtils.close(dialogue)
183 mainView.call(phoneNumber, true)
184@@ -48,7 +47,7 @@
185 Button {
186 objectName: "setDefaultSimCardDialogYes"
187 text: i18n.tr("Yes")
188- color: UbuntuColors.orange
189+ color: theme.palette.normal.positive
190 onClicked: {
191 telepathyHelper.setDefaultAccount(TelepathyHelper.Call, mainView.account)
192 PopupUtils.close(dialogue)
193
194=== modified file 'src/qml/Dialogs/SimLockedDialog.qml'
195--- src/qml/Dialogs/SimLockedDialog.qml 2016-04-29 21:29:29 +0000
196+++ src/qml/Dialogs/SimLockedDialog.qml 2016-06-15 13:28:04 +0000
197@@ -47,8 +47,8 @@
198 anchors.horizontalCenter: parent.horizontalCenter
199 Button {
200 objectName: "okSimLockedDialog"
201- text: i18n.tr("Ok")
202- color: UbuntuColors.orange
203+ text: i18n.tr("OK")
204+ color: theme.palette.normal.positive
205 onClicked: {
206 PopupUtils.close(dialogue)
207 }
208@@ -57,7 +57,7 @@
209 /*Button {
210 objectName: "unlockSimLockedDialog"
211 text: i18n.tr("Unlock")
212- color: UbuntuColors.orange
213+ color: theme.palette.normal.positive
214 onClicked: {
215 PopupUtils.close(dialogue)
216 telepathyHelper.unlockSimCards()
217
218=== modified file 'src/qml/HistoryPage/HistoryDelegate.qml'
219--- src/qml/HistoryPage/HistoryDelegate.qml 2016-02-11 17:58:29 +0000
220+++ src/qml/HistoryPage/HistoryDelegate.qml 2016-06-15 13:28:04 +0000
221@@ -177,7 +177,7 @@
222 return phoneNumber
223 }
224 elide: Text.ElideRight
225- color: UbuntuColors.darkGrey
226+ color: theme.palette.normal.backgroundSecondaryText
227 }
228
229 // this item has the width of the text above. It is used to be able to align
230
231=== modified file 'src/qml/HistoryPage/HistoryDetailsPage.qml'
232--- src/qml/HistoryPage/HistoryDetailsPage.qml 2016-02-11 17:58:29 +0000
233+++ src/qml/HistoryPage/HistoryDetailsPage.qml 2016-06-15 13:28:04 +0000
234@@ -147,7 +147,7 @@
235 fontSize: "medium"
236 text: getFormattedPhoneLabel(phoneNumber)
237 elide: Text.ElideRight
238- color: UbuntuColors.darkGrey
239+ color: theme.palette.normal.backgroundSecondaryText
240 height: units.gu(2)
241 }
242
243@@ -276,7 +276,7 @@
244 leftMargin: units.gu(1)
245 verticalCenter: parent.verticalCenter
246 }
247- color: UbuntuColors.darkGrey
248+ color: theme.palette.normal.backgroundSecondaryText
249 verticalAlignment: Qt.AlignVCenter
250 MouseArea {
251 anchors.fill:parent
252
253=== modified file 'src/qml/HistoryPage/SwipeItemDemo.qml'
254--- src/qml/HistoryPage/SwipeItemDemo.qml 2016-02-11 17:58:29 +0000
255+++ src/qml/HistoryPage/SwipeItemDemo.qml 2016-06-15 13:28:04 +0000
256@@ -123,7 +123,7 @@
257 fontSize: "medium"
258 text: "(541) 754-3010"
259 elide: Text.ElideRight
260- color: UbuntuColors.darkGrey
261+ color: theme.palette.normal.backgroundSecondaryText
262 }
263
264 // this item has the width of the text above. It is used to be able to align
265@@ -251,7 +251,7 @@
266 bottomMargin: units.gu(9)
267 }
268 width: units.gu(17)
269- strokeColor: UbuntuColors.green
270+ strokeColor: theme.palette.normal.positive
271 text: i18n.tr("Got it")
272 enabled: !dismissAnimation.running
273 onClicked: dismissAnimation.start()
274
275=== modified file 'src/qml/LiveCallPage/ConferenceCallDisplay.qml'
276--- src/qml/LiveCallPage/ConferenceCallDisplay.qml 2016-02-11 17:58:29 +0000
277+++ src/qml/LiveCallPage/ConferenceCallDisplay.qml 2016-06-15 13:28:04 +0000
278@@ -84,12 +84,12 @@
279 id: body
280 anchors.fill: parent
281
282- color: "red"
283+ color: theme.palette.normal.negative
284 clip: true
285
286 Icon {
287 name: "call-end"
288- color: "white"
289+ color: theme.palette.normal.negativeText
290 anchors {
291 top: parent.top
292 bottom: parent.bottom
293@@ -136,7 +136,7 @@
294 anchors {
295 centerIn: parent
296 }
297- color: UbuntuColors.darkGrey
298+ color: theme.palette.normal.backgroundSecondaryText
299 text: i18n.tr("Private")
300 font.weight: Font.DemiBold
301 verticalAlignment: Text.AlignVCenter
302
303=== modified file 'src/qml/LiveCallPage/HangupButton.qml'
304--- src/qml/LiveCallPage/HangupButton.qml 2015-09-07 15:40:45 +0000
305+++ src/qml/LiveCallPage/HangupButton.qml 2016-06-15 13:28:04 +0000
306@@ -33,9 +33,7 @@
307
308 UbuntuShape {
309 anchors.fill: parent
310- //color: button.pressed ? "#cd3804" : "#dd4814"
311- color: button.pressed ? "#dd4814" : "red"
312- gradientColor: "#e24b3a"
313+ backgroundColor: theme.palette.normal.negative
314 radius: "medium"
315 }
316
317@@ -44,7 +42,7 @@
318 width: units.gu(3)
319 height: units.gu(3)
320 name: "call-end"
321- color: "white"
322+ color: theme.palette.normal.negativeText
323 z: 1
324 }
325 }
326
327=== modified file 'src/qml/LiveCallPage/LiveCall.qml'
328--- src/qml/LiveCallPage/LiveCall.qml 2016-02-11 17:58:29 +0000
329+++ src/qml/LiveCallPage/LiveCall.qml 2016-06-15 13:28:04 +0000
330@@ -198,7 +198,7 @@
331 }
332 PropertyChanges {
333 target: dtmfButton
334- iconColor: UbuntuColors.green
335+ iconColor: theme.palette.normal.positive
336 }
337 },
338
339@@ -458,7 +458,7 @@
340 }
341 text: caller
342 fontSize: "large"
343- color: UbuntuColors.darkGrey
344+ color: theme.palette.normal.backgroundSecondaryText
345 }
346
347 MultiCallDisplay {
348@@ -532,7 +532,7 @@
349
350 text: i18n.tr("Switch calls")
351 color: mainView.backgroundColor
352- strokeColor: UbuntuColors.green
353+ strokeColor: theme.palette.normal.positive
354 onClicked: {
355 changeCallHoldingStatus(callManager.foregroundCall, true)
356 }
357@@ -547,7 +547,7 @@
358
359 text: i18n.tr("Merge calls")
360 color: mainView.backgroundColor
361- strokeColor: UbuntuColors.green
362+ strokeColor: theme.palette.normal.positive
363 onClicked: {
364 callManager.mergeCalls(callManager.calls[0], callManager.calls[1])
365 }
366
367=== modified file 'src/qml/LiveCallPage/MultiCallDisplay.qml'
368--- src/qml/LiveCallPage/MultiCallDisplay.qml 2015-09-07 15:40:45 +0000
369+++ src/qml/LiveCallPage/MultiCallDisplay.qml 2016-06-15 13:28:04 +0000
370@@ -121,7 +121,7 @@
371 rightMargin: units.gu(2)
372 verticalCenter: durationLabel.verticalCenter
373 }
374- color: callEntry.held ? UbuntuColors.red : UbuntuColors.green
375+ color: callEntry.held ? theme.palette.normal.negative : theme.palette.normal.positive
376 text: {
377 if (callEntry.dialing) {
378 return ""

Subscribers

People subscribed via source and target branches