Merge lp:~renatofilho/address-book-service/demo-app-with-fetch-hint into lp:~phablet-team/address-book-service/contact-demo-app

[Renato Araujo Oliveira Filho]

Used fetcHint on contact model to fetch only contact name and phone.

[Bill Filler (bfiller)]

not working right.
- I can't select an item from the list
- double clicking only sometimes works and only ever shows the first contact in the list as that's the one that is selected
- we shouldn't use double click to get into edit mode, single click should do that like in the past
- in fact, single click should just take you into view of contact detail mode. Editing is then done from there not from the main screen.

review: Needs Fixing

[lp:~renatofilho/address-book-service/demo-app-with-fetch-hint]

16. By Renato Araujo Oliveira Filho on 2013-06-27

Merged "lp:~renatofilho/address-book-service/demo-app-with-section"

17. By Renato Araujo Oliveira Filho on 2013-06-27

Fixed contact edit action

[Bill Filler (bfiller)]

approved

review: Approve

=== modified file 'ContactEditor.qml'
--- ContactEditor.qml	2013-06-23 00:19:40 +0000
+++ ContactEditor.qml	2013-06-27 17:17:26 +0000
@@ -73,14 +73,13 @@
         }
         ListItem.ThinDivider {}
     }
-    
+
     function setContactDetails(contact) {
         contact.name.firstName = contactFirstName.text
         contact.name.middleName = contactMiddleName.text
         contact.name.lastName = contactLastName.text
         contact.email.emailAddress = contactEmail.text
         contact.phoneNumber.number = contactPhone.text
-        console.debug("Update contact number:" + contactPhone.text)
     }
 
     function updateContact() {
@@ -90,14 +89,14 @@
             newContact.save()
             contactEditor.model.saveContact(newContact)
 
-        } else if ((contactFirstName.text != contactEditor.contact.name.firstName) ||
-                   (contactMiddleName.text != contactEditor.contact.name.middleName) ||
-                   (contactLastName.text != contactEditor.contact.name.lastName) ||
-                   (contactEmail.text != contactEditor.contact.email.emailAddress) ||
-                   (contactPhone.text != contactEditor.contact.phoneNumber.number)) {
+        } else if ((contactFirstName.text !== contactEditor.contact.name.firstName) ||
+                   (contactMiddleName.text !== contactEditor.contact.name.middleName) ||
+                   (contactLastName.text !== contactEditor.contact.name.lastName) ||
+                   (contactEmail.text !== contactEditor.contact.email.emailAddress) ||
+                   (contactPhone.text !== contactEditor.contact.phoneNumber.number)) {
             // update existing contact
             setContactDetails(contactEditor.contact)
-            contactEditor.contact.save()
+            contact.save()
         }
     }
 
 
=== added file 'ContactList.js'
--- ContactList.js	1970-01-01 00:00:00 +0000
+++ ContactList.js	2013-06-27 17:17:26 +0000
@@ -0,0 +1,35 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Canonical Ltd
+**
+****************************************************************************/
+
+var sectionData = [];
+var _sections = [];
+
+function initSectionData(list) {
+    if (!list || !list.model) {
+        return;
+    }
+
+    sectionData = [];
+    _sections = [];
+
+    var current = "",
+        prop = list.section.property,
+        item;
+
+    for (var i = 0, count = list.model.contacts.length; i < count; i++) {
+        item = list.sectionValueForContact(list.model.contacts[i])
+        if (item !== current) {
+            current = item;
+            _sections.push(current);
+            sectionData.push({ index: i, header: current });
+        }
+    }
+}
+
+function getIndexFor(sectionName) {
+    var val = sectionData[_sections.indexOf(sectionName)].index;
+    return val === 0 || val > 0 ? val : -1;
+}
 
=== modified file 'ContactList.qml'
--- ContactList.qml	2013-06-23 00:19:40 +0000
+++ ContactList.qml	2013-06-27 17:17:26 +0000
@@ -8,6 +8,8 @@
 import Ubuntu.Components 0.1
 import Ubuntu.Components.ListItems 0.1 as ListItem
 
+import "ContactList.js" as Sections
+
 Page {
     id: mainPage
 
@@ -32,6 +34,13 @@
                 direction: Qt.AscendingOrder
             }
         ]
+
+        fetchHint: FetchHint {
+            detailTypesHint: [ContactDetail.Avatar,
+                              ContactDetail.Name,
+                              ContactDetail.PhoneNumber]
+        }
+
         Component.onCompleted: {
             if (manager == "memory")
                 contactsModel.importContacts(Qt.resolvedUrl("example.vcf"))
@@ -41,9 +50,7 @@
             var fullValue = ""
 
             if (contact) {
-                console.debug("FieldNames:" + fieldNames)
                 var fieldNameList = fieldNames.split(",")
-                console.debug("FieldNameList:" + fieldNameList)
                 for (var fieldNameIndex in fieldNameList) {
                     var fieldName = fieldNameList[fieldNameIndex]
                     var value = "";
@@ -73,52 +80,137 @@
         }
     }
 
-
-
-    ListView {
-        id: listView
+    ListView {
+        id: alphabetView
+
+        property string selectedLetter: contactListView.contentY > 0  ? contactListView.itemAt(0, contactListView.contentY).sectionName : "A"
+
+        anchors {
+            top: parent.top
+            left: parent.left
+            right: parent.right
+        }
+        focus: true
+        height: units.gu(4)
+        orientation: ListView.Horizontal
+
+        model: ["A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z" ]
+        delegate: Label {
+            text: modelData
+            font.bold: alphabetView.selectedLetter == text
+            horizontalAlignment: Text.AlignHCenter
+            fontSize: "large"
+            width: units.gu(3)
+
+            MouseArea {
+                anchors.fill: parent
+                onClicked: {
+                    contactListView.scroolToSection(modelData)
+                }
+            }
+
+        }
+    }
+
+    ListView {
+        id: contactListView
 
         property string title
 
-        anchors.fill: parent
+        clip: true
+        snapMode: ListView.NoSnap
+        section {
+            property: "contact.name.firstName"
+            criteria: ViewSection.FirstCharacter
+            delegate: ListItem.Header {
+                id: listHeader
+                //text: section
+                visible: false
+                height: 0
+            }
+        }
+
+        anchors {
+            top: alphabetView.bottom
+            left: parent.left
+            right: parent.right
+            bottom: parent.bottom
+        }
         model: contactsModel
         header: ListItem.Header {
-            id: listHeader
-
-            text: listView.title
+            text: contactListView.title
         }
 
         onCountChanged: {
+            dirtyTimer.restart()
             if (mainPage.startTime) {
                 var currentTime = new Date();
                 var elapsed = currentTime.getTime() - mainPage.startTime.getTime()
-                listView.title = "Elapsed time to load " + count + " contacts: " + (elapsed/1000) + " secs"
+                contactListView.title = "Elapsed time to load " + count + " contacts: " + (elapsed/1000) + " secs"
             }
         }
 
         delegate: ListItem.Subtitled {
             property variant contactObject: contact
             property string contactId: contact.contactId
+            property string sectionName: ListView.section
 
-            icon: Qt.resolvedUrl("avatar.png")
+            icon: contact && contact.avatar && (contact.avatar.imageUrl != "") ?  Qt.resolvedUrl(contact.avatar.imageUrl) : Qt.resolvedUrl("avatar.png")
             text: contactsModel.titleField ? contactsModel.getContactDetails(contact, contactsModel.titleField) : ""
             subText: contactsModel.subTitleField ? contactsModel.getContactDetails(contact, contactsModel.subTitleField) : ""
-            selected: listView.currentIndex === index
-
-            onClicked: {
-                listView.currentIndex = index
-                pageStack.push(Qt.resolvedUrl("ContactEditor.qml"), {model: contactsModel, contact: listView.currentItem.contactObject})
-            }
+            selected: contactListView.currentIndex === index
+
+            MouseArea {
+                anchors.fill:  parent
+                onClicked: {
+                    contactListView.currentIndex = index
+                }
+                onDoubleClicked: {
+                    editContactPriv.contactId = contactListView.currentItem.contactObject.contactId
+                }
+            }
+        }
+
+        UbuntuNumberAnimation { id: scroolToSectionAnimation; target: contactListView; property: "contentY"; }
+        function scroolToSection(targetSection) {
+            scroolToSectionAnimation.from = contactListView.contentY
+            contactListView.positionViewAtIndex(Sections.getIndexFor(targetSection), ListView.Beginning)
+            scroolToSectionAnimation.to = contactListView.contentY
+            scroolToSectionAnimation.running = true
+        }
+
+        // function used to build the section cache by "ContactList.js"
+        function sectionValueForContact(contact) {
+            if (contact) {
+                return contact.name && contact.name.firstName ? contact.name.firstName[0] : ""
+            } else {
+                return null
+            }
+        }
+    }
+
+    Timer {
+        id: dirtyTimer
+
+        interval: 2000
+        running: false
+        repeat: false
+        onTriggered: {
+            Sections.initSectionData(contactListView)
         }
     }
 
     ActivityIndicator {
-        running: listView.count == 0
+        id: busyIndicator
+
+        property bool pageIsBusy: false
+
+        running: contactListView.count == 0 || pageIsBusy
         visible: running
-        anchors.centerIn: listView
+        anchors.centerIn: contactListView
     }
 
-    tools: ToolbarItems {
+    tools: ToolbarActions {
         Action {
             text: i18n.tr("Settings")
             iconSource: Qt.resolvedUrl("settings.png")
@@ -128,7 +220,9 @@
         Action {
             text: i18n.tr("Edit")
             iconSource: Qt.resolvedUrl("edit.png")
-            onTriggered: pageStack.push(Qt.resolvedUrl("ContactEditor.qml"), {model: contactsModel, contact: listView.currentItem.contactObject})
+            onTriggered: {
+                editContactPriv.contactId = contactListView.currentItem.contactObject.contactId
+            }
         }
         Action {
             text: i18n.tr("New")
@@ -139,9 +233,45 @@
             text: i18n.tr("Delete")
             iconSource: Qt.resolvedUrl("delete.png")
             onTriggered: {
-                console.debug("Delete: " + listView.currentItem.contactId)
-                contactsModel.removeContact(listView.currentItem.contactId);
-            }
-        }
-    }
+                contactsModel.removeContact(contactListView.currentItem.contactId);
+            }
+        }
+    }
+
+    Item {
+        id: editContactPriv
+
+        property string contactId
+        property int currentQueryId: -1
+
+        visible: false
+        Connections {
+            target: contactsModel
+            onContactsFetched: {
+                if (requestId == editContactPriv.currentQueryId) {
+                    editContactPriv.currentQueryId = -1
+                    busyIndicator.pageIsBusy = false
+                    pageStack.push(Qt.resolvedUrl("ContactEditor.qml"),
+                                   {model: contactsModel, contact: fetchedContacts[0]})
+                }
+            }
+        }
+
+        onContactIdChanged: {
+            if (!contactId || (currentQueryId != -1)) {
+                return
+            }
+
+            busyIndicator.pageIsBusy = true
+
+            currentQueryId = contactsModel.fetchContacts([contactId])
+            if (currentQueryId == -1) {
+                busyIndicator.pageIsBusy = false
+            }
+        }
+
+
+    }
+
+
 }
 
=== modified file 'debian/contacts-demo-app.install'
--- debian/contacts-demo-app.install	2013-06-07 19:19:01 +0000
+++ debian/contacts-demo-app.install	2013-06-27 17:17:26 +0000
@@ -1,5 +1,6 @@
 contacts-demo-app usr/bin/
 contacts-demo-app.desktop usr/share/applications/
 *.qml usr/share/contacts-demo-app/
+*.js usr/share/contacts-demo-app/
 *.png usr/share/contacts-demo-app/
 *.vcf usr/share/contacts-demo-app/