Merge lp:~renatofilho/address-book-app/release-2014-06-18 into lp:address-book-app

[Renato Araujo Oliveira Filho]

Update contact view page visuals
Update contact edit page visuals
Add a hide animation for the bottom edge title.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:191
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/589/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-utopic-amd64-ci/42
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-utopic-armhf-ci/42
        deb: http://jenkins.qa.ubuntu.com/job/address-book-app-utopic-armhf-ci/42/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-utopic-i386-ci/42
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/1014
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/915
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/1396
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1786
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1786/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/8602
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/790
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1057
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1057/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/address-book-app-ci/589/rebuild

review: Needs Fixing (continuous-integration)

[lp:~renatofilho/address-book-app/release-2014-06-18]

192. By Renato Araujo Oliveira Filho on 2014-06-18

To not keep track of contact in the ContactDetailPickerPhoneNumberDelegate.

This avoid crashes during the contact removal.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:192
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/590/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-utopic-amd64-ci/43
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-utopic-armhf-ci/43
        deb: http://jenkins.qa.ubuntu.com/job/address-book-app-utopic-armhf-ci/43/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-utopic-i386-ci/43
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/1017
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/919
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/1398
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1792
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1792/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/8605
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/793
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1061
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1061/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/address-book-app-ci/590/rebuild

review: Approve (continuous-integration)

[Renato Araujo Oliveira Filho (renatofilho)]

Are there any related MPs required for this MP to build/function as expected? YES

Is your branch in sync with latest trunk? YES

Did you perform an exploratory manual test run of your code change and any related functionality on device or emulator? YES

Did you successfully run all tests found in your component's Test Plan on device or emulator? YES

If you changed the UI, was the change specified/approved by design? YES

If you changed the packaging (debian), did you subscribe a core-dev to this MP? No package change

=== modified file 'src/app/imagescalethread.cpp'
--- src/app/imagescalethread.cpp	2013-10-15 14:34:03 +0000
+++ src/app/imagescalethread.cpp	2014-06-18 21:27:19 +0000
@@ -57,7 +57,7 @@
     }
 
     // Create the temporary file
-    m_tmpFile = new QTemporaryFile();
+    m_tmpFile = new QTemporaryFile("avatar_XXXXXX.png");
     if (!m_tmpFile->open()) {
         return;
     }

=== modified file 'src/imports/Common/ContactDetailBase.qml'
--- src/imports/Common/ContactDetailBase.qml	2014-05-08 18:10:28 +0000
+++ src/imports/Common/ContactDetailBase.qml	2014-06-18 21:27:19 +0000
@@ -93,6 +93,7 @@
     }
 
     highlightWhenPressed: false
+    showDivider: false
 
     Rectangle {
         anchors.fill: parent

=== modified file 'src/imports/Common/ContactDetailItem.qml'
--- src/imports/Common/ContactDetailItem.qml	2014-05-16 00:06:46 +0000
+++ src/imports/Common/ContactDetailItem.qml	2014-06-18 21:27:19 +0000
@@ -23,6 +23,7 @@
 
     readonly property alias fieldDelegates: fieldsColumn.children
     property Component fieldDelegate: null
+    property alias spacing: fieldsColumn.spacing
 
     implicitHeight: fieldsColumn.height
     Column {

=== added file 'src/imports/ContactEdit/AddFieldDialog.qml'
--- src/imports/ContactEdit/AddFieldDialog.qml	1970-01-01 00:00:00 +0000
+++ src/imports/ContactEdit/AddFieldDialog.qml	2014-06-18 21:27:19 +0000
@@ -0,0 +1,142 @@
+/*
+ * Copyright (C) 2012-2014 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.2
+import Ubuntu.Components 0.1
+import QtContacts 5.0
+import Ubuntu.Components.Popups 0.1 as Popups
+
+
+Item {
+    id: root
+
+    property QtObject contact: null
+    property var currentDialog: null
+    readonly property var validDetails: [ ContactDetail.PhoneNumber,
+                                          ContactDetail.Email,
+                                          ContactDetail.Address,
+                                          ContactDetail.OnlineAccount,
+                                          ContactDetail.Organization
+                                          // TODO: Not supported yet
+                                          // ContactDetail.Birthday,
+                                          // ContactDetail.Note,
+                                          // ContactDetail.Url
+                                         ]
+    readonly property var singleValueDetails: [ ContactDetail.Organization ]
+    signal fieldSelected(string fieldName, string qmlTypeName)
+
+    function showOptions()
+    {
+        if (currentDialog == null) {
+            // make sure the OSK disappear
+            root.forceActiveFocus()
+            currentDialog = PopupUtils.open(addFieldDialog, null)
+        }
+    }
+
+    function nameFromEnum(value)
+    {
+        switch (value)
+        {
+        case ContactDetail.PhoneNumber:
+            return i18n.tr("Phone")
+        case ContactDetail.Email:
+            return i18n.tr("Email")
+        case ContactDetail.Address:
+            return i18n.tr("Address")
+        case ContactDetail.OnlineAccount:
+            return i18n.tr("Social")
+        case ContactDetail.Organization:
+            return i18n.tr("Professional Details")
+        default:
+            console.error("Invalid contact detail enum value:" + value)
+            return ""
+        }
+    }
+
+    function qmlTypeFromEnum(value)
+    {
+        switch (value)
+        {
+        case ContactDetail.PhoneNumber:
+            return "PhoneNumber"
+        case ContactDetail.Email:
+            return "EmailAddress"
+        case ContactDetail.Address:
+            return "Address"
+        case ContactDetail.OnlineAccount:
+            return "OnlineAccount"
+        case ContactDetail.Organization:
+            return "Organization"
+        default:
+            console.error("Invalid contact detail enum value:" + value)
+            return ""
+        }
+    }
+
+    // check which details will be allowed to create
+    // some details we only support one value
+    function filterSingleDetails(details, contact)
+    {
+        var result = []
+        for(var i=0; i < details.length; i++) {
+            var det = details[i]
+            if (singleValueDetails.indexOf(det) != -1) {
+                if (contact.details(det).length === 0) {
+                    result.push(det)
+                }
+            } else {
+                result.push(det)
+            }
+        }
+        return result
+    }
+
+    visible: false
+    Component {
+        id: addFieldDialog
+
+        Popups.Dialog {
+            id: dialogue
+            objectName: "addFieldDialog"
+
+            title: i18n.tr("Select a field")
+            Repeater {
+                model: root.filterSingleDetails(validDetails, root.contact)
+                Button {
+                    objectName: text
+
+                    text: root.nameFromEnum(modelData)
+                    onClicked: {
+                        root.fieldSelected(text, root.qmlTypeFromEnum(modelData))
+                        PopupUtils.close(root.currentDialog)
+                        root.currentDialog = null
+                    }
+                }
+            }
+            Button {
+                objectName: "cancel"
+
+                text: i18n.tr("Cancel")
+                gradient: UbuntuColors.greyGradient
+                onClicked: {
+                    PopupUtils.close(root.currentDialog)
+                    root.currentDialog = null
+                }
+            }
+        }
+    }
+}

=== added file 'src/imports/ContactEdit/AvatarImport.qml'
--- src/imports/ContactEdit/AvatarImport.qml	1970-01-01 00:00:00 +0000
+++ src/imports/ContactEdit/AvatarImport.qml	2014-06-18 21:27:19 +0000
@@ -0,0 +1,78 @@
+/*
+ * Copyright (C) 2012-2014 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.2
+import Ubuntu.Components 0.1
+import Ubuntu.Components.Popups 0.1 as Popups
+import Ubuntu.Content 0.1 as ContentHub
+
+Item {
+    id: root
+
+    property var activeTransfer: null
+    property var loadingDialog: null
+
+    signal avatarReceived(string avatarUrl)
+
+    function requestNewAvatar()
+    {
+        if (!root.loadingDialog) {
+            root.loadingDialog = PopupUtils.open(loadingDialog, null)
+            root.activeTransfer = defaultSource.request();
+        }
+    }
+
+    ContentHub.ContentPeer {
+        id: defaultSource
+
+        contentType: ContentHub.ContentType.Pictures
+        handler: ContentHub.ContentHandler.Source
+        selectionType: ContentHub.ContentTransfer.Single
+    }
+
+    Connections {
+        target: root.activeTransfer
+        onStateChanged: {
+            var done = ((root.activeTransfer.state === ContentHub.ContentTransfer.Charged) ||
+                        (root.activeTransfer.state === ContentHub.ContentTransfer.Aborted));
+
+            if (root.activeTransfer.state === ContentHub.ContentTransfer.Charged) {
+                if (root.activeTransfer.items.length > 0) {
+                    root.avatarReceived(root.activeTransfer.items[0].url)
+                }
+            }
+
+            if (done) {
+                PopupUtils.close(root.loadingDialog)
+                root.loadingDialog = null
+            }
+        }
+    }
+
+    Component {
+        id: loadingDialog
+
+        Popups.Dialog {
+            id: dialogue
+
+            title: i18n.tr("Loading")
+            ActivityIndicator {
+                running: true
+                visible: running
+            }
+        }
+    }
+}

=== modified file 'src/imports/ContactEdit/CMakeLists.txt'
--- src/imports/ContactEdit/CMakeLists.txt	2014-06-09 22:45:19 +0000
+++ src/imports/ContactEdit/CMakeLists.txt	2014-06-18 21:27:19 +0000
@@ -1,4 +1,6 @@
 set(CONTACT_EDIT_QMLS
+    AvatarImport.qml
+    AddFieldDialog.qml
     ContactDetailAddressesEditor.qml
     ContactDetailAvatarEditor.qml
     ContactDetailEmailsEditor.qml

=== modified file 'src/imports/ContactEdit/ContactDetailAvatarEditor.qml'
--- src/imports/ContactEdit/ContactDetailAvatarEditor.qml	2014-05-06 13:18:07 +0000
+++ src/imports/ContactEdit/ContactDetailAvatarEditor.qml	2014-06-18 21:27:19 +0000
@@ -17,15 +17,13 @@
 import QtQuick 2.2
 import Ubuntu.Components 0.1
 import QtContacts 5.0
-import Ubuntu.Content 0.1
-import Ubuntu.Components.Popups 0.1 as Popups
 
 import "../Common"
 
 ContactDetailBase {
     id: root
 
-    readonly property string defaultAvatar: Qt.resolvedUrl("../../artwork/contact-default-profile.png")
+    readonly property string defaultAvatar: "image://theme/contact"
 
     function isEmpty() {
         return false;
@@ -62,98 +60,51 @@
     }
 
     detail: contact ? contact.detail(ContactDetail.Avatar) : null
-    implicitHeight: units.gu(17)
-
-    Image {
-        id: avatarImage
-
-        anchors.fill: parent
-        source: root.getAvatar(root.detail)
-        asynchronous: true
-        fillMode: Image.PreserveAspectCrop
-        // When updating the avatar using the content picker the temporary file returned
-        // can contain the same name as the previous one and if the cache is enabled this
-        // will cause the image to not be updated
-        cache: false
-
-        Component {
-            id: loadingDialog
-
-            Popups.Dialog {
-                id: dialogue
-
-                title: i18n.tr("Loading")
-
-                ActivityIndicator {
-                    id: activity
-
-                    anchors.centerIn: parent
-                    running: true
-                    visible: running
-                }
-            }
-        }
-
-        Icon {
-            anchors {
-                right: parent.right
-                rightMargin: units.gu(1.5)
-                bottom: parent.bottom
-                bottomMargin: units.gu(2)
-            }
-            width: units.gu(3)
-            height: width
-            name: "import-image"
-            color: "white"
-        }
-
-        ContentPeer {
-            id: defaultSource
-            contentType: ContentType.Pictures
-            handler: ContentHandler.Source
-            selectionType: ContentTransfer.Single
-        }
-
-        MouseArea {
-            id: changeButton
-
-            property var activeTransfer
-            property var loadingDialog: null
-
-            anchors.fill: parent
-            onClicked: {
-                // make sure the OSK disappear
-                root.forceActiveFocus()
-                if (!changeButton.loadingDialog) {
-                    changeButton.loadingDialog = PopupUtils.open(loadingDialog, null)
-                    changeButton.activeTransfer = defaultSource.request();
-                }
-            }
-
-            Connections {
-                target: changeButton.activeTransfer != null ? changeButton.activeTransfer : null
-                onStateChanged: {
-                    var done = ((changeButton.activeTransfer.state === ContentTransfer.Charged) ||
-                                (changeButton.activeTransfer.state === ContentTransfer.Aborted));
-
-                    if (changeButton.activeTransfer.state === ContentTransfer.Charged) {
-                        if (changeButton.activeTransfer.items.length > 0) {
-                            // remove the previous image, this is nessary to make sure that the new image
-                            // get updated otherwise if the new image has the same name the image will not
-                            // be updated
-                            avatarImage.source = ""
-                            // Update with the new valu
-                            avatarImage.source = application.copyImage(root.contact, changeButton.activeTransfer.items[0].url);
-                        }
-                    }
-
-                    if (done) {
-                        PopupUtils.close(changeButton.loadingDialog)
-                        changeButton.loadingDialog = null
-                    }
-                }
-            }
+    implicitHeight: units.gu(8)
+    implicitWidth: units.gu(8)
+
+    UbuntuShape {
+        id: avatar
+
+        radius: "medium"
+        anchors.fill: parent
+        image: Image {
+            id: avatarImage
+
+            fillMode: Image.PreserveAspectCrop
+            asynchronous: true
+            source: root.getAvatar(root.detail)
+            height: units.gu(8)
+            width: units.gu(8)
+
+            // When updating the avatar using the content picker the temporary file returned
+            // can contain the same name as the previous one and if the cache is enabled this
+            // will cause the image to not be updated
+            cache: false
+        }
+    }
+
+    AvatarImport {
+        id: avatarImport
+
+        onAvatarReceived: {
+            // remove the previous image, this is nessary to make sure that the new image
+            // get updated otherwise if the new image has the same name the image will not
+            // be updated
+            avatarImage.source = ""
+            // Update with the new value
+            avatarImage.source = application.copyImage(root.contact, avatarUrl);
+        }
+    }
+
+    MouseArea {
+        anchors.fill: parent
+        onClicked: {
+            // make sure the OSK disappear
+            root.forceActiveFocus()
+            avatarImport.requestNewAvatar()
         }
     }
 }
 
+

=== modified file 'src/imports/ContactEdit/ContactDetailGroupWithTypeEditor.qml'
--- src/imports/ContactEdit/ContactDetailGroupWithTypeEditor.qml	2014-05-22 06:56:03 +0000
+++ src/imports/ContactEdit/ContactDetailGroupWithTypeEditor.qml	2014-06-18 21:27:19 +0000
@@ -95,7 +95,7 @@
 
         return changed
     }
-    minimumHeight: units.gu(5)
+
     headerDelegate: ListItem.Empty {
         id: header
         highlightWhenPressed: false
@@ -104,6 +104,9 @@
         height: units.gu(5)
         // disable listview mouse area
         __mouseArea.visible: false
+        divider.anchors.leftMargin: units.gu(2)
+        divider.anchors.rightMargin: units.gu(2)
+
         Label {
             anchors {
                 verticalCenter: parent.verticalCenter
@@ -117,35 +120,6 @@
             // style
             fontSize: "medium"
         }
-
-        Icon {
-            objectName: "newDetailButton"
-
-            anchors {
-                verticalCenter: parent.verticalCenter
-                right: parent.right
-                rightMargin: units.gu(2)
-            }
-            width: units.gu(2)
-            height: units.gu(2)
-            name: "add"
-        }
-
-        // Mouse area fill all title area to avoid problems with swipe from the right gesture
-        MouseArea {
-            anchors.fill: parent
-            onClicked: {
-                if (detailQmlTypeName) {
-                    var newDetail = Qt.createQmlObject("import QtContacts 5.0; " + detailQmlTypeName + "{}", root)
-                    if (newDetail) {
-                        var newDetailsCopy = root.newDetails
-                        newDetailsCopy.push(newDetail)
-                        root.newDetails = newDetailsCopy
-                        root.contact.addDetail(newDetail)
-                    }
-                }
-            }
-        }
     }
 
     detailDelegate: ContactDetailWithTypeEditor {

=== modified file 'src/imports/ContactEdit/ContactDetailNameEditor.qml'
--- src/imports/ContactEdit/ContactDetailNameEditor.qml	2014-05-09 20:00:09 +0000
+++ src/imports/ContactEdit/ContactDetailNameEditor.qml	2014-06-18 21:27:19 +0000
@@ -51,6 +51,7 @@
         return changed
     }
 
+    spacing: units.gu(1)
     detail: root.contact ? root.contact.name : null
     fields: [ QtContacts.Name.FirstName, QtContacts.Name.LastName ]
 

=== modified file 'src/imports/ContactEdit/ContactDetailSyncTargetEditor.qml'
--- src/imports/ContactEdit/ContactDetailSyncTargetEditor.qml	2014-05-28 15:22:38 +0000
+++ src/imports/ContactEdit/ContactDetailSyncTargetEditor.qml	2014-06-18 21:27:19 +0000
@@ -84,6 +84,12 @@
         height: units.gu(4)
     }
 
+    ListItem.ThinDivider {
+        id: divider
+
+        anchors.top: label.bottom
+    }
+
     OptionSelector {
         id: sources
 
@@ -91,8 +97,8 @@
         anchors {
             left: parent.left
             leftMargin: units.gu(2)
-            top: label.bottom
-            topMargin: units.gu(1)
+            top: divider.bottom
+            topMargin: units.gu(2)
             right: parent.right
             rightMargin: units.gu(2)
             bottom: parent.bottom

=== modified file 'src/imports/ContactEdit/ContactDetailWithTypeEditor.qml'
--- src/imports/ContactEdit/ContactDetailWithTypeEditor.qml	2014-05-16 01:59:36 +0000
+++ src/imports/ContactEdit/ContactDetailWithTypeEditor.qml	2014-06-18 21:27:19 +0000
@@ -73,41 +73,19 @@
     enabled: root.detail ? !root.detail.readOnly : false
     implicitHeight: detailTypeSelector.height + fieldValues.height + units.gu(2)
     opacity: enabled ? 1.0 : 0.5
-    ValueSelector {
-        id: detailTypeSelector
-        objectName: detail ? "type_" + detailToString(detail.type, -1) + "_" + index : ""
-
-        readOnly: root.detail ? root.detail.readOnly : false
-        visible: (currentIndex != -1)
-        active: root.active
+
+    Column {
+        id: fieldValues
+
         anchors {
             left: parent.left
-            leftMargin: units.gu(3)
+            leftMargin: units.gu(2)
             right: parent.right
             rightMargin: units.gu(2)
             top: parent.top
             topMargin: units.gu(1)
         }
-
-        height: visible ? (root.active ? units.gu(4) : units.gu(3)) : 0
-        onExpandedChanged: {
-            // Make sure that the inputfield get focus when clicking on type selector
-            if (expanded) {
-                root.forceActiveFocus()
-            }
-        }
-    }
-
-    Column {
-        id: fieldValues
-
-        anchors {
-            left: detailTypeSelector.left
-            right: detailTypeSelector.right
-            top: detailTypeSelector.bottom
-        }
         height: childrenRect.height
-
         Repeater {
             id: fieldRepeater
 
@@ -141,4 +119,26 @@
             }
         }
     }
+
+    ValueSelector {
+        id: detailTypeSelector
+        objectName: detail ? "type_" + detailToString(detail.type, -1) + "_" + index : ""
+
+        anchors {
+            left: fieldValues.left
+            right: fieldValues.right
+            top: fieldValues.bottom
+        }
+
+        readOnly: root.detail ? root.detail.readOnly : false
+        visible: (currentIndex != -1)
+        active: root.active
+        height: visible ? (root.active ? units.gu(4) : units.gu(3)) : 0
+        onExpandedChanged: {
+            // Make sure that the inputfield get focus when clicking on type selector
+            if (expanded) {
+                root.forceActiveFocus()
+            }
+        }
+    }
 }

=== modified file 'src/imports/ContactEdit/ContactEditor.qml'
--- src/imports/ContactEdit/ContactEditor.qml	2014-06-16 12:59:15 +0000
+++ src/imports/ContactEdit/ContactEditor.qml	2014-06-18 21:27:19 +0000
@@ -161,7 +161,7 @@
             fill: parent
             bottomMargin: keyboard.height
         }
-        contentHeight: contents.height
+        contentHeight: contents.height + units.gu(2)
         contentWidth: parent.width
 
         //after add a new field we need to wait for the contentHeight to change to scroll to the correct position
@@ -172,32 +172,48 @@
 
             anchors {
                 top: parent.top
+                topMargin: units.gu(2)
                 left: parent.left
                 right: parent.right
             }
             height: childrenRect.height
 
-            ContactDetailNameEditor {
-                id: nameEditor
-
-
-                anchors {
-                    left: parent.left
-                    right: parent.right
-                }
-                height: nameEditor.implicitHeight + units.gu(3)
-                contact: contactEditor.contact
-            }
-
-            ContactDetailAvatarEditor {
-                id: avatarEditor
-
-                contact: contactEditor.contact
-                anchors {
-                    left: parent.left
-                    right: parent.right
-                }
-                height: implicitHeight
+            Row {
+                function save()
+                {
+                    var avatarSave = avatarEditor.save()
+                    var nameSave = nameEditor.save();
+
+                    return (nameSave || avatarSave);
+                }
+
+                function isEmpty()
+                {
+                    return (avatarEditor.isEmpty() && nameEditor.isEmpty())
+                }
+
+                anchors {
+                    left: parent.left
+                    leftMargin: units.gu(2)
+                    right: parent.right
+                }
+                height: Math.max(avatarEditor.height, nameEditor.height) - units.gu(4)
+
+                ContactDetailAvatarEditor {
+                    id: avatarEditor
+
+                    contact: contactEditor.contact
+                    height: implicitHeight
+                    width: implicitWidth
+                }
+
+                ContactDetailNameEditor {
+                    id: nameEditor
+
+                    width: parent.width - avatarEditor.width
+                    height: nameEditor.implicitHeight + units.gu(3)
+                    contact: contactEditor.contact
+                }
             }
 
             ContactDetailPhoneNumbersEditor {
@@ -272,13 +288,48 @@
                 height: implicitHeight
             }
 
-            // We need this extra element to correct align the deleteButton
+            ListItem.ThinDivider {}
+
             Item {
                 anchors {
                     left: parent.left
                     right: parent.right
                 }
-                height: deleteButton.height + units.gu(2)
+                height: units.gu(2)
+            }
+
+            Row {
+                anchors {
+                    left: parent.left
+                    right: parent.right
+                    margins: units.gu(2)
+                }
+                height: units.gu(6)
+                spacing: units.gu(2)
+
+                // WORKAROUND: SDK uses a old version of qtquick components
+                activeFocusOnTab: true
+                onActiveFocusChanged: {
+                    if (activeFocus) {
+                        addNewFieldButton.forceActiveFocus()
+                    }
+                }
+
+                Button {
+                    id: addNewFieldButton
+                    objectName: "addNewFieldButton"
+
+                    text: i18n.tr("Add Field")
+                    gradient: UbuntuColors.greyGradient
+                    anchors {
+                        top: parent.top
+                        bottom: parent.bottom
+                        bottomMargin: units.gu(2)
+                    }
+                    width: (parent.width / 2) - units.gu(1)
+
+                    onClicked: addFieldDialog.showOptions()
+                }
 
                 Button {
                     id: deleteButton
@@ -286,12 +337,11 @@
                     text: i18n.tr("Delete")
                     visible: !contactEditor.isNewContact
                     anchors {
-                        margins: units.gu(2)
                         top: parent.top
-                        left: parent.left
-                        right: parent.right
+                        bottom: parent.bottom
+                        bottomMargin: units.gu(2)
                     }
-
+                    width: (parent.width / 2) - units.gu(1)
                     onClicked: {
                         var dialog = Popups.PopupUtils.open(removeContactDialog, null)
                         dialog.contacts = [contactEditor.contact]
@@ -351,6 +401,23 @@
         }
     }
 
+    AddFieldDialog {
+        id: addFieldDialog
+
+        contact: contactEditor.contact
+        onFieldSelected: {
+            if (qmlTypeName) {
+                var newDetail = Qt.createQmlObject("import QtContacts 5.0; " + qmlTypeName + "{}", addFieldDialog)
+                if (newDetail) {
+                    var newDetailsCopy = contactEditor.newDetails
+                    newDetailsCopy.push(newDetail)
+                    contactEditor.newDetails = newDetailsCopy
+                    contactEditor.contact.addDetail(newDetail)
+                }
+            }
+        }
+    }
+
     Component {
         id: removeContactDialog
 

=== modified file 'src/imports/ContactEdit/TextInputDetail.qml'
--- src/imports/ContactEdit/TextInputDetail.qml	2014-05-28 15:19:53 +0000
+++ src/imports/ContactEdit/TextInputDetail.qml	2014-06-18 21:27:19 +0000
@@ -80,6 +80,7 @@
             overlaySpacing: 0
             frameSpacing: 0
             background: Item {}
+            color: UbuntuColors.lightAubergine
         }
         onActiveFocusChanged: {
             if (activeFocus) {

=== modified file 'src/imports/ContactEdit/ValueSelector.qml'
--- src/imports/ContactEdit/ValueSelector.qml	2014-06-06 17:52:58 +0000
+++ src/imports/ContactEdit/ValueSelector.qml	2014-06-18 21:27:19 +0000
@@ -59,22 +59,12 @@
 
     // FIXME: workaround to close list after a while.
     // we cant rely on focus since it hides the keyboard.
-    MouseArea {
-        anchors.fill: parent
-        visible: expanded
-        onPressed: {
-            mouse.accepted = false
-            timer.restart()
-        }
-        propagateComposedEvents: true
-        z: 1
-    }
-
     Timer {
         id: timer
+
         interval: 5000
+        running: false
         onTriggered: state = ""
-        running: false
     }
 
     Item {
@@ -119,8 +109,12 @@
 
     MouseArea {
         anchors.fill: parent
-        propagateComposedEvents: true
-        onClicked: if (!readOnly) root.state = "expanded"
+        onClicked: {
+            if (!readOnly) {
+                root.state = "expanded"
+                timer.restart()
+            }
+        }
     }
 
     ListView {
@@ -160,7 +154,10 @@
                     width: parent.width + units.gu(0.5)
                     height: parent.height + units.gu(0.5)
                     anchors.centerIn: parent
-                    onClicked: currentIndex = index
+                    onClicked: {
+                        currentIndex = index
+                        timer.restart()
+                    }
                 }
             }
 

=== modified file 'src/imports/ContactList/ContactListPage.qml'
--- src/imports/ContactList/ContactListPage.qml	2014-06-16 12:59:54 +0000
+++ src/imports/ContactList/ContactListPage.qml	2014-06-18 21:27:19 +0000
@@ -43,10 +43,7 @@
     function createEmptyContact(phoneNumber) {
         var details = [ {detail: "PhoneNumber", field: "number", value: phoneNumber},
                         {detail: "EmailAddress", field: "emailAddress", value: ""},
-                        {detail: "OnlineAccount", field: "accountUri", value: ""},
-                        {detail: "Address", field: "street", value: ""},
-                        {detail: "Name", field: "firstName", value: ""},
-                        {detail: "Organization", field: "name", value: ""}
+                        {detail: "Name", field: "firstName", value: ""}
                       ]
 
         var newContact =  Qt.createQmlObject("import QtContacts 5.0; Contact{ }", mainPage)
@@ -385,7 +382,8 @@
                                    {model: contactList.listModel,
                                     contact: newContact,
                                     active: false,
-                                    enabled: false})
+                                    enabled: false,
+                                    initialFocusSection: "name"})
     }
 
     Connections {

=== modified file 'src/imports/ContactList/PageWithBottomEdge.qml'
--- src/imports/ContactList/PageWithBottomEdge.qml	2014-06-16 13:00:42 +0000
+++ src/imports/ContactList/PageWithBottomEdge.qml	2014-06-18 21:27:19 +0000
@@ -142,6 +142,15 @@
         z: 1
     }
 
+    Timer {
+        id: hideIndicator
+
+        interval: 3000
+        running: true
+        repeat: false
+        onTriggered: tipContainer.y = -units.gu(1)
+    }
+
     Rectangle {
         id: bottomEdge
         objectName: "bottomEdge"
@@ -184,6 +193,9 @@
             clip: true
             y: -bottomEdge.tipHeight
             anchors.horizontalCenter: parent.horizontalCenter
+            Behavior on y {
+                UbuntuNumberAnimation {}
+            }
 
             UbuntuShape {
                 id: tip
@@ -230,10 +242,7 @@
                 }
             }
 
-            onPressed: {
-                bottomEdge.state = "floating"
-                bottomEdge.y -= bottomEdge.tipHeight
-            }
+            onPressed: bottomEdge.state = "floating"
         }
 
         Behavior on y {
@@ -252,6 +261,14 @@
                     target: tip
                     opacity: 1.0
                 }
+                PropertyChanges {
+                    target: tipContainer
+                    y: -bottomEdge.tipHeight
+                }
+                PropertyChanges {
+                    target: hideIndicator
+                    running: true
+                }
             },
             State {
                 name: "expanded"
@@ -263,6 +280,14 @@
                     target: tip
                     opacity: 0.0
                 }
+                PropertyChanges {
+                    target: tipContainer
+                    y: -bottomEdge.tipHeight
+                }
+                PropertyChanges {
+                    target: hideIndicator
+                    running: false
+                }
             },
             State {
                 name: "floating"
@@ -270,6 +295,14 @@
                     target: shadow
                     opacity: 1.0
                 }
+                PropertyChanges {
+                    target: hideIndicator
+                    running: false
+                }
+                PropertyChanges {
+                    target: tipContainer
+                    y: -bottomEdge.tipHeight
+                }
             }
         ]
 
@@ -316,6 +349,8 @@
 
                             // load a new bottom page in memory
                             edgeLoader.active = true
+
+                            hideIndicator.restart()
                         }
                     }
                 }

=== modified file 'src/imports/ContactView/ActionButton.qml'
--- src/imports/ContactView/ActionButton.qml	2014-06-06 17:52:58 +0000
+++ src/imports/ContactView/ActionButton.qml	2014-06-18 21:27:19 +0000
@@ -27,7 +27,7 @@
         id: icon
 
         anchors.centerIn: parent
-        height: units.gu(3)
-        width: height
+        height: units.gu(2.5)
+        width: units.gu(2.5)
     }
 }

=== modified file 'src/imports/ContactView/BasicFieldView.qml'
--- src/imports/ContactView/BasicFieldView.qml	2014-06-06 17:52:58 +0000
+++ src/imports/ContactView/BasicFieldView.qml	2014-06-18 21:27:19 +0000
@@ -24,56 +24,23 @@
 
     property alias typeLabel: typeLabel.text
     property alias values: valueList.model
-    property alias iconSource: actionIcon.source
-    property double lineHeight: units.gu(3)
+    property double lineHeight: units.gu(2)
     property QtObject detail: null
     property variant fields: null
     property int parentIndex: -1
 
-    implicitHeight: typeLabel.height + (root.lineHeight * valueList.count) + units.gu(2)
+    implicitHeight: typeLabel.height + fieldValues.height + units.gu(2)
 
-    Image {
-        id: actionIcon
+    Column {
+        id: fieldValues
 
         anchors {
-            verticalCenter: parent.verticalCenter
             left: parent.left
-        }
-        height: units.gu(2.5)
-        width: visible ? units.gu(2.5) : 0
-        visible: iconSource && iconSource != ""
-    }
-
-    Label {
-        id: typeLabel
-        objectName: detail ? "type_" + detailToString(detail.type, -1) + "_" + root.parentIndex : ""
-
-        elide: Text.ElideRight
-        visible: text != ""
-        anchors {
-            left: actionIcon.right
-            leftMargin: actionIcon.visible ? units.gu(2) : 0
             top: parent.top
             topMargin: units.gu(1)
-            right: root.right
-        }
-        height: visible ? units.gu(2) : 0
-        verticalAlignment: Text.AlignVCenter
-
-        // style
-        fontSize: "small"
-        opacity: 0.8
-    }
-
-    Column {
-        id: fieldValues
-
-        anchors {
-            left: typeLabel.left
-            top: typeLabel.bottom
             right: parent.right
-            bottom:  parent.bottom
         }
+        height: (valueList.count * root.lineHeight)
 
         Repeater {
             id: valueList
@@ -83,8 +50,8 @@
                 objectName: detail && fields ? "label_" + detailToString(detail.type, fields[index]) + "_" + root.parentIndex + "." + index : ""
 
                 anchors {
-                    left: parent ? parent.left : null
-                    right: parent ? parent.right : null
+                    left: parent ? parent.left : undefined
+                    right: parent ? parent.right : undefined
                 }
                 height: root.lineHeight
                 verticalAlignment: Text.AlignVCenter
@@ -97,4 +64,24 @@
             }
         }
     }
+
+    Label {
+        id: typeLabel
+        objectName: detail ? "type_" + detailToString(detail.type, -1) + "_" + root.parentIndex : ""
+
+        elide: Text.ElideRight
+        visible: text != ""
+        anchors {
+            left: parent.left
+            top: fieldValues.bottom
+            //topMargin: units.gu(0.0)
+            right: parent.right
+        }
+        height: visible ? units.gu(2) : 0
+        verticalAlignment: Text.AlignVCenter
+
+        // style
+        fontSize: "small"
+        opacity: 0.8
+    }
 }

=== modified file 'src/imports/ContactView/CMakeLists.txt'
--- src/imports/ContactView/CMakeLists.txt	2014-06-09 22:45:19 +0000
+++ src/imports/ContactView/CMakeLists.txt	2014-06-18 21:27:19 +0000
@@ -4,7 +4,6 @@
     ContactDetailAddressesView.qml
     ContactDetailAvatarView.qml
     ContactDetailEmailsView.qml
-    ContactDetailFavoriteView.qml
     ContactDetailGroupWithTypeView.qml
     ContactDetailNameView.qml
     ContactDetailOnlineAccountsView.qml

=== modified file 'src/imports/ContactView/ContactDetailAvatarView.qml'
--- src/imports/ContactView/ContactDetailAvatarView.qml	2014-05-07 18:13:12 +0000
+++ src/imports/ContactView/ContactDetailAvatarView.qml	2014-06-18 21:27:19 +0000
@@ -17,74 +17,28 @@
 import QtQuick 2.2
 import QtContacts 5.0
 import Ubuntu.Components 0.1
+import Ubuntu.Contacts 0.1 as ContactsUI
 
 import "../Common"
 
 ContactDetailBase {
     id: root
 
-    readonly property string defaultAvatar: Qt.resolvedUrl("../../artwork/contact-default-profile.png")
-
-    function getAvatar(avatarDetail)
-    {
-        // use this verbose mode to avoid problems with binding loops
-        var avatarUrl = defaultAvatar
-        if (avatarDetail) {
-            var avatarValue = avatarDetail.value(Avatar.ImageUrl)
-            if (avatarValue != "") {
-                avatarUrl = avatarValue
-            }
-        }
-        return avatarUrl
-    }
-
-    detail: contact ? contact.detail(ContactDetail.Avatar) : null
-    implicitHeight: units.gu(17)
-
-    // update the contact detail in case of the contact change
+    implicitHeight: units.gu(8)
+    implicitWidth: units.gu(10)
+
     Connections {
-        target: root.contact
-        onContactChanged: {
-            if (root.contact) {
-                root.detail = contact.detail(ContactDetail.Avatar)
-            } else {
-                root.detail = null
-            }
-        }
-    }
-
-    onDetailChanged: {
-        var newAvatar = root.getAvatar(root.detail)
-        if (newAvatar !== defaultAvatar) {
-            avatar.source = newAvatar
-        } else {
-            updateAvatar.restart()
-        }
-    }
-
-    // Wait some milliseconds before update the avatar, in some cases the avatac get update later and this cause the image flick
-    Timer {
-        id: updateAvatar
-
-        interval: 100
-        running: false
-        repeat: false
-        onTriggered: {
-            if (root.detail && contact) {
-                avatar.source = root.getAvatar(root.detail)
-            } else {
-                avatar.source = root.defaultAvatar
-            }
-        }
-    }
-
-    Image {
+        target: root.contact.avatar
+        onDetailChanged: avatar.reload()
+    }
+
+    ContactsUI.ContactAvatar {
         id: avatar
 
-        anchors.fill: parent
-        asynchronous: true
-        smooth: true
-        source: root.defaultAvatar
-        fillMode: Image.PreserveAspectCrop
+        contactElement: root.contact
+        anchors {
+            fill: parent
+            leftMargin: units.gu(2)
+        }
     }
 }

=== removed file 'src/imports/ContactView/ContactDetailFavoriteView.qml'
--- src/imports/ContactView/ContactDetailFavoriteView.qml	2014-05-06 13:18:07 +0000
+++ src/imports/ContactView/ContactDetailFavoriteView.qml	1970-01-01 00:00:00 +0000
@@ -1,43 +0,0 @@
-/*
- * Copyright (C) 2012-2013 Canonical, Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-import QtQuick 2.2
-import Ubuntu.Components 0.1
-import QtContacts 5.0
-
-import "../Common"
-
-ContactDetailBase {
-    id: root
-
-    detail: root.contact ? root.contact.favorite : null
-    showDivider: false
-
-    Icon {
-        id: icon
-
-        anchors.fill: parent
-        name: root.detail && root.detail.favorite ? "favorite-selected" : "favorite-unselected"
-        color: UbuntuColors.orange
-        MouseArea {
-            anchors.fill: parent
-            onClicked: {
-                   root.detail.favorite = !root.detail.favorite
-                   root.contact.save()
-            }
-        }
-    }
-}

=== modified file 'src/imports/ContactView/ContactDetailGroupWithTypeView.qml'
--- src/imports/ContactView/ContactDetailGroupWithTypeView.qml	2014-06-06 17:52:58 +0000
+++ src/imports/ContactView/ContactDetailGroupWithTypeView.qml	2014-06-18 21:27:19 +0000
@@ -31,6 +31,8 @@
     headerDelegate: ListItem.Empty {
         highlightWhenPressed: false
 
+        divider.anchors.leftMargin: units.gu(2)
+        divider.anchors.rightMargin: units.gu(2)
         width: root.width
         height: units.gu(5)
         Label {
@@ -45,7 +47,6 @@
 
             // style
             fontSize: "medium"
-            opacity: 0.8
         }
     }
 
@@ -56,7 +57,6 @@
         contact: root.contact
         fields: root.fields
         typeLabel: detailType ? detailType.label : ""
-        typeIcon: detailType && detailType.icon ? detailType.icon : ""
 
         height: implicitHeight
         width: root.width

=== modified file 'src/imports/ContactView/ContactDetailPhoneNumberView.qml'
--- src/imports/ContactView/ContactDetailPhoneNumberView.qml	2014-05-06 13:18:07 +0000
+++ src/imports/ContactView/ContactDetailPhoneNumberView.qml	2014-06-18 21:27:19 +0000
@@ -55,62 +55,40 @@
         anchors {
             left: parent.left
             top: parent.top
-            right: div0.left
+            right: messageActions.left
             bottom: parent.bottom
             leftMargin: units.gu(2)
         }
-        iconSource: root.action ? root.action.iconSource : ""
     }
 
-    Image {
-        id: div0
+    ActionButton {
+        id: messageActions
 
         anchors {
-            top: parent.top
             right: callActions.left
-            bottom: parent.bottom
+            rightMargin: units.gu(1)
+            verticalCenter: parent.verticalCenter
         }
-        width: 2
-        fillMode: Image.TileVertically
-        source: "artwork:/vertical-div.png"
+        width: units.gu(4)
+        height: units.gu(4)
+        iconName: "messages"
+        onClicked: Qt.openUrlExternally("message:///" + encodeURIComponent(view.values[0]))
     }
 
+
     ActionButton {
         id: callActions
 
         anchors {
-            right: div1.left
+            right: parent.right
+            rightMargin: units.gu(2)
             top: parent.top
-            bottom: parent.bottom
+            verticalCenter: parent.verticalCenter
         }
-        width: height
+        width: units.gu(4)
+        height: units.gu(4)
         iconName: "call-start"
         onClicked: Qt.openUrlExternally("tel:///" + encodeURIComponent(view.values[0]))
     }
 
-    Image {
-        id: div1
-
-        anchors {
-            top: parent.top
-            right: messageActions.left
-            bottom: parent.bottom
-        }
-        width: 2
-        fillMode: Image.TileVertically
-        source: "artwork:/vertical-div.png"
-    }
-
-    ActionButton {
-        id: messageActions
-
-        anchors {
-            right: parent.right
-            top: parent.top
-            bottom: parent.bottom
-        }
-        width: height
-        iconName: "messages"
-        onClicked: Qt.openUrlExternally("message:///" + encodeURIComponent(view.values[0]))
-    }
 }

=== modified file 'src/imports/ContactView/ContactDetailPhoneNumbersView.qml'
--- src/imports/ContactView/ContactDetailPhoneNumbersView.qml	2014-05-06 13:18:07 +0000
+++ src/imports/ContactView/ContactDetailPhoneNumbersView.qml	2014-06-18 21:27:19 +0000
@@ -29,11 +29,6 @@
 
     title: i18n.tr("Phone")
     typeModel: ContactDetailPhoneNumberTypeModel { }
-    defaultAction: Action {
-        text: i18n.tr("Favorite")
-        iconSource: "artwork:/contact-call.png"
-    }
-
     detailDelegate: ContactDetailPhoneNumberView {
         property variant detailType: detail && root.contact && root.typeModelReady ? root.getType(detail) : null
 

=== modified file 'src/imports/ContactView/ContactDetailWithTypeView.qml'
--- src/imports/ContactView/ContactDetailWithTypeView.qml	2014-05-06 13:18:07 +0000
+++ src/imports/ContactView/ContactDetailWithTypeView.qml	2014-06-18 21:27:19 +0000
@@ -25,7 +25,6 @@
     id: root
 
     property alias typeLabel: view.typeLabel
-    property string typeIcon: null
     property alias lineHeight: view.lineHeight
     readonly property bool isReady: (fields != null) && (detail != null)
 
@@ -61,6 +60,5 @@
             left: parent.left
             leftMargin: units.gu(2)
         }
-        iconSource: typeIcon ? typeIcon : (root.action ? root.action.iconSource : "")
     }
 }

=== modified file 'src/imports/ContactView/ContactView.qml'
--- src/imports/ContactView/ContactView.qml	2014-06-11 21:25:08 +0000
+++ src/imports/ContactView/ContactView.qml	2014-06-18 21:27:19 +0000
@@ -67,7 +67,7 @@
         anchors.fill: parent
         //WORKAROUND: There is a bug on SDK page that causes the page to appear flicked with small contents
         // see bug #1223050
-        contentHeight: Math.max(contents.height, parent.height)
+        contentHeight: Math.max(contents.height, parent.height) + units.gu(2)
         contentWidth: parent.width
         visible: !busyIndicator.visible
 
@@ -77,27 +77,16 @@
             height: childrenRect.height
             anchors {
                 top: parent.top
+                topMargin: units.gu(2)
                 left: parent.left
                 right: parent.right
             }
 
             ContactDetailAvatarView {
                 contact: root.contact
-                anchors {
-                    left: parent.left
-                    right: parent.right
-                }
+                anchors.left: parent.left
                 height: implicitHeight
-                ContactDetailFavoriteView {
-                    contact: root.contact
-                    anchors {
-                        left: parent.left
-                        bottom: parent.bottom
-                        margins: units.gu(2)
-                    }
-                    width: units.gu(4)
-                    height: units.gu(4)
-                }
+                width: implicitWidth
             }
 
             ContactDetailPhoneNumbersView {
@@ -202,15 +191,28 @@
     tools: ToolbarItems {
         ToolbarButton {
             action: Action {
-                objectName: "share"
-                text: i18n.tr("Share")
-                iconName: "share"
+                objectName: "favorite"
+                text: i18n.tr("Favorite")
+                iconName: root.contact && root.contact.favorite.favorite ? "favorite-selected" : "favorite-unselected"
                 onTriggered: {
-                    pageStack.push(Qt.resolvedUrl("../ContactShare/ContactSharePage.qml"),
-                                   { contactModel: root.model, contact: root.contact})
+                    root.contact.favorite.favorite = !root.contact.favorite.favorite
+                    root.contact.save()
                 }
             }
         }
+        // FIXME: Having more than 3 options in the header causes a bug that make difficult to reach the component behind it.
+        // Enable it again when the bug #1329557 get fix
+//        ToolbarButton {
+//            action: Action {
+//                objectName: "share"
+//                text: i18n.tr("Share")
+//                iconName: "share"
+//                onTriggered: {
+//                    pageStack.push(Qt.resolvedUrl("../ContactShare/ContactSharePage.qml"),
+//                                   { contactModel: root.model, contact: root.contact})
+//                }
+//            }
+//        }
         ToolbarButton {
             action: Action {
                 objectName: "edit"

=== modified file 'src/imports/Ubuntu/Contacts/ContactAvatar.qml'
--- src/imports/Ubuntu/Contacts/ContactAvatar.qml	2014-06-06 17:52:58 +0000
+++ src/imports/Ubuntu/Contacts/ContactAvatar.qml	2014-06-18 21:27:19 +0000
@@ -24,7 +24,14 @@
 
     property var contactElement: null
     property string displayName: ContactsJS.formatToDisplay(contactElement, ContactDetail.Name, [Name.FirstName, Name.LastName])
+    readonly property string defaultAvatar: "image://theme/contact"
     readonly property string avatarUrl: ContactsJS.getAvatar(contactElement, "")
+    readonly property bool useDefaultAvatar: (displayName === "" || contact.tag.tag === "") && (avatarUrl === "")
+
+    function reload()
+    {
+        img.source = ContactsJS.getAvatar(contactElement, "")
+    }
 
     radius: "medium"
     color: Theme.palette.normal.overlay
@@ -34,13 +41,16 @@
          text: ContactsJS.getNameItials(displayName)
          font.pointSize: 88
          color: UbuntuColors.lightAubergine
-         visible: avatarUrl === ""
+         visible: (img.status != Image.Ready)
     }
 
     image: Image {
+        id: img
+
         fillMode: Image.PreserveAspectCrop
         asynchronous: true
-        source: avatarUrl
-        visible: source !== ""
+        source: avatar.useDefaultAvatar ? avatar.defaultAvatar : avatar.avatarUrl
+        height: avatar.height
+        width: avatar.width
     }
 }

=== modified file 'src/imports/Ubuntu/Contacts/ContactDelegate.qml'
--- src/imports/Ubuntu/Contacts/ContactDelegate.qml	2014-06-06 22:40:23 +0000
+++ src/imports/Ubuntu/Contacts/ContactDelegate.qml	2014-06-18 21:27:19 +0000
@@ -154,8 +154,7 @@
 
         onStatusChanged: {
             if (status == Loader.Ready) {
-                pickerLoader.item.contactsModel = listModel
-                pickerLoader.item.contactId = contact.contactId
+                pickerLoader.item.updateDetails(contact)
                 pickerLoader.item.detailClicked.connect(root._onDetailClicked)
             }
         }

=== modified file 'src/imports/Ubuntu/Contacts/ContactDetailPickerPhoneNumberDelegate.qml'
--- src/imports/Ubuntu/Contacts/ContactDetailPickerPhoneNumberDelegate.qml	2014-06-06 20:14:24 +0000
+++ src/imports/Ubuntu/Contacts/ContactDetailPickerPhoneNumberDelegate.qml	2014-06-18 21:27:19 +0000
@@ -21,9 +21,6 @@
 Item {
     id: root
 
-    property string contactId
-    property alias contactsModel: contactFetch.model
-
     signal detailClicked(QtObject detail, string action)
 
     function containsPointer(item, point)
@@ -32,9 +29,12 @@
                 (point.y >= item.y) && (point.y <= item.y + item.height));
     }
 
+    function updateDetails(contact)
+    {
+        phoneNumberEntries.model = contact.phoneNumbers
+    }
+
     height: detailItems.height + units.gu(2)
-    onContactIdChanged: contactFetch.fetchContact(contactId)
-
     Column {
         id: detailItems
 
@@ -48,15 +48,15 @@
 
         ListItem.Standard {
             id: noNumberMessage
-
             showDivider: false
             text: "No phone numbers."
-            visible: false
+            visible: phoneNumberEntries.count == 0
         }
 
         Repeater {
             id: phoneNumberEntries
 
+            model: contact.phoneNumbers
             ListItem.Subtitled {
                 anchors {
                     left: parent.left
@@ -119,14 +119,4 @@
     ContactDetailPhoneNumberTypeModel {
         id: phoneTypeModel
     }
-
-    ContactFetch {
-        id: contactFetch
-
-        // do not keep track of contact to avoid problems during the delete destruction
-        onContactFetched: {
-            phoneNumberEntries.model = contact.phoneNumbers
-            noNumberMessage.visible = (contact.phoneNumbers.length === 0)
-        }
-    }
 }

=== modified file 'src/imports/Ubuntu/Contacts/ContactListView.qml'
--- src/imports/Ubuntu/Contacts/ContactListView.qml	2014-06-12 12:49:51 +0000
+++ src/imports/Ubuntu/Contacts/ContactListView.qml	2014-06-18 21:27:19 +0000
@@ -481,6 +481,11 @@
                 //new contacts as soon as it arrives in the model
                 if (contactsModel._clearModel && contacts.length === 0) {
                     contactsModel._clearModel = false
+                    // do a new update if autoUpdate is false
+                    if (!contactsModel.autoUpdate) {
+                        contactsModel.update()
+                    }
+
                 }
             }
         }

=== modified file 'src/imports/Ubuntu/Contacts/ContactSimpleListView.qml'
--- src/imports/Ubuntu/Contacts/ContactSimpleListView.qml	2014-06-09 15:52:06 +0000
+++ src/imports/Ubuntu/Contacts/ContactSimpleListView.qml	2014-06-18 21:27:19 +0000
@@ -99,7 +99,9 @@
     */
     property var fetchHint : FetchHint {
         detailTypesHint: {
-            var hints = [ ContactDetail.Tag, contactListView.titleDetail ]
+            var hints = [ ContactDetail.Tag,          // sections
+                          ContactDetail.PhoneNumber,  // expansion
+                          contactListView.titleDetail ]
 
             if (contactListView.showAvatar) {
                 hints.push(ContactDetail.Avatar)

=== modified file 'src/imports/Ubuntu/Contacts/MultipleSelectionListView.qml'
--- src/imports/Ubuntu/Contacts/MultipleSelectionListView.qml	2014-06-06 17:52:58 +0000
+++ src/imports/Ubuntu/Contacts/MultipleSelectionListView.qml	2014-06-18 21:27:19 +0000
@@ -55,7 +55,7 @@
     \endqml
 */
 
-UbuntuListView {
+ListView {
     id: listView
 
     /*!
@@ -188,4 +188,12 @@
     MultipleSelectionVisualModel {
         id: visualModel
     }
+
+    Component.onCompleted: {
+        // FIXME: workaround for qtubuntu not returning values depending on the grid unit definition
+        // for Flickable.maximumFlickVelocity and Flickable.flickDeceleration
+        var scaleFactor = units.gridUnit / 8;
+        maximumFlickVelocity = maximumFlickVelocity * scaleFactor;
+        flickDeceleration = flickDeceleration * scaleFactor;
+    }
 }

=== modified file 'tests/autopilot/address_book_app/pages/_contact_editor.py'
--- tests/autopilot/address_book_app/pages/_contact_editor.py	2014-05-22 12:50:28 +0000
+++ tests/autopilot/address_book_app/pages/_contact_editor.py	2014-06-18 21:27:19 +0000
@@ -51,6 +51,36 @@
 class ContactEditor(_common.PageWithHeader):
     """Custom proxy object for the Contact Editor."""
 
+    _DETAIL_ALIAS = {
+        'phones': 'Phone',
+        'emails': 'Email',
+        'ims': 'Social',
+        'addresses': 'Address',
+        'professionalDetails': 'Professional Details'
+    }
+
+    @autopilot.logging.log_action(logger.info)
+    def add_field(self, detail_name):
+        """Create a new field into the edit contact form.
+
+        :param detail_name: The detail field name
+
+        """
+
+        add_field_button = self.select_single(
+            'Button', objectName='addNewFieldButton')
+        add_field_button.swipe_into_view()
+
+        self.pointing_device.click_object(add_field_button)
+
+        add_field_dialog = self.get_root_instance().wait_select_single(
+            'Dialog', objectName='addFieldDialog')
+        new_field_button = add_field_dialog.select_single(
+            'Button',
+            objectName=self._DETAIL_ALIAS[detail_name])
+
+        self.pointing_device.click_object(new_field_button)
+
     @autopilot.logging.log_action(logger.info)
     def fill_form(self, contact_information):
         """Fill the edit contact form.
@@ -90,7 +120,7 @@
     def _fill_detail_group(self, object_name, details):
         editor = self.select_single(
             ContactDetailGroupWithTypeEditor, objectName=object_name)
-        editor.fill(details)
+        editor.fill(self, details)
 
     def _get_form_values(self):
         first_name = _get_text_field(self, 'first_name').text
@@ -135,12 +165,12 @@
         'professionalDetails': 'base_unknown_{}'
     }
 
-    def fill(self, details):
+    def fill(self, editor, details):
         """Fill a contact detail group."""
-        for index, detail in enumerate(details[:-1]):
+        for index, detail in enumerate(details):
+            if self.detailsCount <= index:
+                editor.add_field(self.objectName)
             self._fill_detail(index, detail)
-            self._add_detail()
-        self._fill_detail(len(details) - 1, details[-1])
 
     def _fill_detail(self, index, detail):
         detail_editor = self._get_detail_editor_by_index(index)
@@ -175,15 +205,16 @@
     """Custom proxy object for the ContactDetailWithTypeEditor widget."""
 
     def fill(self, field, index, detail):
+        self._fill_value(field, index, detail)
         self._select_type(detail)
-        self._fill_value(field, index, detail)
 
     def _select_type(self, detail):
         type_index = detail.TYPES.index(detail.type)
-        selected_type_index = self._get_selected_type_index()
-        if type_index != selected_type_index:
-            # TODO --elopio - 2014-03-01
-            raise NotImplementedError('Type selection not yet implemented.')
+        value_selector = self.select_single('ValueSelector')
+
+        while(value_selector.currentIndex != type_index):
+            ubuntuuitoolkit.get_keyboard().press_and_release("Shift+Right")
+            time.sleep(0.1)
 
     def _get_selected_type_index(self):
         value_selector = self.select_single('ValueSelector')
@@ -210,16 +241,7 @@
         self._make_field_visible_and_write(text_field, value)
 
     def _make_field_visible_and_write(self, text_field, value):
-        while not text_field.activeFocus:
-            # XXX We should just swipe the text field into view.
-            # Update this once bug http://pad.lv/1286479 is implemented.
-            # --elopio - 2014-03-01
-            text_field.keyboard.press_and_release('Tab')
-            time.sleep(0.1)
-            contact_editor = self.get_root_instance().select_single(
-                ContactEditor, objectName='contactEditorPage', active=True)
-            contact_editor.wait_to_stop_moving()
-
+        text_field.swipe_into_view()
         text_field.write(value)
 
     def _fill_address(self, index, address):

=== modified file 'tests/autopilot/address_book_app/tests/__init__.py'
--- tests/autopilot/address_book_app/tests/__init__.py	2014-06-06 22:40:23 +0000
+++ tests/autopilot/address_book_app/tests/__init__.py	2014-06-18 21:27:19 +0000
@@ -143,6 +143,7 @@
         self.pointing_device.click_object(clear_button)
         self.assertThat(field.text, Eventually(Equals("")))
 
+    # FIXME: Remove this function use ContactEditor.add_field
     def create_new_detail(self, detailGroup):
         detCount = detailGroup.detailsCount
         add_button = detailGroup.select_single("Icon",
@@ -155,17 +156,12 @@
         list_page = self.main_window.get_contact_list_page()
         list_page.open_contact(index)
 
-        list_page = self.main_window.get_contact_list_page()
         self.assertThat(list_page.visible, Eventually(Equals(False)))
-
         view_page = self.main_window.get_contact_view_page()
         self.assertThat(view_page.visible, Eventually(Equals(True)))
 
         # Edit contact
-        self.main_window.get_header().click_action_button("edit")
-        self.assertThat(view_page.visible, Eventually(Equals(False)))
-
-        edit_page = self.main_window.get_contact_edit_page()
+        edit_page = view_page.go_to_edit_contact()
         self.assertThat(edit_page.visible, Eventually(Equals(True)))
 
         return edit_page

=== modified file 'tests/autopilot/address_book_app/tests/test_add_contact.py'
--- tests/autopilot/address_book_app/tests/test_add_contact.py	2014-06-08 13:51:45 +0000
+++ tests/autopilot/address_book_app/tests/test_add_contact.py	2014-06-18 21:27:19 +0000
@@ -173,28 +173,23 @@
         self.assertThat(list_view.count, Eventually(Equals(1)))
 
     def test_email_label_save(self):
-        # execute add new contact
         contact_editor = self.app.main_window.go_to_add_contact()
 
-        # fill name
-        contact_editor.fill_form(
-            data.Contact(first_name='Sherlock', last_name='Holmes'))
+        my_emails = []
+        my_emails.append(data.Email(type_="Home", address="[e-mail]"))
+        my_emails.append(data.Email(type_="Work", address="[e-mail]"))
+        my_emails.append(data.Email(type_="Other", address="[e-mail]"))
 
-        # Home
-        self.set_email_address(0, "[e-mail]", 0)
-        # Work
-        self.set_email_address(1, "[e-mail]", 1)
-        # Other
-        self.set_email_address(2, "[e-mail]", 2)
+        test_contact = data.Contact(first_name="Sherlock",
+                                    last_name="Holmes",
+                                    emails=my_emails)
+        contact_editor.fill_form(test_contact)
 
         # Save contact
         self.app.main_window.save()
 
         list_page = self.app.main_window.get_contact_list_page()
-        list_page.open_contact(0)
-
-        # check if contacts was saved with the correct labels
-        view_page = self.app.main_window.get_contact_view_page()
+        view_page = list_page.open_contact(0)
         self.assertThat(view_page.visible, Eventually(Equals(True)))
 
         # check if we have 3 emails"""
@@ -223,33 +218,26 @@
         self.assertThat(len(emails), Equals(0))
 
     def test_phone_label_save(self):
-        # execute add new contact
         contact_editor = self.app.main_window.go_to_add_contact()
 
-        # fill name
-        contact_editor.fill_form(
-            data.Contact(first_name='Sherlock', last_name='Holmes'))
+        my_phones = []
+        my_phones.append(data.Phone(type_="Home", number="[phone]"))
+        my_phones.append(data.Phone(type_="Work", number="[phone]"))
+        my_phones.append(data.Phone(type_="Mobile", number="[phone]"))
+        my_phones.append(data.Phone(type_="Work Mobile", number="[phone]"))
+        my_phones.append(data.Phone(type_="Other", number="[phone]"))
 
-        # Home
-        self.set_phone_number(0, "[phone]", 0)
-        # Work
-        self.set_phone_number(1, "[phone]", 1)
-        # Mobile
-        self.set_phone_number(2, "[phone]", 2)
-        # Work Mobile
-        self.set_phone_number(3, "[phone]", 3)
-        # Other
-        self.set_phone_number(4, "[phone]", 4)
+        test_contact = data.Contact(first_name="Sherlock",
+                                    last_name="Holmes",
+                                    phones=my_phones)
+        contact_editor.fill_form(test_contact)
 
         # Save contact
         self.app.main_window.save()
 
         # Open contact view
         list_page = self.app.main_window.get_contact_list_page()
-        list_page.open_contact(0)
-
-        # check if contacts was saved with the correct labels
-        view_page = self.app.main_window.get_contact_view_page()
+        view_page = list_page.open_contact(0)
         self.assertThat(view_page.visible, Eventually(Equals(True)))
 
         # check if we have five phones"""

=== modified file 'tests/autopilot/address_book_app/tests/test_edit_contact.py'
--- tests/autopilot/address_book_app/tests/test_edit_contact.py	2014-05-30 07:11:42 +0000
+++ tests/autopilot/address_book_app/tests/test_edit_contact.py	2014-06-18 21:27:19 +0000
@@ -37,10 +37,7 @@
         edit_page = self.edit_contact(0)
 
         # Add a new phone
-        phoneGroup = edit_page.select_single(
-            "ContactDetailGroupWithTypeEditor",
-            objectName="phones")
-        self.create_new_detail(phoneGroup)
+        edit_page.add_field('phones')
 
         # fill phone number
         phone_number_1 = self.app.main_window.select_single(
@@ -67,11 +64,18 @@
         self.assertThat(phone_label_1.text, Eventually(Equals(self.PHONE_NUMBERS[1])))
 
     def test_remove_phone(self):
-        self.add_contact("Fulano", "de Tal", self.PHONE_NUMBERS[1:3])
-        edit_page = self.edit_contact(0)
+        contact_editor = self.app.main_window.go_to_add_contact()
+        my_phones = []
+        for n in self.PHONE_NUMBERS[1:3]:
+            my_phones.append(data.Phone(type_='Mobile', number=n))
+
+        test_contact = data.Contact(first_name="Fulano",
+                                    last_name="de Tal",
+                                    phones=my_phones)
+        contact_editor.fill_form(test_contact)
 
         # clear phone 1
-        phone_number_1 = edit_page.select_single(
+        phone_number_1 = contact_editor.wait_select_single(
             "TextInputDetail",
             objectName="phoneNumber_1")
         self.clear_text_on_field(phone_number_1)
@@ -79,8 +83,11 @@
         # Save contact
         self.app.main_window.save()
 
+        # Go to contact view
+        list_page = self.main_window.get_contact_list_page()
+
         # check if we have onlye one phone
-        view_page = self.app.main_window.get_contact_view_page()
+        view_page = list_page.open_contact(0)
         phone_group = view_page.select_single(
             "ContactDetailGroupWithTypeView",
             objectName="phones")
@@ -95,11 +102,7 @@
     def test_add_email(self):
         self.add_contact("Fulano", "")
         edit_page = self.edit_contact(0)
-
-        emailGroup = edit_page.select_single(
-            "ContactDetailGroupWithTypeEditor",
-            objectName="emails")
-        self.create_new_detail(emailGroup)
+        edit_page.add_field("emails")
 
         # fill email address
         email_field = edit_page.select_single(
@@ -174,7 +177,17 @@
         self.assertThat(view_page.title, Eventually(Equals("Fulano de Tal")))
 
     def test_im_type(self):
-        self.add_contact("Fulano", "de Tal", im_address=["[e-mail]"])
+        contact_editor = self.app.main_window.go_to_add_contact()
+        alias = data.SocialAlias(type_="Skype", alias="[e-mail]")
+        test_contact = data.Contact(first_name="Fulano",
+                                    last_name="de Tal",
+                                    social_aliases=[alias])
+        contact_editor.fill_form(test_contact)
+
+        # Save contact
+        self.app.main_window.save()
+
+        # edit again
         edit_page = self.edit_contact(0)
 
         # Change Im type