Merge lp:~renatofilho/ubuntu-calendar-app/fix-add-guest-search-field into lp:ubuntu-calendar-app

[Renato Araujo Oliveira Filho]

Auto-focus search textfield when adding a guest.
Make sure that the popover stay visible when the keyboard appears.
Disabled auto-prediction for search field.

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

FAILED: Continuous integration, rev:748
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/192/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/478/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/192/rebuild

review: Needs Fixing (continuous-integration)

[lp:~renatofilho/ubuntu-calendar-app/fix-add-guest-search-field]

749. By Renato Araujo Oliveira Filho on 2016-01-27

Use New ListItem API for guest list.

Update swipe actions to work using the ListItem.leadingActions

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

FAILED: Continuous integration, rev:749
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/193/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/479/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/193/rebuild

review: Needs Fixing (continuous-integration)

[lp:~renatofilho/ubuntu-calendar-app/fix-add-guest-search-field]

750. By Renato Araujo Oliveira Filho on 2016-01-29

Merged: ~renatofilho/ubuntu-calendar-app/sdk-1-3

751. By Renato Araujo Oliveira Filho on 2016-01-29

Make sure that guest list still visible after the VKB appears.

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

FAILED: Continuous integration, rev:750
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/210/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/496/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/210/rebuild

review: Needs Fixing (continuous-integration)

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

FAILED: Continuous integration, rev:751
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/214/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/500/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/214/rebuild

review: Needs Fixing (continuous-integration)

[lp:~renatofilho/ubuntu-calendar-app/fix-add-guest-search-field]

752. By Renato Araujo Oliveira Filho on 2016-02-01

Show a contact entry for each emailAddress in contact selection.
Does not allow select contacts with empty e-mail.

753. By Renato Araujo Oliveira Filho on 2016-02-01

Merged: ~renatofilho/ubuntu-calendar-app/sdk-1-3

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

PASSED: Continuous integration, rev:753
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci-no-tests/981/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/525/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci-no-tests/981/rebuild

review: Approve (continuous-integration)

[lp:~renatofilho/ubuntu-calendar-app/fix-add-guest-search-field]

754. By Renato Araujo Oliveira Filho on 2016-02-10

Trunk merged.

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

FAILED: Continuous integration, rev:754
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/1015/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/567/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/1015/rebuild

review: Needs Fixing (continuous-integration)

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

FAILED: Continuous integration, rev:754
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/1017/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/569/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/1017/rebuild

review: Needs Fixing (continuous-integration)

[Renato Araujo Oliveira Filho (renatofilho)]

it was merged in another MR.

Unmerged revisions

754. By Renato Araujo Oliveira Filho on 2016-02-10

Trunk merged.

=== modified file 'ContactChoicePopup.qml'
--- ContactChoicePopup.qml	2016-01-29 14:35:14 +0000
+++ ContactChoicePopup.qml	2016-02-10 13:30:08 +0000
@@ -29,7 +29,7 @@
     id: root
     objectName: "contactPopover"
 
-    signal contactSelected(var contact);
+    signal contactSelected(var contact, string emailAddress);
 
     Label {
         id: noContact
@@ -40,24 +40,27 @@
 
     UnionFilter {
         id: filter
+
+        property string searchString: ""
+
         filters: [
             DetailFilter{
                 detail: ContactDetail.Name
                 field: Name.FirstName
                 matchFlags: Filter.MatchContains
-                value: searchBox.text
+                value: filter.searchString
             },
             DetailFilter{
                 detail: ContactDetail.Name
                 field: Name.LastName
                 matchFlags: Filter.MatchContains
-                value: searchBox.text
+                value: filter.searchString
             },
             DetailFilter{
                 detail: ContactDetail.DisplayLabel
                 field: DisplayLabel.Label
                 matchFlags: Filter.MatchContains
-                value: searchBox.text
+                value: filter.searchString
             }
         ]
     }
@@ -69,6 +72,16 @@
         autoUpdate: true
     }
 
+    Timer {
+        id: idleSearch
+
+        interval: 500
+        repeat: false
+        onTriggered: {
+            filter.searchString = searchBox.text
+        }
+    }
+
     Column {
         anchors.top: parent.top
         anchors.left: parent.left
@@ -81,12 +94,16 @@
             focus: true
             width: parent.width
             placeholderText: i18n.tr("Search contact")
+            inputMethodHints: Qt.ImhNoPredictiveText
             primaryItem: Icon {
                  height: parent.height*0.5
                  width: parent.height*0.5
                  anchors.verticalCenter: parent.verticalCenter
                  name:"find"
-             }
+            }
+            onTextChanged: {
+                idleSearch.restart()
+            }
         }
 
         ListView {
@@ -96,17 +113,37 @@
             model: contactModel
             height: units.gu(15)
             clip: true
-            delegate: Standard{
-                objectName: "contactPopoverList%1".arg(index)
-                property var item: contactModel.contacts[index]
-                height: units.gu(4)
-                text: item ? item.displayLabel.label : ""
-
-                onClicked: {
-                    root.contactSelected(item);
-                    onClicked: PopupUtils.close(root)
+            delegate: Column {
+                width: contactList.width
+                Repeater {
+                    anchors {
+                        left: parent.left
+                        right: parent.right
+                    }
+                    height: childrenRect.height
+
+                    model: Math.max(1, contact.emails.length)
+                    delegate: ListItem {
+                        property string emailAddress: contact.emails.length > index ? contact.emails[index].emailAddress : ""
+
+                        opacity: emailAddress.length > 0 ? 1.0 : 0.3
+                        width: contactList.width
+                        objectName: "contactPopoverList%1".arg(index)
+                        ListItemLayout {
+                            title.text: contact.displayLabel.label
+                            subtitle.text: emailAddress
+                        }
+                        onClicked: {
+                            if (emailAddress.length > 0) {
+                                root.contactSelected(contact, emailAddress);
+                                onClicked: PopupUtils.close(root)
+                            }
+                        }
+                    }
                 }
             }
         }
     }
+
+    Component.onCompleted: searchBox.forceActiveFocus()
 }
 
=== modified file 'KeyboardRectangle.qml'
--- KeyboardRectangle.qml	2016-01-25 13:20:32 +0000
+++ KeyboardRectangle.qml	2016-02-10 13:30:08 +0000
@@ -20,6 +20,7 @@
 
 Item {
     id: keyboardRect
+
     anchors.left: parent.left
     anchors.right: parent.right
     anchors.bottom: parent.bottom
 
=== modified file 'NewEvent.qml'
--- NewEvent.qml	2016-02-02 22:54:03 +0000
+++ NewEvent.qml	2016-02-10 13:30:08 +0000
@@ -20,7 +20,7 @@
 import QtOrganizer 5.0
 import Ubuntu.Components 1.3
 import Ubuntu.Components.Popups 1.0
-import Ubuntu.Components.ListItems 1.0 as ListItem
+import Ubuntu.Components.ListItems 1.0 as ListItems
 import Ubuntu.Components.Themes.Ambiance 1.0
 import Ubuntu.Components.Pickers 1.0
 import QtOrganizer 5.0
@@ -411,7 +411,7 @@
                 }
             }
 
-            ListItem.Standard {
+            ListItems.Standard {
                 anchors {
                     left: parent.left
                     right: parent.right
@@ -426,13 +426,13 @@
                 }
             }
 
-            ListItem.ThinDivider {}
+            ListItems.ThinDivider {}
 
             Column {
                 width: parent.width
                 spacing: units.gu(1)
 
-                ListItem.Header{
+                ListItems.Header{
                     text: i18n.tr("Event Details")
                 }
 
@@ -496,7 +496,7 @@
                 width: parent.width
                 spacing: units.gu(1)
 
-                ListItem.Header {
+                ListItems.Header {
                     text: i18n.tr("Calendar")
                 }
 
@@ -534,29 +534,51 @@
                 width: parent.width
                 spacing: units.gu(1)
 
-                ListItem.Header {
+                ListItems.Header {
                     text: i18n.tr("Guests")
                 }
 
                 Button{
+                    id: addGuestButton
+                    objectName: "addGuestButton"
+
+                    property var contactsPopup: null
+
                     text: i18n.tr("Add Guest")
-                    objectName: "addGuestButton"
-
                     anchors {
                         left: parent.left
                         right: parent.right
                         margins: units.gu(2)
                     }
 
+                    // WORKAROUND: causes the popover to follow the buttom position when keyboard appears
+                    Connections {
+                        target: keyboard
+                        onHeightChanged: {
+                            if (addGuestButton.contactsPopup) {
+                                addGuestButton.contactsPopup.caller = null
+                                addGuestButton.contactsPopup.caller = addGuestButton
+                            }
+                        }
+                    }
+
                     onClicked: {
-                        var popup = PopupUtils.open(Qt.resolvedUrl("ContactChoicePopup.qml"), contactList);
-                        popup.contactSelected.connect( function(contact) {
-                            var t = internal.contactToAttendee(contact);
-                            if( !internal.isContactAlreadyAdded(contact) ) {
+                        if (contactsPopup)
+                            return
+
+                        flickable.makeMeVisible(addGuestButton)
+                        contactsPopup = PopupUtils.open(Qt.resolvedUrl("ContactChoicePopup.qml"), addGuestButton);
+                        contactsPopup.contactSelected.connect( function(contact, emailAddress) {
+                            if(!internal.isContactAlreadyAdded(contact, emailAddress) ) {
+                                var t = internal.contactToAttendee(contact, emailAddress);
                                 contactModel.append(t);
                                 contactList.array.push(t);
                             }
+
                         });
+                        contactsPopup.Component.onDestruction.connect( function() {
+                            addGuestButton.contactsPopup = null
+                        })
                     }
                 }
 
@@ -585,27 +607,35 @@
 
                         Repeater{
                             model: contactModel
-                            delegate: ListItem.Standard {
+                            delegate: ListItem {
                                 objectName: "eventGuest%1".arg(index)
-                                height: units.gu(4)
-                                text: name
-                                removable: true
-                                onItemRemoved: {
-                                    contactList.array.splice(index, 1)
-                                    contactModel.remove(index)
+
+                                ListItemLayout {
+                                    title.text: name
+                                    subtitle.text: emailAddress
+                                }
+
+                                leadingActions: ListItemActions {
+                                    actions: Action {
+                                        iconName: "delete"
+                                        onTriggered: {
+                                            contactList.array.splice(index, 1)
+                                            contactModel.remove(index)
+                                        }
+                                    }
                                 }
                             }
                         }
                     }
                 }
 
-                ListItem.ThinDivider {
+                ListItems.ThinDivider {
                     visible: event.itemType === Type.Event
                 }
 
             }
 
-            ListItem.Subtitled{
+            ListItems.Subtitled{
                 id:thisHappens
                 objectName :"thisHappens"
 
@@ -621,11 +651,11 @@
                 onClicked: pageStack.push(Qt.resolvedUrl("EventRepetition.qml"),{"eventRoot": root,"isEdit":isEdit});
             }
 
-            ListItem.ThinDivider {
+            ListItems.ThinDivider {
                 visible: event.itemType === Type.Event
             }
 
-            ListItem.Subtitled{
+            ListItems.Subtitled{
                 id:eventReminder
                 objectName  : "eventReminder"
 
@@ -658,7 +688,7 @@
                                               "eventTitle": titleEdit.text})
             }
 
-            ListItem.ThinDivider {}
+            ListItems.ThinDivider {}
         }
     }
     // used to keep the field visible when the keyboard appear or dismiss
@@ -685,20 +715,26 @@
             messageEdit.focus = false
         }
 
-        function isContactAlreadyAdded(contact) {
+        function isContactAlreadyAdded(contact, emailAddress) {
             for(var i=0; i < contactList.array.length ; ++i) {
                 var attendee = contactList.array[i];
-                if( attendee.attendeeId === contact.contactId) {
-                    return true;
+                if (emailAddress.length > 0) {
+                    if (attendee.emailAddress === emailAddress) {
+                        return true;
+                    }
+                } else {
+                    if (attendee.attendeeId === contact.contactId) {
+                        return true
+                    }
                 }
             }
             return false;
         }
 
-        function contactToAttendee(contact) {
+        function contactToAttendee(contact, emailAddress) {
             var attendee = Qt.createQmlObject("import QtOrganizer 5.0; EventAttendee{}", event, "NewEvent.qml");
             attendee.name = contact.displayLabel.label
-            attendee.emailAddress = contact.email.emailAddress;
+            attendee.emailAddress = emailAddress;
             attendee.attendeeId = contact.contactId;
             return attendee;
         }