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

[Michael Terry]

Fix colors to use theme colors more consistently.

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

[lp:~mterry/dialer-app/no-ubuntu-colors]

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

=== modified file 'src/qml/DialerPage/CallButton.qml'
--- src/qml/DialerPage/CallButton.qml	2015-09-07 15:40:45 +0000
+++ src/qml/DialerPage/CallButton.qml	2016-06-15 13:28:04 +0000
@@ -22,7 +22,7 @@
 AbstractButton {
     id: button
 
-    readonly property string defaultColor: "#0F8B21"
+    readonly property string defaultColor: theme.palette.normal.positive
     property alias iconRotation: icon.rotation
     property alias color: shape.color
 
@@ -49,7 +49,7 @@
         width: units.gu(3)
         height: units.gu(3)
         name: "call-start"
-        color: "white"
+        color: theme.palette.normal.positiveText
         z: 1
     }
 }
 
=== modified file 'src/qml/DialerPage/CustomButton.qml'
--- src/qml/DialerPage/CustomButton.qml	2015-09-07 15:40:45 +0000
+++ src/qml/DialerPage/CustomButton.qml	2016-06-15 13:28:04 +0000
@@ -27,7 +27,7 @@
     Icon {
         id: buttonIcon
         anchors.centerIn: parent
-        color: UbuntuColors.darkGrey
+        color: theme.palette.normal.backgroundSecondaryText
     }
     color: "transparent"
 }
 
=== modified file 'src/qml/DialerPage/DialerPage.qml'
--- src/qml/DialerPage/DialerPage.qml	2016-04-29 21:29:29 +0000
+++ src/qml/DialerPage/DialerPage.qml	2016-06-15 13:28:04 +0000
@@ -377,7 +377,7 @@
                 bottomMargin: units.gu(1)
             }
             text: contactWatcher.isUnknown ? "" : contactWatcher.alias
-            color: UbuntuColors.darkGrey
+            color: theme.palette.normal.backgroundSecondaryText
             opacity: text != "" ? 1 : 0
             fontSize: "small"
             Behavior on opacity {
@@ -495,7 +495,7 @@
         PropertyAction {
             target: callButton
             property: "color"
-            value: "red"
+            value: theme.palette.normal.negative
         }
 
         ParallelAnimation {
 
=== modified file 'src/qml/DialerPage/KeypadButton.qml'
--- src/qml/DialerPage/KeypadButton.qml	2015-09-07 15:40:45 +0000
+++ src/qml/DialerPage/KeypadButton.qml	2016-06-15 13:28:04 +0000
@@ -71,7 +71,7 @@
             height: paintedHeight
             font.pixelSize: units.dp(30)
             verticalAlignment: Text.AlignTop
-            color: UbuntuColors.darkGrey
+            color: theme.palette.normal.backgroundSecondaryText
         }
 
         Label {
@@ -82,7 +82,7 @@
             anchors.horizontalCenter: parent.horizontalCenter
             horizontalAlignment: Text.AlignHCenter
             fontSize: "x-small"
-            color: UbuntuColors.darkGrey
+            color: theme.palette.normal.backgroundSecondaryText
         }
 
         Icon {
 
=== modified file 'src/qml/DialerPage/KeypadEntry.qml'
--- src/qml/DialerPage/KeypadEntry.qml	2016-04-29 21:10:46 +0000
+++ src/qml/DialerPage/KeypadEntry.qml	2016-06-15 13:28:04 +0000
@@ -102,7 +102,7 @@
         horizontalAlignment: (text.length < 19 ? TextInput.AlignHCenter : TextInput.AlignRight)
         font.pixelSize: maximumFontSize
         font.family: "Ubuntu"
-        color: UbuntuColors.darkGrey
+        color: theme.palette.normal.backgroundSecondaryText
         focus: false
         cursorVisible: true
         clip: true
@@ -117,7 +117,7 @@
             anchors.top: parent.top
             anchors.bottom: parent.bottom
             width: units.dp(3)
-            color: "#DD4814"
+            color: theme.palette.normal.positionText
             visible: input.text !== ""
         }
 
@@ -158,7 +158,7 @@
         text: ""
         font.pixelSize: input.maximumFontSize
         fontSizeMode: Text.HorizontalFit
-        color: UbuntuColors.darkGrey
+        color: theme.palette.normal.backgroundSecondaryText
         opacity: 0.9
         horizontalAlignment: Text.AlignHCenter
     }
 
=== modified file 'src/qml/Dialogs/DisableFlightModeDialog.qml'
--- src/qml/Dialogs/DisableFlightModeDialog.qml	2015-09-07 15:40:45 +0000
+++ src/qml/Dialogs/DisableFlightModeDialog.qml	2016-06-15 13:28:04 +0000
@@ -36,7 +36,6 @@
                 Button {
                     objectName: "disableFlightModeDialogCancelButton"
                     text: i18n.tr("Cancel")
-                    color: UbuntuColors.orange
                     onClicked: {
                         PopupUtils.close(dialogue)
                         Qt.inputMethod.hide()
@@ -45,7 +44,7 @@
                 Button {
                     objectName: "disableFlightModeDialogDisableButton"
                     text: i18n.tr("Disable")
-                    color: UbuntuColors.orange
+                    color: theme.palette.normal.positive
                     onClicked: {
                         telepathyHelper.flightMode = false
                         PopupUtils.open(flightModeProgressDialog, mainView, {})
 
=== modified file 'src/qml/Dialogs/NoDefaultSIMCardDialog.qml'
--- src/qml/Dialogs/NoDefaultSIMCardDialog.qml	2015-09-07 15:40:45 +0000
+++ src/qml/Dialogs/NoDefaultSIMCardDialog.qml	2016-06-15 13:28:04 +0000
@@ -38,7 +38,7 @@
                     model: telepathyHelper.activeAccounts
                     delegate: Label {
                         text: modelData.displayName
-                        color: UbuntuColors.orange
+                        color: theme.palette.normal.positive
                         MouseArea {
                             anchors.fill: parent
                             onClicked: {
@@ -68,7 +68,6 @@
                 Button {
                     objectName: "noNoSimCardDefaultDialog"
                     text: i18n.tr("No")
-                    color: UbuntuColors.orange
                     onClicked: {
                         dualSimSettings.mainViewDontAskCount = 3
                         PopupUtils.close(dialogue)
@@ -78,7 +77,6 @@
                 Button {
                     objectName: "laterNoSimCardDefaultDialog"
                     text: i18n.tr("Later")
-                    color: UbuntuColors.orange
                     onClicked: {
                         PopupUtils.close(dialogue)
                         dualSimSettings.mainViewDontAskCount++
 
=== modified file 'src/qml/Dialogs/NotificationDialog.qml'
--- src/qml/Dialogs/NotificationDialog.qml	2015-09-07 15:40:45 +0000
+++ src/qml/Dialogs/NotificationDialog.qml	2016-06-15 13:28:04 +0000
@@ -27,7 +27,6 @@
     Button {
         objectName: "closeDialog"
         text: i18n.tr("Close")
-        color: UbuntuColors.orange
         onClicked: {
             PopupUtils.close(dialogue)
             Qt.inputMethod.hide()
 
=== modified file 'src/qml/Dialogs/SetDefaultSIMCardDialog.qml'
--- src/qml/Dialogs/SetDefaultSIMCardDialog.qml	2015-09-07 15:40:45 +0000
+++ src/qml/Dialogs/SetDefaultSIMCardDialog.qml	2016-06-15 13:28:04 +0000
@@ -38,7 +38,6 @@
                 Button {
                     objectName: "setDefaultSimCardDialogNo"
                     text: i18n.tr("No")
-                    color: UbuntuColors.orange
                     onClicked: {
                         PopupUtils.close(dialogue)
                         mainView.call(phoneNumber, true)
@@ -48,7 +47,7 @@
                 Button {
                     objectName: "setDefaultSimCardDialogYes"
                     text: i18n.tr("Yes")
-                    color: UbuntuColors.orange
+                    color: theme.palette.normal.positive
                     onClicked: {
                         telepathyHelper.setDefaultAccount(TelepathyHelper.Call, mainView.account)
                         PopupUtils.close(dialogue)
 
=== modified file 'src/qml/Dialogs/SimLockedDialog.qml'
--- src/qml/Dialogs/SimLockedDialog.qml	2016-04-29 21:29:29 +0000
+++ src/qml/Dialogs/SimLockedDialog.qml	2016-06-15 13:28:04 +0000
@@ -47,8 +47,8 @@
                 anchors.horizontalCenter: parent.horizontalCenter
                 Button {
                     objectName: "okSimLockedDialog"
-                    text: i18n.tr("Ok")
-                    color: UbuntuColors.orange
+                    text: i18n.tr("OK")
+                    color: theme.palette.normal.positive
                     onClicked: {
                         PopupUtils.close(dialogue)
                     }
@@ -57,7 +57,7 @@
                 /*Button {
                     objectName: "unlockSimLockedDialog"
                     text: i18n.tr("Unlock")
-                    color: UbuntuColors.orange
+                    color: theme.palette.normal.positive
                     onClicked: {
                         PopupUtils.close(dialogue)
                         telepathyHelper.unlockSimCards()
 
=== modified file 'src/qml/HistoryPage/HistoryDelegate.qml'
--- src/qml/HistoryPage/HistoryDelegate.qml	2016-02-11 17:58:29 +0000
+++ src/qml/HistoryPage/HistoryDelegate.qml	2016-06-15 13:28:04 +0000
@@ -177,7 +177,7 @@
             return phoneNumber
         }
         elide: Text.ElideRight
-        color: UbuntuColors.darkGrey
+        color: theme.palette.normal.backgroundSecondaryText
     }
 
     // this item has the width of the text above. It is used to be able to align
 
=== modified file 'src/qml/HistoryPage/HistoryDetailsPage.qml'
--- src/qml/HistoryPage/HistoryDetailsPage.qml	2016-02-11 17:58:29 +0000
+++ src/qml/HistoryPage/HistoryDetailsPage.qml	2016-06-15 13:28:04 +0000
@@ -147,7 +147,7 @@
                 fontSize: "medium"
                 text: getFormattedPhoneLabel(phoneNumber)
                 elide: Text.ElideRight
-                color: UbuntuColors.darkGrey
+                color: theme.palette.normal.backgroundSecondaryText
                 height: units.gu(2)
             }
 
@@ -276,7 +276,7 @@
                     leftMargin: units.gu(1)
                     verticalCenter: parent.verticalCenter
                 }
-                color: UbuntuColors.darkGrey
+                color: theme.palette.normal.backgroundSecondaryText
                 verticalAlignment: Qt.AlignVCenter
                 MouseArea {
                     anchors.fill:parent
 
=== modified file 'src/qml/HistoryPage/SwipeItemDemo.qml'
--- src/qml/HistoryPage/SwipeItemDemo.qml	2016-02-11 17:58:29 +0000
+++ src/qml/HistoryPage/SwipeItemDemo.qml	2016-06-15 13:28:04 +0000
@@ -123,7 +123,7 @@
                     fontSize: "medium"
                     text: "[phone]"
                     elide: Text.ElideRight
-                    color: UbuntuColors.darkGrey
+                    color: theme.palette.normal.backgroundSecondaryText
                 }
 
                 // this item has the width of the text above. It is used to be able to align
@@ -251,7 +251,7 @@
                     bottomMargin: units.gu(9)
                 }
                 width: units.gu(17)
-                strokeColor: UbuntuColors.green
+                strokeColor: theme.palette.normal.positive
                 text: i18n.tr("Got it")
                 enabled: !dismissAnimation.running
                 onClicked: dismissAnimation.start()
 
=== modified file 'src/qml/LiveCallPage/ConferenceCallDisplay.qml'
--- src/qml/LiveCallPage/ConferenceCallDisplay.qml	2016-02-11 17:58:29 +0000
+++ src/qml/LiveCallPage/ConferenceCallDisplay.qml	2016-06-15 13:28:04 +0000
@@ -84,12 +84,12 @@
                 id: body
                 anchors.fill: parent
 
-                color: "red"
+                color: theme.palette.normal.negative
                 clip: true
 
                 Icon {
                     name: "call-end"
-                    color: "white"
+                    color: theme.palette.normal.negativeText
                     anchors {
                         top: parent.top
                         bottom: parent.bottom
@@ -136,7 +136,7 @@
                     anchors {
                         centerIn: parent
                     }
-                    color: UbuntuColors.darkGrey
+                    color: theme.palette.normal.backgroundSecondaryText
                     text: i18n.tr("Private")
                     font.weight: Font.DemiBold
                     verticalAlignment: Text.AlignVCenter
 
=== modified file 'src/qml/LiveCallPage/HangupButton.qml'
--- src/qml/LiveCallPage/HangupButton.qml	2015-09-07 15:40:45 +0000
+++ src/qml/LiveCallPage/HangupButton.qml	2016-06-15 13:28:04 +0000
@@ -33,9 +33,7 @@
 
     UbuntuShape {
         anchors.fill: parent
-        //color: button.pressed ? "#cd3804" : "#dd4814"
-        color: button.pressed ? "#dd4814" : "red"
-        gradientColor: "#e24b3a"
+        backgroundColor: theme.palette.normal.negative
         radius: "medium"
     }
 
@@ -44,7 +42,7 @@
         width: units.gu(3)
         height: units.gu(3)
         name: "call-end"
-        color: "white"
+        color: theme.palette.normal.negativeText
         z: 1
     }
 }
 
=== modified file 'src/qml/LiveCallPage/LiveCall.qml'
--- src/qml/LiveCallPage/LiveCall.qml	2016-02-11 17:58:29 +0000
+++ src/qml/LiveCallPage/LiveCall.qml	2016-06-15 13:28:04 +0000
@@ -198,7 +198,7 @@
             }
             PropertyChanges {
                 target: dtmfButton
-                iconColor: UbuntuColors.green
+                iconColor: theme.palette.normal.positive
             }
         },
 
@@ -458,7 +458,7 @@
             }
             text: caller
             fontSize: "large"
-            color: UbuntuColors.darkGrey
+            color: theme.palette.normal.backgroundSecondaryText
         }
 
         MultiCallDisplay {
@@ -532,7 +532,7 @@
 
             text: i18n.tr("Switch calls")
             color: mainView.backgroundColor
-            strokeColor: UbuntuColors.green
+            strokeColor: theme.palette.normal.positive
             onClicked: {
                 changeCallHoldingStatus(callManager.foregroundCall, true)
             }
@@ -547,7 +547,7 @@
 
             text: i18n.tr("Merge calls")
             color: mainView.backgroundColor
-            strokeColor: UbuntuColors.green
+            strokeColor: theme.palette.normal.positive
             onClicked: {
                 callManager.mergeCalls(callManager.calls[0], callManager.calls[1])
             }
 
=== modified file 'src/qml/LiveCallPage/MultiCallDisplay.qml'
--- src/qml/LiveCallPage/MultiCallDisplay.qml	2015-09-07 15:40:45 +0000
+++ src/qml/LiveCallPage/MultiCallDisplay.qml	2016-06-15 13:28:04 +0000
@@ -121,7 +121,7 @@
                     rightMargin: units.gu(2)
                     verticalCenter: durationLabel.verticalCenter
                 }
-                color: callEntry.held ? UbuntuColors.red : UbuntuColors.green
+                color: callEntry.held ? theme.palette.normal.negative : theme.palette.normal.positive
                 text: {
                     if (callEntry.dialing) {
                         return ""