ubuntu-touch-coreapps-reviewers team mailing list archive

[Arthur Mello <arthur.mello@xxxxxxxxxxxxx>]

Arthur Mello has proposed merging lp:~artmello/ubuntu-calendar-app/ubuntu-calendar-app-fix_1556946 into lp:ubuntu-calendar-app.

Commit message:
Fix label colors on ListItems

Requested reviews:
  Ubuntu Calendar Developers (ubuntu-calendar-dev)
Related bugs:
  Bug #1556946 in Ubuntu Calendar App: "labels in event detail view are wrong color"
  https://bugs.launchpad.net/ubuntu-calendar-app/+bug/1556946

For more details, see:
https://code.launchpad.net/~artmello/ubuntu-calendar-app/ubuntu-calendar-app-fix_1556946/+merge/289838

Fix label colors on ListItems
-- 
Your team Ubuntu Calendar Developers is requested to review the proposed merge of lp:~artmello/ubuntu-calendar-app/ubuntu-calendar-app-fix_1556946 into lp:ubuntu-calendar-app.

=== modified file 'EventRepetition.qml'
--- EventRepetition.qml	2016-03-14 22:25:47 +0000
+++ EventRepetition.qml	2016-03-22 20:10:46 +0000
@@ -151,6 +151,7 @@
 
         ListItem.Header{
             text: i18n.tr("Repeat")
+            __foregroundColor: Theme.palette.normal.baseText
         }
 
         OptionSelector{
@@ -170,6 +171,7 @@
 
         ListItem.Header{
             text: i18n.tr("Repeats On:")
+            __foregroundColor: Theme.palette.normal.baseText
             visible: recurrenceOption.selectedIndex == 5
         }
 
@@ -215,6 +217,7 @@
 
         ListItem.Header {
             text: i18n.tr("Recurring event ends")
+            __foregroundColor: Theme.palette.normal.baseText
             visible: recurrenceOption.selectedIndex != 0
         }
 
@@ -238,6 +241,7 @@
             // and it is shown as the header of the option selector to choose
             // its repetition
             text:i18n.tr("Repeats")
+            __foregroundColor: Theme.palette.normal.baseText
             visible: recurrenceOption.selectedIndex != 0
                      && limitOptions.selectedIndex == 1
         }
@@ -263,6 +267,7 @@
 
         ListItem.Header{
             text:i18n.tr("Date")
+            __foregroundColor: Theme.palette.normal.baseText
             visible: recurrenceOption.selectedIndex != 0 && limitOptions.selectedIndex == 2
         }
 

=== modified file 'NewEvent.qml'
--- NewEvent.qml	2016-03-21 19:45:40 +0000
+++ NewEvent.qml	2016-03-22 20:10:46 +0000
@@ -466,6 +466,7 @@
                 }
 
                 text: i18n.tr("All day event")
+                __foregroundColor: Theme.palette.normal.baseText
                 showDivider: false
                 control: CheckBox {
                     objectName: "allDayEventCheckbox"
@@ -482,6 +483,7 @@
 
                 ListItems.Header{
                     text: i18n.tr("Event Details")
+                    __foregroundColor: Theme.palette.normal.baseText
                 }
 
                 TextField {
@@ -548,6 +550,7 @@
 
                 ListItems.Header {
                     text: i18n.tr("Calendar")
+                    __foregroundColor: Theme.palette.normal.baseText
                 }
 
                 OptionSelector{
@@ -588,6 +591,7 @@
 
                 ListItems.Header {
                     text: i18n.tr("Guests")
+                    __foregroundColor: Theme.palette.normal.baseText
                 }
 
                 Button{
@@ -672,19 +676,19 @@
 
             }
 
-            ListItems.Subtitled{
+            ListItems {
                 id:thisHappens
                 objectName :"thisHappens"
 
-                anchors {
-                    left: parent.left
-                }
-
-                showDivider: false
-                progression: true
                 visible: (event != undefined) && ((event.itemType === Type.Event) || (event.itemType === Type.Todo))
-                text: i18n.tr("Repeats")
-                subText: visible ? rule === null ? Defines.recurrenceLabel[0] : eventUtils.getRecurrenceString(rule) : ""
+
+                ListItemLayout {
+                    id: thisHappensLayout
+                    title.text: i18n.tr("Repeats")
+                    summary.text: (event != undefined) && (event.itemType === Type.Event) ? rule === null ? Defines.recurrenceLabel[0] : eventUtils.getRecurrenceString(rule) : ""
+                    ProgressionSlot {}
+                }
+
                 onClicked: {
                     var stack = pageStack
                     if (!stack)
@@ -698,24 +702,25 @@
                 visible: (event != undefined) && (event.itemType === Type.Event)
             }
 
-            ListItems.Subtitled{
-                id:eventReminder
-                objectName  : "eventReminder"
+            ListItem {
+                id: eventReminder
+                objectName: "eventReminder"
 
                 property int reminderValue: -1
 
                 onReminderValueChanged: updateReminderLabel()
 
-                anchors.left:parent.left
-                showDivider: false
-                progression: true
-                text: i18n.tr("Reminder")
+                ListItemLayout {
+                    id: eventReminderLayout
+                    title.text: i18n.tr("Reminder")
+                    ProgressionSlot {}
+                }
 
                 function updateReminderLabel() {
                     if (eventReminder.reminderValue !== -1) {
                         for (var i=0; i<reminderModel.count; i++) {
                             if (reminderModel.get(i).value === eventReminder.reminderValue) {
-                                eventReminder.subText = reminderModel.get(i).label
+                                eventReminderLayout.summary.text = reminderModel.get(i).label
                                 return
                             }
                         }

=== modified file 'NewEventTimePicker.qml'
--- NewEventTimePicker.qml	2016-01-25 17:52:33 +0000
+++ NewEventTimePicker.qml	2016-03-22 20:10:46 +0000
@@ -31,6 +31,7 @@
 
     ListItem.Header {
         id: listHeader
+        __foregroundColor: Theme.palette.normal.baseText
     }
 
     Item {