Michael Terry has proposed merging lp:~mterry/reminders-app/no-ubuntucolors
into lp:reminders-app.
Commit message:
Use theme colors instead of hard-coded ones.
Requested reviews:
Ubuntu Notes app developers (notes-app-dev)
Related bugs:
Bug #1581047 in ubuntu-system-settings (Ubuntu): "UbuntuColors considered
harmful"
https://bugs.launchpad.net/ubuntu/+source/ubuntu-system-settings/+bug/1581047
For more details, see:
https://code.launchpad.net/~mterry/reminders-app/no-ubuntucolors/+merge/295460
Use theme colors instead of hard-coded ones.
--
Your team Ubuntu Notes app developers is requested to review the proposed merge
of lp:~mterry/reminders-app/no-ubuntucolors into lp:reminders-app.
=== modified file 'src/app/qml/Reminders.qml'
--- src/app/qml/Reminders.qml 2016-04-30 20:03:57 +0000
+++ src/app/qml/Reminders.qml 2016-05-23 12:37:55 +0000
@@ -515,7 +515,7 @@
shown: text
text: EvernoteConnection.error || NotesStore.error
iconName: "sync-error"
- iconColor: UbuntuColors.red
+ iconColor: theme.palette.normal.negative
showCancelButton: true
onCancel: {
@@ -737,7 +737,7 @@
Button {
objectName: "openAccountButton"
text: i18n.tr("Set Up…")
- color: UbuntuColors.green
+ color: theme.palette.normal.positive
onClicked: setup.exec()
Layout.fillWidth: true
}
@@ -763,17 +763,15 @@
Button {
text: i18n.tr("Create new note")
onClicked: importDialog.accepted(true)
- color: UbuntuColors.green
+ color: theme.palette.normal.positive
}
Button {
text: i18n.tr("Attach to existing note")
onClicked: importDialog.accepted(false);
- color: UbuntuColors.blue
}
Button {
text: i18n.tr("Cancel import")
onClicked: importDialog.rejected();
- color: UbuntuColors.red
}
}
}
=== modified file 'src/app/qml/components/BouncingProgressBar.qml'
--- src/app/qml/components/BouncingProgressBar.qml 2015-09-15 14:50:55 +0000
+++ src/app/qml/components/BouncingProgressBar.qml 2016-05-23 12:37:55 +0000
@@ -28,7 +28,7 @@
Rectangle {
id: rectangle
anchors.fill: parent
- color: UbuntuColors.orange
+ color: theme.palette.normal.activity
visible: animation.running // Avoid to show the orange bar before animation starts
}
=== modified file 'src/app/qml/components/EditTagsDialog.qml'
--- src/app/qml/components/EditTagsDialog.qml 2016-04-30 16:34:08 +0000
+++ src/app/qml/components/EditTagsDialog.qml 2016-05-23 12:37:55 +0000
@@ -98,9 +98,9 @@
top: textField.bottom
right: textField.right
}
- color: "white"
+ color: theme.palette.normal.background
border.width: units.dp(1)
- border.color: "black"
+ border.color: theme.palette.normal.backgroundText
height: Math.min(5, tagsListView.count) * units.gu(4)
visible: (textField.text.length > 0 || textField.inputMethodComposing) && (textField.focus || tagsListView.focus)
@@ -121,7 +121,7 @@
property bool used: root.note ? root.note.tagGuids.indexOf(model.guid) !== -1 : false
Label {
text: model.name
- color: textField.text === model.name ? UbuntuColors.orange : "black"
+ color: textField.text === model.name ? theme.palette.normal.positionText : theme.palette.normal.backgroundText
Layout.fillHeight: true
Layout.fillWidth: true
}
@@ -144,7 +144,7 @@
Button {
id: okButton
text: i18n.tr("OK")
- color: UbuntuColors.orange
+ color: theme.palette.normal.positive
enabled: textField.text.replace(/\s+/g, '') !== '' || textField.inputMethodComposing === true; // Not only whitespaces!
onClicked: textField.accept()
}
@@ -197,8 +197,6 @@
Layout.preferredWidth: parent.width - units.gu(2)
Layout.alignment: Qt.AlignHCenter
- color: UbuntuColors.orange
-
text: i18n.tr("Close")
onClicked: {
=== modified file 'src/app/qml/components/ListItemWithActions.qml'
--- src/app/qml/components/ListItemWithActions.qml 2015-09-15 14:50:55 +0000
+++ src/app/qml/components/ListItemWithActions.qml 2016-05-23 12:37:55 +0000
@@ -29,9 +29,8 @@
property Action activeAction: null
property var activeItem: null
property bool triggerActionOnMouseRelease: false
- property color color: Theme.palette.normal.background
- property color selectedColor: "#E6E6E6"
- property color selectedRightActionColor: UbuntuColors.lightAubergine
+ property color color: theme.palette.normal.background
+ property color selectedRightActionColor: theme.palette.normal.positive
property bool selected: false
property bool selectionMode: false
property alias showDivider: divider.visible
@@ -185,7 +184,7 @@
}
width: root.leftActionWidth + actionThreshold
visible: leftSideAction
- color: UbuntuColors.red
+ color: theme.palette.normal.negative
Icon {
anchors {
@@ -193,7 +192,7 @@
horizontalCenterOffset: actionThreshold / 2
}
name: leftSideAction && _showActions ? leftSideAction.iconName : ""
- color: Theme.palette.selected.field
+ color: theme.palette.normal.negativeText
height: units.gu(3)
width: units.gu(3)
}
@@ -244,7 +243,7 @@
height: units.gu(3)
source: modelData.iconSource ? modelData.iconSource : ''
name: modelData.iconName ? modelData.iconName : ''
- color: root.activeAction === modelData || !root.triggerActionOnMouseRelease ? root.selectedRightActionColor : UbuntuColors.lightGrey
+ color: root.activeAction === modelData || !root.triggerActionOnMouseRelease ? root.selectedRightActionColor : theme.palette.normal.backgroundSecondaryText
}
Rectangle {
id: underscore
=== modified file 'src/app/qml/components/NoteHeader.qml'
--- src/app/qml/components/NoteHeader.qml 2015-11-02 20:26:37 +0000
+++ src/app/qml/components/NoteHeader.qml 2016-05-23 12:37:55 +0000
@@ -117,7 +117,7 @@
iconName: root.note && root.note.reminder ? "reminder" : "reminder-new"
height: parent.height
width: height
- iconColor: root.note && note.reminder ? UbuntuColors.blue : Qt.rgba(0.0, 0.0, 0.0, 0.0)
+ iconColor: root.note && note.reminder ? theme.palette.normal.positive : Qt.rgba(0.0, 0.0, 0.0, 0.0)
visible: index == notebookSelector.selectedIndex
onClicked: {
Qt.inputMethod.hide();
=== modified file 'src/app/qml/components/NotebooksDelegate.qml'
--- src/app/qml/components/NotebooksDelegate.qml 2015-09-15 14:50:55 +0000
+++ src/app/qml/components/NotebooksDelegate.qml 2016-05-23 12:37:55 +0000
@@ -39,7 +39,6 @@
}
}
- selectedRightActionColor: UbuntuColors.green
triggerActionOnMouseRelease: true
rightSideActions: [
Action {
=== modified file 'src/app/qml/components/NotesDelegate.qml'
--- src/app/qml/components/NotesDelegate.qml 2016-04-28 15:53:23 +0000
+++ src/app/qml/components/NotesDelegate.qml 2016-05-23 12:37:55 +0000
@@ -56,7 +56,6 @@
}
}
- selectedRightActionColor: UbuntuColors.green
triggerActionOnMouseRelease: true
rightSideActions: root.conflicting ? conflictActions : enabledRightSideActions
property list<Action> conflictActions: [
=== modified file 'src/app/qml/components/PageWithBottomEdge.qml'
--- src/app/qml/components/PageWithBottomEdge.qml 2015-09-15 14:50:55 +0000
+++ src/app/qml/components/PageWithBottomEdge.qml 2016-05-23 12:37:55 +0000
@@ -165,7 +165,7 @@
visible: bottomEdgeLabelVisible
z: 1
- color: Theme.palette.normal.background
+ color: theme.palette.normal.background
parent: page
anchors {
left: parent.left
@@ -205,7 +205,7 @@
width: tipLabel.paintedWidth + units.gu(6)
height: bottomEdge.tipHeight + units.gu(1)
- color: Theme.palette.normal.overlay
+ color: theme.palette.normal.overlay
Label {
id: tipLabel
=== modified file 'src/app/qml/components/RemindersDelegate.qml'
--- src/app/qml/components/RemindersDelegate.qml 2015-09-15 14:50:55 +0000
+++ src/app/qml/components/RemindersDelegate.qml 2016-05-23 12:37:55 +0000
@@ -41,7 +41,6 @@
}
}
- selectedRightActionColor: UbuntuColors.green
triggerActionOnMouseRelease: true
rightSideActions: [
Action {
=== modified file 'src/app/qml/components/ResolveConflictConfirmationDialog.qml'
--- src/app/qml/components/ResolveConflictConfirmationDialog.qml 2015-09-15 14:50:55 +0000
+++ src/app/qml/components/ResolveConflictConfirmationDialog.qml 2016-05-23 12:37:55 +0000
@@ -55,7 +55,7 @@
Button {
text: i18n.tr("Yes")
- color: UbuntuColors.green
+ color: theme.palette.normal.positive
onClicked: {
root.accepted();
PopupUtils.close(root);
@@ -64,7 +64,7 @@
Button {
text: i18n.tr("No")
- color: UbuntuColors.red
+ color: theme.palette.normal.negative
onClicked: {
root.rejected();
PopupUtils.close(root)
=== modified file 'src/app/qml/components/RtfButton.qml'
--- src/app/qml/components/RtfButton.qml 2015-09-15 14:50:55 +0000
+++ src/app/qml/components/RtfButton.qml 2016-05-23 12:37:55 +0000
@@ -48,7 +48,7 @@
Rectangle {
anchors.fill: parent
- color: UbuntuColors.darkGrey
+ color: theme.palette.normal.backgroundSecondaryText
opacity: root.active || mouseArea.pressed ? 0.2 : 0
}
=== modified file 'src/app/qml/components/TagsDelegate.qml'
--- src/app/qml/components/TagsDelegate.qml 2015-09-15 14:50:55 +0000
+++ src/app/qml/components/TagsDelegate.qml 2016-05-23 12:37:55 +0000
@@ -37,7 +37,6 @@
}
}
- selectedRightActionColor: UbuntuColors.green
triggerActionOnMouseRelease: true
rightSideActions: [
Action {
=== modified file 'src/app/qml/ui/AccountSelectorPage.qml'
--- src/app/qml/ui/AccountSelectorPage.qml 2015-09-15 14:50:55 +0000
+++ src/app/qml/ui/AccountSelectorPage.qml 2016-05-23 12:37:55 +0000
@@ -89,7 +89,7 @@
anchors.horizontalCenter: parent.horizontalCenter
width: parent.width - units.gu(2)
text: i18n.tr("Add new account")
- color: UbuntuColors.orange
+ color: theme.palette.normal.positive
onClicked: root.oaSetup.exec()
}
}
=== modified file 'src/app/qml/ui/EditNoteView.qml'
--- src/app/qml/ui/EditNoteView.qml 2016-04-30 16:34:08 +0000
+++ src/app/qml/ui/EditNoteView.qml 2016-05-23 12:37:55 +0000
@@ -603,7 +603,7 @@
// TRANSLATORS: Button to close the edit mode
text: i18n.tr("Close")
height: parent.height
- iconColor: UbuntuColors.green
+ iconColor: theme.palette.normal.positive
onClicked: {
forceActiveFocus();
saveNote();
=== modified file 'src/app/qml/ui/NoteView.qml'
--- src/app/qml/ui/NoteView.qml 2016-04-30 16:34:08 +0000
+++ src/app/qml/ui/NoteView.qml 2016-05-23 12:37:55 +0000
@@ -149,7 +149,7 @@
// TRANSLATORS: Button to close the note viewer
text: i18n.tr("Close")
height: parent.height
- iconColor: UbuntuColors.green
+ iconColor: theme.palette.normal.positive
visible: root.canClose
onClicked: {
pageStack.pop()
@@ -171,7 +171,7 @@
// TRANSLATORS: Button to go from note viewer to note editor
text: i18n.tr("Edit")
height: parent.height
- iconColor: UbuntuColors.green
+ iconColor: theme.palette.normal.positive
onClicked: {
root.editNote()
}
=== modified file 'src/app/qml/ui/SetReminderView.qml'
--- src/app/qml/ui/SetReminderView.qml 2015-09-15 14:50:55 +0000
+++ src/app/qml/ui/SetReminderView.qml 2016-05-23 12:37:55 +0000
@@ -75,7 +75,7 @@
// TRANSLATORS: Button that deletes a reminder
text: i18n.tr("Delete")
Layout.fillWidth: true
- color: UbuntuColors.red
+ color: theme.palette.normal.negative
onClicked: {
note.reminder = false;
NotesStore.saveNote(note.guid);
@@ -86,7 +86,7 @@
Layout.fillWidth: true
// TRANSLATORS: Button that saves a reminder
text: i18n.tr("Save")
- color: UbuntuColors.green
+ color: theme.palette.normal.positive
onClicked: {
note.reminder = true;
var date = datePicker.date
--
Mailing list: https://launchpad.net/~ubuntu-touch-coreapps-reviewers
Post to : ubuntu-touch-coreapps-reviewers@lists.launchpad.net
Unsubscribe : https://launchpad.net/~ubuntu-touch-coreapps-reviewers
More help : https://help.launchpad.net/ListHelp
