Merge lp:~renatofilho/address-book-app/split-app into lp:address-book-app

[Renato Araujo Oliveira Filho]

Split the app in modules to be used by dialer and messaging app.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:427
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/797/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/100/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2502/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/827/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2500/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/989/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:428
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/798/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/101/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2528
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/837/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2188
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2526
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2526/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/20023
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/999/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:444
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/806/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/109
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2766
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/908/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2383
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2764
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2764/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/20440
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid/719/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/1088
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/1088/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:446
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/808/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/111
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2768
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/910/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2385
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2766
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2766/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/20443
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid/721/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/1090
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/1090/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:446
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/811/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/114
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2783
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2395
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2781
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2781/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/20466

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

review: Needs Fixing (continuous-integration)

[Renato Araujo Oliveira Filho (renatofilho)]

Are there any related MPs required for this MP to build/function as expected?
YES: lp:~renatofilho/address-book-app/fix-test_import_from_sim

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?
NO UI CHANGE

If you changed the packaging (debian), did you add a core-dev as a reviewer to this MP?
NO PACKAGE CHANGE

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:446
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/814/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/117
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2787
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2400
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2785
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2785/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/20471

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

review: Approve (continuous-integration)

[Gustavo Pichorim Boiko (boiko)]

+ imgThread->start();
+ imgThread->wait();
+
+ // FIXME: implement this as async function
+ while(imgThread->isRunning()) {

I think the imgThread->wait() there is wrong, it was not in the original code and it will block the execution.

review: Needs Fixing

[lp:~renatofilho/address-book-app/split-app]

447. By Renato Araujo Oliveira Filho on 2015-05-13

Revert wrong change on copyImage function.

[Renato Araujo Oliveira Filho (renatofilho)]

> + imgThread->start();
> + imgThread->wait();
> +
> + // FIXME: implement this as async function
> + while(imgThread->isRunning()) {
>
> I think the imgThread->wait() there is wrong, it was not in the original code
> and it will block the execution.

Fixed

[lp:~renatofilho/address-book-app/split-app]

448. By Renato Araujo Oliveira Filho on 2015-05-13

Added qtdeclarative5-ubuntu-content1 in the dep list.

449. By Renato Araujo Oliveira Filho on 2015-05-13

Fixed deps.

[Gustavo Pichorim Boiko (boiko)]

- model: MostCalledContactsModel {
- id: mostCalledModel
+// model: MostCalledContactsModel {
+// id: mostCalledModel

I think this was done for testing and should be re-enabled, right?

review: Needs Fixing

[lp:~renatofilho/address-book-app/split-app]

450. By Renato Araujo Oliveira Filho on 2015-05-13

Revert changes on MostCalledModel.qml.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:450
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/816/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/119/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2797/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2795/console

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

review: Needs Fixing (continuous-integration)

[lp:~renatofilho/address-book-app/split-app]

451. By Renato Araujo Oliveira Filho on 2015-05-14

Update MostCalledList.qml.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:451
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/818/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/121
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2803
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2408
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2801
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2801/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/20482

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

review: Approve (continuous-integration)

[Gustavo Pichorim Boiko (boiko)]

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

Did CI run pass? If not, please explain why.
Yes

Have you checked that submitter has accurately filled out the submitter checklist and has taken no shortcut?
Yes

Code looks good and works as expected!

review: Approve

[Sebastien Bacher (seb128)]

that's going to need a rebase on trunk after the landing of the recent translation fix that makes use of the correct domain

review: Needs Fixing

[lp:~renatofilho/address-book-app/split-app]

452. By Renato Araujo Oliveira Filho on 2015-06-01

Does not try to fetch contact with invalid model.

453. By Renato Araujo Oliveira Filho on 2015-06-01

Show empty string instead of "No name" if contact is not fetched yet.

454. By Renato Araujo Oliveira Filho on 2015-06-01

Trunk merged.

455. By Renato Araujo Oliveira Filho on 2015-06-01

Show empty title while contact is invalid.

456. By Renato Araujo Oliveira Filho on 2015-06-01

Added VCardImportDialog.qml file back.

[Ricardo Salveti (rsalveti)]

Packaging changes look fine.

review: Approve (packaging)

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2015-02-04 14:27:31 +0000
+++ CMakeLists.txt	2015-06-01 22:08:49 +0000
@@ -75,6 +75,7 @@
 
 set(DESKTOP_EXEC "${ADDRESS_BOOK_APP_BINDIR}/address-book-app")
 set(QMLPLUGIN_INSTALL_PREFIX "${QT_IMPORTS_DIR}/Ubuntu/Contacts.${API_VERSION}/")
+set(ADDRESS_BOOK_QMLPLUGIN_INSTALL_PREFIX "${QT_IMPORTS_DIR}/Ubuntu/AddressBook/")
 set(ADDRESS_BOOK_APP_DESKTOP_FILE address-book-app.desktop)
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall")
 

=== modified file 'debian/control'
--- debian/control	2015-03-17 17:39:31 +0000
+++ debian/control	2015-06-01 22:08:49 +0000
@@ -48,8 +48,7 @@
          qtdeclarative5-qtcontacts-plugin,
          qtdeclarative5-qtquick2-plugin,
          qtdeclarative5-ofono0.2,
-         qtdeclarative5-ubuntu-contacts0.1 (= ${binary:Version}),
-         qtdeclarative5-ubuntu-content1,
+         qtdeclarative5-ubuntu-addressbook0.1 (= ${binary:Version}),
          qtdeclarative5-ubuntu-history0.1,
          qtdeclarative5-ubuntu-keyboard-extensions0.1,
          qtdeclarative5-ubuntu-telephony-phonenumber0.1 (>= 0.1+14.10.20140715.1),
@@ -75,6 +74,18 @@
  .
  This package contains the Ubuntu Contacts Components QML plugin.
 
+Package: qtdeclarative5-ubuntu-addressbook0.1
+Architecture: any
+Depends: qtdeclarative5-ubuntu-contacts0.1 (= ${binary:Version}), 
+         qtdeclarative5-ubuntu-content1,
+         ${misc:Depends},
+         ${shlibs:Depends},
+Description: Qt Ubuntu Address Book  Components - QML plugin
+ Qt Ubuntu Address Book Components offers a set of reusable user interface
+ related with address book for Qt Quick 2 / QML.
+ .
+ This package contains the Ubuntu Address Book Components QML plugin.
+
 Package: address-book-app-dbg
 Architecture: amd64 armhf i386
 Section: debug

=== added file 'debian/qtdeclarative5-ubuntu-addressbook0.1.install'
--- debian/qtdeclarative5-ubuntu-addressbook0.1.install	1970-01-01 00:00:00 +0000
+++ debian/qtdeclarative5-ubuntu-addressbook0.1.install	2015-06-01 22:08:49 +0000
@@ -0,0 +1,4 @@
+usr/lib/*/qt5/qml/Ubuntu/AddressBook/Base/*
+usr/lib/*/qt5/qml/Ubuntu/AddressBook/ContactView/*
+usr/lib/*/qt5/qml/Ubuntu/AddressBook/ContactEditor/*
+usr/lib/*/qt5/qml/Ubuntu/AddressBook/ContactShare/*

=== modified file 'src/app/CMakeLists.txt'
--- src/app/CMakeLists.txt	2014-06-11 21:25:08 +0000
+++ src/app/CMakeLists.txt	2015-06-01 22:08:49 +0000
@@ -9,8 +9,6 @@
 set(ADDRESS_BOOK_APP_SRCS
     addressbookapp.h
     addressbookapp.cpp
-    imagescalethread.h
-    imagescalethread.cpp
     main.cpp
 )
 

=== modified file 'src/app/addressbookapp.cpp'
--- src/app/addressbookapp.cpp	2015-02-09 14:06:06 +0000
+++ src/app/addressbookapp.cpp	2015-06-01 22:08:49 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2013 Canonical, Ltd.
+ * Copyright (C) 2012-2015 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
@@ -16,7 +16,6 @@
 
 #include "config.h"
 #include "addressbookapp.h"
-#include "imagescalethread.h"
 
 #include <QDir>
 #include <QUrl>
@@ -407,28 +406,6 @@
     }
 }
 
-QUrl AddressBookApp::copyImage(QObject *contact, const QUrl &imageUrl)
-{
-    // keep track of threads to avoid memory leeak
-    ImageScaleThread *imgThread;
-    QVariant oldThread = contact->property("IMAGE_SCALE_THREAD");
-    if (!oldThread.isNull()) {
-        imgThread = oldThread.value<ImageScaleThread *>();
-        imgThread->updateImageUrl(imageUrl);
-    } else {
-        imgThread = new ImageScaleThread(imageUrl, contact);
-        contact->setProperty("IMAGE_SCALE_THREAD", QVariant::fromValue<ImageScaleThread*>(imgThread));
-    }
-
-    imgThread->start();
-
-    while(imgThread->isRunning()) {
-        this->processEvents(QEventLoop::AllEvents, 3000);
-    }
-
-    return imgThread->outputFile();
-}
-
 void AddressBookApp::elapsed() const
 {
     qDebug() << "ELAPSED:" << s_elapsed.elapsed() / 1000.0;

=== modified file 'src/app/addressbookapp.h'
--- src/app/addressbookapp.h	2015-02-09 14:06:06 +0000
+++ src/app/addressbookapp.h	2015-06-01 22:08:49 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2013 Canonical, Ltd.
+ * Copyright (C) 2012-2015 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
@@ -44,7 +44,6 @@
 
 public Q_SLOTS:
     void activateWindow();
-    QUrl copyImage(QObject *contact, const QUrl &imageUrl);
     void parseUrl(const QString &arg);
     void onViewStatusChanged(QQuickView::Status status);
     void returnVcard(const QUrl &url);

=== modified file 'src/app/main.cpp'
--- src/app/main.cpp	2014-02-18 14:09:02 +0000
+++ src/app/main.cpp	2015-06-01 22:08:49 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2013 Canonical, Ltd.
+ * Copyright (C) 2012-2015 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

=== added file 'src/imports/ABContactEditorPage.qml'
--- src/imports/ABContactEditorPage.qml	1970-01-01 00:00:00 +0000
+++ src/imports/ABContactEditorPage.qml	2015-06-01 22:08:49 +0000
@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2012-2015 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 QtContacts 5.0
+
+import Ubuntu.Components 1.1
+
+import Ubuntu.AddressBook.ContactEditor 0.1
+
+ContactEditorPage {
+    id: root
+    objectName: "contactEditorPage"
+
+    head.backAction: Action {
+        objectName: "cancel"
+
+        text: i18n.tr("Cancel")
+        iconName: "back"
+        onTriggered: {
+            root.cancel()
+            root.active = false
+        }
+    }
+
+    head.actions: [
+        Action {
+            objectName: "save"
+
+            text: i18n.tr("Save")
+            iconName: "ok"
+            // disable save button while avatar scale still running
+            enabled: root.isContactValid
+            onTriggered: root.save()
+        }
+    ]
+
+    onContactSaved: {
+        if (pageStack.contactListPage) {
+            pageStack.contactListPage.moveListToContact(contact)
+        }
+    }
+}

=== added file 'src/imports/ABContactListPage.qml'
--- src/imports/ABContactListPage.qml	1970-01-01 00:00:00 +0000
+++ src/imports/ABContactListPage.qml	2015-06-01 22:08:49 +0000
@@ -0,0 +1,530 @@
+/*
+ * Copyright (C) 2012-2015 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 QtContacts 5.0
+
+import Ubuntu.Components 1.1
+import Ubuntu.Components.ListItems 1.0 as ListItem
+import Ubuntu.Components.Popups 1.0 as Popups
+import Ubuntu.Contacts 0.1 as ContactsUI
+import Ubuntu.Content 1.1 as ContentHub
+
+import Ubuntu.AddressBook.Base 0.1
+
+ContactsUI.PageWithBottomEdge {
+    id: mainPage
+    objectName: "contactListPage"
+
+    property bool pickMode: false
+    property alias contentHubTransfer: contactExporter.activeTransfer
+    property bool pickMultipleContacts: false
+    property QtObject contactIndex: null
+    property string newPhoneToAdd: ""
+    property alias contactManager: contactList.manager
+
+    readonly property bool isEmpty: (contactList.count === 0)
+    readonly property bool allowToQuit: (application.callbackApplication.length > 0)
+    readonly property var contactModel: contactList.listModel ? contactList.listModel : null
+    readonly property bool searching: (state === "searching" || state === "newphoneSearching")
+
+    // this function is used to reset the contact list page to the default state if it was called
+    // from the uri. For example when called to add a new contact
+    function returnToNormalState()
+    {
+        // these two states are the only state that need to be reset
+        if (state == "newphoneSearching" || state == "newphone") {
+            state = "default"
+        }
+        application.callbackApplication = ""
+    }
+
+    function createContactWithPhoneNumber(phoneNumber)
+    {
+        var newContact = ContactsJS.createEmptyContact(phoneNumber, mainPage)
+        //WORKAROUND: SKD changes the page header as soon as the page get created
+        // setting active false will avoid that
+        if (bottomEdgeEnabled) {
+            mainPage.showBottomEdgePage(Qt.resolvedUrl("ABContactEditorPage.qml"),
+                                        {model: contactList.listModel,
+                                         contact: newContact,
+                                         active: false,
+                                         enabled: false,
+                                         initialFocusSection: "name"})
+        } else {
+            pageStack.push(Qt.resolvedUrl("ABContactEditorPage.qml"),
+                           {model: contactList.listModel,
+                            contact: newContact,
+                            initialFocusSection: "name"})
+        }
+    }
+
+    function showContact(contactId)
+    {
+        pageStack.push(Qt.resolvedUrl("ABContactViewPage.qml"),
+                       {model: contactList.listModel, contactId: contactId})
+    }
+
+    function addPhoneToContact(contactId, phoneNumber)
+    {
+        pageStack.push(Qt.resolvedUrl("ABContactViewPage.qml"),
+                       {model: contactList.listModel,
+                        contactId: contactId,
+                        addPhoneToContact: phoneNumber})
+    }
+
+    function importContact(urls)
+    {
+        if (urls.length > 0) {
+            var importDialog = Qt.createQmlObject("VCardImportDialog{}",
+                               mainPage,
+                               "VCardImportDialog")
+            if (importDialog) {
+                importDialog.importVCards(contactList.listModel, urls)
+            }
+        }
+    }
+
+    function startPickMode(isSingleSelection, activeTransfer)
+    {
+        contentHubTransfer = activeTransfer
+        pickMode = true
+        pickMultipleContacts = !isSingleSelection
+        contactList.startSelection()
+    }
+
+    function moveListToContact(contact)
+    {
+        contactIndex = contact
+        mainPage.state = "default"
+        // this means a new contact was created
+        if (mainPage.allowToQuit) {
+            application.goBackToSourceApp()
+        }
+    }
+
+    function addNewPhone(phoneNumber)
+    {
+        newPhoneToAdd = phoneNumber
+        state = "newphone"
+        contactList.reset()
+    }
+
+    title: i18n.tr("Contacts")
+    bottomEdgeTitle: "+"
+    bottomEdgeEnabled: !contactList.isInSelectionMode
+
+    flickable: null
+    ContactsUI.ContactListView {
+        id: contactList
+        objectName: "contactListView"
+        showImportOptions:  !mainPage.pickMode &&
+                            mainPage.newPhoneToAdd === ""
+        anchors {
+            top: parent.top
+            left: parent.left
+            bottom: keyboard.top
+            right: parent.right
+        }
+        filterTerm: searchField.text
+        detailToPick: ContactDetail.PhoneNumber
+        multiSelectionEnabled: true
+        multipleSelection: (mainPage.pickMode && mainPage.pickMultipleContacts) || !mainPage.pickMode
+
+        onAddContactClicked: mainPage.createContactWithPhoneNumber(label)
+        onAddNewContactClicked: mainPage.createContactWithPhoneNumber(mainPage.newPhoneToAdd)
+
+        onInfoRequested: {
+            mainPage.state = "default"
+            pageStack.push(Qt.resolvedUrl("ABContactViewPage.qml"),
+                           {model: contactList.listModel,
+                            contact: contact})
+        }
+
+        onDetailClicked: {
+            if (action == "call")
+                Qt.openUrlExternally("tel:///" + encodeURIComponent(detail.number))
+            else if (action == "message")
+                Qt.openUrlExternally("message:///" + encodeURIComponent(detail.number))
+            else if ((mainPage.state === "newphone") || (mainPage.state === "newphoneSearching")) {
+                mainPage.addPhoneToContact(contact.contactId, mainPage.newPhoneToAdd)
+            }
+        }
+
+        onAddDetailClicked: mainPage.addPhoneToContact(contact.contactId, " ")
+        onIsInSelectionModeChanged: mainPage.state = isInSelectionMode ? "selection"  : "default"
+        onSelectionCanceled: {
+            if (pickMode) {
+                if (contentHubTransfer) {
+                    contentHubTransfer.state = ContentHub.ContentTransfer.Aborted
+                }
+                pickMode = false
+                contentHubTransfer = null
+                application.returnVcard("")
+            }
+            mainPage.state = "default"
+        }
+
+        onError: pageStack.contactModelError(error)
+    }
+
+    TextField {
+        id: searchField
+
+        anchors {
+            left: parent.left
+            right: parent.right
+            rightMargin: units.gu(2)
+        }
+        visible: mainPage.searching
+        onTextChanged: contactList.currentIndex = -1
+        inputMethodHints: Qt.ImhNoPredictiveText
+        placeholderText: i18n.tr("Search...")
+    }
+
+    Connections {
+        target: mainPage.head.sections
+        onSelectedIndexChanged: {
+            switch (mainPage.head.sections.selectedIndex) {
+            case 0:
+                contactList.showAllContacts()
+                break;
+            case 1:
+                contactList.showFavoritesContacts()
+                break;
+            default:
+                break;
+            }
+        }
+    }
+
+    state: "default"
+    states: [
+        PageHeadState {
+            id: defaultState
+
+            name: "default"
+            backAction: Action {
+                visible: mainPage.allowToQuit
+                iconName: "back"
+                text: i18n.tr("Quit")
+                onTriggered: {
+                    application.goBackToSourceApp()
+                    mainPage.returnToNormalState()
+                }
+            }
+            actions: [
+                Action {
+                    text: i18n.tr("Search")
+                    iconName: "search"
+                    visible: !mainPage.isEmpty
+                    onTriggered: {
+                        mainPage.state = (mainPage.state === "newphone" ? "newphoneSearching" : "searching")
+                        contactList.showAllContacts()
+                        searchField.forceActiveFocus()
+                    }
+                },
+                Action {
+                    visible: contactList.syncEnabled
+                    text: contactList.syncing ? i18n.tr("Syncing") : i18n.tr("Sync")
+                    iconName: "reload"
+                    enabled: !contactList.syncing
+                    onTriggered: contactList.sync()
+                },
+                Action {
+                    text: i18n.tr("Settings")
+                    iconName: "settings"
+                    onTriggered: pageStack.push(Qt.resolvedUrl("../Settings/SettingsPage.qml"),
+                                                {"contactListModel": contactList.listModel})
+                }
+            ]
+            PropertyChanges {
+                target: mainPage.head
+                backAction: defaultState.backAction
+                actions: defaultState.actions
+                // TRANSLATORS: this refers to all contacts
+                sections.model: [i18n.tr("All"), i18n.tr("Favorites")]
+            }
+            PropertyChanges {
+                target: searchField
+                text: ""
+            }
+        },
+        PageHeadState {
+            id: searchingState
+
+            name: "searching"
+            backAction: Action {
+                iconName: "back"
+                text: i18n.tr("Cancel")
+                onTriggered: {
+                    contactList.forceActiveFocus()
+                    mainPage.head.sections.selectedIndex = 0
+                    mainPage.state = (mainPage.state === "newphoneSearching" ? "newphone" : "default")
+                }
+            }
+
+            PropertyChanges {
+                target: mainPage.head
+                backAction: searchingState.backAction
+                contents: searchField
+            }
+
+            PropertyChanges {
+                target: searchField
+                text: ""
+            }
+        },
+        PageHeadState {
+            id: selectionState
+
+            name: "selection"
+            backAction: Action {
+                text: i18n.tr("Cancel selection")
+                iconName: "back"
+                onTriggered: contactList.cancelSelection()
+            }
+            actions: [
+                Action {
+                    text: (contactList.selectedItems.count === contactList.count) ? i18n.tr("Unselect All") : i18n.tr("Select All")
+                    iconName: "select"
+                    onTriggered: {
+                        if (contactList.selectedItems.count === contactList.count) {
+                            contactList.clearSelection()
+                        } else {
+                            contactList.selectAll()
+                        }
+                    }
+                    visible: contactList.multipleSelection && !mainPage.isEmpty
+                },
+                Action {
+                    objectName: "share"
+                    text: i18n.tr("Share")
+                    iconName: mainPage.pickMode ? "tick" : "share"
+                    enabled: (contactList.selectedItems.count > 0)
+                    visible: contactList.isInSelectionMode
+                    onTriggered: {
+                        var contacts = []
+                        var items = contactList.selectedItems
+
+                        for (var i=0, iMax=items.count; i < iMax; i++) {
+                            contacts.push(items.get(i).model.contact)
+                        }
+                        contactExporter.start(contacts)
+                        contactList.endSelection()
+                    }
+                },
+                Action {
+                    objectName: "delete"
+                    text: i18n.tr("Delete")
+                    iconName: "delete"
+                    enabled: (contactList.selectedItems.count > 0)
+                    visible: contactList.isInSelectionMode && !mainPage.pickMode
+                    onTriggered: {
+                        var contacts = []
+                        var items = contactList.selectedItems
+
+                        for (var i=0, iMax=items.count; i < iMax; i++) {
+                            contacts.push(items.get(i).model.contact)
+                        }
+
+                        var dialog = PopupUtils.open(removeContactDialog, null)
+                        dialog.contacts = contacts
+                        contactList.endSelection()
+                    }
+                }
+            ]
+            PropertyChanges {
+                target: mainPage.head
+                backAction: selectionState.backAction
+                actions: selectionState.actions
+            }
+            PropertyChanges {
+                target: mainPage
+                bottomEdgeEnabled: false
+                title: " "
+            }
+        },
+        PageHeadState {
+            name: "newphone"
+            extend: "default"
+            head: mainPage.head
+            PropertyChanges {
+                target: contactList
+                showAddNewButton: true
+            }
+            PropertyChanges {
+                target: mainPage
+                bottomEdgeEnabled: false
+                title: i18n.tr("Add contact")
+            }
+            PropertyChanges {
+                target: contactList
+                detailToPick: -1
+            }
+        },
+        PageHeadState {
+            name: "newphoneSearching"
+            extend: "searching"
+            head: mainPage.head
+            PropertyChanges {
+                target: contactList
+                detailToPick: -1
+                showAddNewButton: true
+            }
+            PropertyChanges {
+                target: mainPage
+                bottomEdgeEnabled: false
+            }
+        }
+    ]
+    onActiveChanged: {
+        if (active && contactList.showAddNewButton) {
+            contactList.positionViewAtBeginning()
+        }
+    }
+
+    // We need to reset the page proprerties in case of the page was created pre-populated,
+    // with phonenumber or contact.
+    onBottomEdgeDismissed: {
+        //WORKAROUND: SKD changes the page header as soon as the page get created
+        // setting active false will avoid that
+        var newContact = ContactsUI.ContactsJS.createEmptyContact("", mainPage)
+        mainPage.setBottomEdgePage(Qt.resolvedUrl("ABContactEditorPage.qml"),
+                                   {model: contactList.listModel,
+                                    contact: newContact,
+                                    active: false,
+                                    enabled: false,
+                                    initialFocusSection: "name"})
+    }
+
+    KeyboardRectangle {
+        id: keyboard
+    }
+
+    Column {
+        id: emptyStateScreen
+
+        anchors.centerIn: parent
+        height: childrenRect.height
+        width: childrenRect.width
+        spacing: units.gu(2)
+        visible: (!contactList.busy &&
+                  !contactList.favouritesIsSelected &&
+                  mainPage.isEmpty &&
+                  (mainPage.newPhoneToAdd === "") &&
+                  !(contactList.filterTerm && contactList.filterTerm !== ""))
+
+        Behavior on visible {
+            SequentialAnimation {
+                 PauseAnimation {
+                     duration: !emptyStateScreen.visible ? 500 : 0
+                 }
+                 PropertyAction {
+                     target: emptyStateScreen
+                     property: "visible"
+                 }
+            }
+        }
+
+        Icon {
+            id: emptyStateIcon
+            anchors.horizontalCenter: emptyStateLabel.horizontalCenter
+            height: units.gu(5)
+            width: units.gu(5)
+            opacity: 0.3
+            name: "contact"
+        }
+        Label {
+            id: emptyStateLabel
+            width: mainPage.width - units.gu(12)
+            height: paintedHeight
+            text: mainPage.pickMode ?
+                      i18n.tr("You have no contacts.") :
+                      i18n.tr("Create a new contact by swiping up from the bottom of the screen.")
+            color: "#5d5d5d"
+            fontSize: "x-large"
+            wrapMode: Text.WordWrap
+            horizontalAlignment: Text.AlignHCenter
+        }
+    }
+
+    Connections {
+        target: mainPage.contactModel
+        onContactsChanged: {
+            if (contactIndex) {
+                contactList.positionViewAtContact(mainPage.contactIndex)
+                mainPage.contactIndex = null
+            }
+        }
+    }
+
+    ContactExporter {
+        id: contactExporter
+
+        contactModel: contactList.listModel
+        exportToDisk: mainPage.pickMode
+        onDone: {
+            mainPage.pickMode = false
+            mainPage.state = "default"
+            application.returnVcard(outputFile)
+        }
+
+        onContactsFetched: {
+            // Share contacts to an application chosen by the user
+            if (!mainPage.pickMode) {
+                contactExporter.dismissBusyDialog()
+                pageStack.push(Qt.resolvedUrl("../ContactShare/ContactSharePage.qml"),
+                               { contactModel: contactExporter.contactModel, contacts: contacts })
+            }
+        }
+    }
+
+    Component {
+        id: removeContactDialog
+
+        RemoveContactsDialog {
+            id: removeContactsDialogMessage
+
+            onCanceled: {
+                PopupUtils.close(removeContactsDialogMessage)
+            }
+
+            onAccepted: {
+                removeContacts(contactList.listModel)
+                PopupUtils.close(removeContactsDialogMessage)
+            }
+        }
+    }
+
+    Component.onCompleted: {
+        application.elapsed()
+        if ((typeof(TEST_DATA) !== "undefined") && (TEST_DATA !== "")) {
+            contactList.listModel.importContacts("file://" + TEST_DATA)
+        }
+
+        mainPage.setBottomEdgePage(Qt.resolvedUrl("ABContactEditorPage.qml"),
+                                   {model: contactList.listModel,
+                                    contact: ContactsUI.ContactsJS.createEmptyContact("", mainPage),
+                                    active: false,
+                                    enabled: false,
+                                    initialFocusSection: "name"})
+
+        if (pageStack) {
+            pageStack.contactListPage = mainPage
+        }
+    }
+}

=== added file 'src/imports/ABContactViewPage.qml'
--- src/imports/ABContactViewPage.qml	1970-01-01 00:00:00 +0000
+++ src/imports/ABContactViewPage.qml	2015-06-01 22:08:49 +0000
@@ -0,0 +1,87 @@
+/*
+ * Copyright (C) 2012-2015 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 1.1
+import Ubuntu.Components.Popups 1.0 as Popups
+import Ubuntu.Contacts 0.1
+
+import Ubuntu.AddressBook.Base 0.1
+import Ubuntu.AddressBook.ContactView 0.1
+import Ubuntu.AddressBook.ContactShare 0.1
+
+ContactViewPage {
+    id: root
+    objectName: "contactViewPage"
+
+    property string addPhoneToContact: ""
+
+    head.actions: [
+        Action {
+            objectName: "share"
+            text: i18n.tr("Share")
+            iconName: "share"
+            onTriggered: {
+                pageStack.push(contactShareComponent, {contactModel: root.model, contacts: [root.contact]})
+            }
+        },
+        Action {
+            objectName: "edit"
+            text: i18n.tr("Edit")
+            iconName: "edit"
+            onTriggered: {
+                pageStack.push(Qt.resolvedUrl("ABContactEditorPage.qml"),
+                               { model: root.model, contact: root.contact})
+            }
+        }
+    ]
+
+    onContactRemoved: pageStack.pop()
+
+    extensions: ContactDetailSyncTargetView {
+        contact: root.contact
+        anchors {
+            left: parent.left
+            right: parent.right
+        }
+        height: implicitHeight
+    }
+
+    // This will load the contact information when the app was launched with
+    // the URI: addressbook:///contact?id=<id>
+    onContactFetched: {
+        if (root.addPhoneToContact != "") {
+            var detailSourceTemplate = "import QtContacts 5.0; PhoneNumber{ number: \"" + root.addPhoneToContact.trim() + "\" }"
+            var newDetail = Qt.createQmlObject(detailSourceTemplate, contact)
+            if (newDetail) {
+                contact.addDetail(newDetail)
+                pageStack.push(Qt.resolvedUrl("ABContactEditorPage.qml"),
+                               { model: root.model,
+                                 contact: contact,
+                                 initialFocusSection: "phones",
+                                 newDetails: [newDetail]})
+                root.addPhoneToContact = ""
+            }
+        }
+    }
+
+    onActionTrigerred: Qt.openUrlExternally(("%1:///%2").arg(action).arg(detail.value(0)))
+
+    Component {
+        id: contactShareComponent
+        ContactSharePage {}
+    }
+}

=== modified file 'src/imports/CMakeLists.txt'
--- src/imports/CMakeLists.txt	2015-03-06 13:59:58 +0000
+++ src/imports/CMakeLists.txt	2015-06-01 22:08:49 +0000
@@ -1,6 +1,9 @@
 project(imports)
 
 set(ADDRESS_BOOK_APP_QMLS
+    ABContactListPage.qml
+    ABContactEditorPage.qml
+    ABContactViewPage.qml
     ContentHubProxy.qml
     MainWindow.qml
 )
@@ -12,10 +15,5 @@
 # make the files visible on qtcreator
 add_custom_target(address_book_QMlFiles ALL SOURCES ${ADDRESS_BOOK_APP_QMLS})
 
-add_subdirectory(Common)
-add_subdirectory(ContactList)
-add_subdirectory(ContactView)
-add_subdirectory(ContactEdit)
-add_subdirectory(ContactShare)
 add_subdirectory(Settings)
 add_subdirectory(Ubuntu)

=== removed directory 'src/imports/Common'
=== removed file 'src/imports/Common/CMakeLists.txt'
--- src/imports/Common/CMakeLists.txt	2014-10-09 17:39:12 +0000
+++ src/imports/Common/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,15 +0,0 @@
-set(CONTACT_COMMON_QMLS
-    ContactDetailItem.qml
-    ContactExporter.qml
-    KeyboardRectangle.qml
-    RemoveContactsDialog.qml
-    StandardAnimation.qml
-)
-
-install(FILES ${CONTACT_COMMON_QMLS}
-    DESTINATION ${ADDRESS_BOOK_APP_DIR}/imports/Common
-)
-
-# make the files visible on qtcreator
-add_custom_target(contact_common_QmlFiles ALL SOURCES ${CONTACT_COMMON_QMLS})
-

=== removed file 'src/imports/Common/ContactDetailItem.qml'
--- src/imports/Common/ContactDetailItem.qml	2014-08-13 20:52:57 +0000
+++ src/imports/Common/ContactDetailItem.qml	1970-01-01 00:00:00 +0000
@@ -1,62 +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 1.1
-import Ubuntu.Contacts 0.1
-
-ContactDetailBase {
-    id: root
-
-    readonly property alias fieldDelegates: fieldsColumn.children
-    property Component fieldDelegate: null
-    property alias spacing: fieldsColumn.spacing
-
-    implicitHeight: fieldsColumn.height
-    Column {
-        id: fieldsColumn
-
-        anchors {
-            left: parent.left
-            right: parent.right
-        }
-        spacing: units.gu(2)
-
-        height: childrenRect.height
-        Repeater {
-            id: fieldRepeater
-
-            model: root.fields
-            Loader {
-                id: field
-
-                sourceComponent: fieldDelegate
-                Binding {
-                    target: item
-                    property: "field"
-                    value: modelData
-                }
-
-                Binding {
-                    target: item
-                    property: "detail"
-                    value: root.detail
-                }
-            }
-        }
-    }
-}

=== removed file 'src/imports/Common/ContactExporter.qml'
--- src/imports/Common/ContactExporter.qml	2015-02-13 19:29:27 +0000
+++ src/imports/Common/ContactExporter.qml	1970-01-01 00:00:00 +0000
@@ -1,167 +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 QtContacts 5.0
-
-import Ubuntu.Components 1.1
-import Ubuntu.Content 1.1
-import Ubuntu.Components.Popups 1.0
-
-Item {
-    id: root
-
-    property var contactModel
-    property bool exportToDisk: true
-    property var activeTransfer: null
-
-    signal contactsFetched(var contacts)
-    signal done(string outputFile)
-
-    function start(contacts) {
-        if (!contactModel) {
-            console.error("No contact model defined")
-            return
-        }
-
-        // skip if a query is running
-        if (priv.currentQueryId != -1) {
-            console.error("Export already running")
-            return
-        }
-
-        if (!priv.busyDialog) {
-            priv.busyDialog = PopupUtils.open(busyDialogComponent, root)
-        }
-
-        var ids = []
-        for (var i=0; i < contacts.length; i++) {
-            ids.push(contacts[i].contactId)
-        }
-        if (ids.length == 0) {
-            console.debug("The contact list is empty")
-            done("")
-        } else {
-            priv.currentQueryId = contactModel.fetchContacts(ids)
-        }
-    }
-
-    function dismissBusyDialog()
-    {
-        if (priv.busyDialog) {
-            PopupUtils.close(priv.busyDialog)
-            priv.busyDialog = null
-        }
-    }
-
-    Item {
-        id: priv
-
-        property var busyDialog: null
-        property int currentQueryId: -1
-        readonly property var detailsBlackList: [ ContactDetail.Favorite, ContactDetail.Tag ]
-
-        function filterContactDetails(contact)
-        {
-            var newContact = Qt.createQmlObject("import QtContacts 5.0;  Contact { }", root)
-            var allDetails = contact.contactDetails
-            for(var i=0; i < allDetails.length; i++) {
-                var det = allDetails[i]
-                if (detailsBlackList.indexOf(det.type) == -1) {
-                    newContact.addDetail(det)
-                }
-            }
-            return newContact
-        }
-
-        function generateOutputFileName(contacts)
-        {
-            if (contacts.length === 1) {
-                return "file:///tmp/%1.vcf".arg(contacts[0].displayLabel.label.replace(/\s/g, ''))
-            } else {
-                return "file:///tmp/ubuntu_contacts.vcf";
-            }
-        }
-
-        Connections {
-            target: root.contactModel
-
-            onExportCompleted: {
-                // send contacts back to source app (pick mode)
-                if (error === ContactModel.ExportNoError) {
-                    var obj = Qt.createQmlObject("import Ubuntu.Content 1.1;  ContentItem { url: '" + url + "' }", root)
-                    if (root.activeTransfer) {
-                        root.activeTransfer.items = [obj]
-                        root.activeTransfer.state = ContentTransfer.Charged
-                    } else {
-                        console.error("No active transfer")
-                    }
-                } else {
-                    root.activeTransfer = ContentHub.ContentTransfer.Aborted
-                    console.error("Fail to export contacts:" + error)
-                }
-                root.dismissBusyDialog()
-                root.done(url)
-            }
-
-            onContactsFetched: {
-                // currentQueryId == -2 is used during a fetch using "memory" manager
-                if ((priv.currentQueryId == -2) || (requestId == priv.currentQueryId)) {
-                    if (root.exportToDisk) {
-                        var contacts = []
-                        // remove unnecessary info from contacts
-                        for(var i=0; i < fetchedContacts.length; i++) {
-                            contacts.push(priv.filterContactDetails(fetchedContacts[i]))
-                        }
-                        // update outputFile with a friendly name
-                        var outputFile = priv.generateOutputFileName(contacts)
-                        root.contactModel.exportContacts(outputFile,
-                                                         [],
-                                                         contacts)
-                    }
-                    root.contactsFetched(fetchedContacts)
-                    priv.currentQueryId = -1
-                }
-            }
-        }
-
-        Connections {
-            target: root.activeTransfer
-
-            onStateChanged: {
-                if (root.activeTransfer.state === ContentTransfer.Aborted) {
-                    root.activeTransfer = null
-                    root.done("")
-                }
-            }
-        }
-    }
-
-    Component {
-        id: busyDialogComponent
-
-        Dialog {
-            title: i18n.tr("Exporting contacts...")
-
-            ActivityIndicator {
-                id: activity
-
-                anchors.horizontalCenter: parent.horizontalCenter
-                running: true
-            }
-        }
-    }
-}

=== removed file 'src/imports/Common/KeyboardRectangle.qml'
--- src/imports/Common/KeyboardRectangle.qml	2014-06-05 16:46:28 +0000
+++ src/imports/Common/KeyboardRectangle.qml	1970-01-01 00:00:00 +0000
@@ -1,74 +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
-
-Item {
-    id: keyboardRect
-    anchors.left: parent.left
-    anchors.right: parent.right
-    anchors.bottom: parent.bottom
-    height: Qt.inputMethod.visible ? Qt.inputMethod.keyboardRectangle.height : 0
-
-    Behavior on height {
-        StandardAnimation { }
-    }
-
-    states: [
-        State {
-            name: "hidden"
-            when: keyboardRect.height == 0
-        },
-        State {
-            name: "shown"
-            when: keyboardRect.height == Qt.inputMethod.keyboardRectangle.height
-        }
-    ]
-
-    function recursiveFindFocusedItem(parent) {
-        if (parent.activeFocus) {
-            return parent;
-        }
-
-        for (var i in parent.children) {
-            var child = parent.children[i];
-            if (child.activeFocus) {
-                return child;
-            }
-
-            var item = recursiveFindFocusedItem(child);
-
-            if (item != null) {
-                return item;
-            }
-        }
-
-        return null;
-    }
-
-    Connections {
-        target: Qt.inputMethod
-
-        onVisibleChanged: {
-            if (!Qt.inputMethod.visible) {
-                var focusedItem = recursiveFindFocusedItem(keyboardRect.parent);
-                if (focusedItem != null) {
-                    focusedItem.focus = false;
-                }
-            }
-        }
-    }
-}

=== removed file 'src/imports/Common/RemoveContactsDialog.qml'
--- src/imports/Common/RemoveContactsDialog.qml	2014-09-03 19:17:35 +0000
+++ src/imports/Common/RemoveContactsDialog.qml	1970-01-01 00:00:00 +0000
@@ -1,78 +0,0 @@
-/*
- * Copyright (C) 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 1.1
-import Ubuntu.Components.Popups 1.0
-
-Dialog {
-    objectName: "removeContactsDialog"
-
-    property var contacts: []
-
-    signal canceled()
-    signal accepted()
-
-    function removeContacts(model)
-    {
-        var ids = []
-        for(var i=0, iMax=contacts.length; i < iMax; i++) {
-            ids.push(contacts[i].contactId)
-        }
-        model.removeContacts(ids)
-    }
-
-    title: {
-        if (contacts.length == 0) {
-            return i18n.tr("No contact selected.")
-        } else if (contacts.length == 1)  {
-            return contacts[0].displayLabel.label
-        } else {
-            return i18n.tr("Multiple contacts")
-        }
-    }
-    text: {
-        if (contacts.length == 1)  {
-            return i18n.tr("Are you sure that you want to remove this contact?")
-        } else {
-            return i18n.tr("Are you sure that you want to remove all selected contacts?")
-        }
-    }
-
-    Button {
-        objectName: "removeContactsDialog.Yes"
-        anchors {
-            left: parent.left
-            right: parent.right
-            margins: units.gu(1)
-        }
-        text: i18n.tr("Yes")
-        color: UbuntuColors.green
-        onClicked: accepted()
-    }
-
-    Button {
-        objectName: "removeContactsDialog.No"
-        anchors {
-            left: parent.left
-            right: parent.right
-            margins: units.gu(1)
-        }
-        text: i18n.tr("No")
-        color: UbuntuColors.red
-        onClicked: canceled()
-    }
-}

=== removed file 'src/imports/Common/StandardAnimation.qml'
--- src/imports/Common/StandardAnimation.qml	2014-06-05 16:46:28 +0000
+++ src/imports/Common/StandardAnimation.qml	1970-01-01 00:00:00 +0000
@@ -1,22 +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
-
-NumberAnimation {
-    duration: 300
-    easing.type: Easing.InOutQuad
-}

=== removed file 'src/imports/ContactEdit/ContactEditor.qml'
--- src/imports/ContactEdit/ContactEditor.qml	2015-01-09 19:16:00 +0000
+++ src/imports/ContactEdit/ContactEditor.qml	1970-01-01 00:00:00 +0000
@@ -1,461 +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 QtContacts 5.0
-
-import Ubuntu.Components 1.1
-import Ubuntu.Components.ListItems 1.0
-import Ubuntu.Components.Popups 1.0
-
-import "../Common"
-
-Page {
-    id: contactEditor
-    objectName: "contactEditorPage"
-
-    property QtObject contact: null
-    property QtObject model: null
-    property QtObject activeItem: null
-    readonly property bool isNewContact: contact && (contact.contactId === "qtcontacts:::")
-    property string initialFocusSection: ""
-    property var newDetails: []
-
-    // priv
-    property bool _edgeReady: false
-
-    function cancel() {
-        for (var i = 0; i < contactEditor.newDetails.length; ++i) {
-            contactEditor.contact.removeDetail(contactEditor.newDetails[i])
-        }
-        contactEditor.newDetails = []
-
-        for(var i = 0; i < contents.children.length; ++i) {
-            var field = contents.children[i]
-            if (field.cancel) {
-                field.cancel()
-            }
-        }
-        pageStack.pop()
-    }
-
-    function save() {
-        var changed = false
-        for(var i = 0; i < contents.children.length; ++i) {
-            var field = contents.children[i]
-            if (field.save) {
-                if (field.save()) {
-                    changed = true
-                }
-            }
-        }
-
-        // new contact and there is only two details (name, avatar)
-        // name and avatar, are not removable details, because of that the contact will have at least 2 details
-        if (isNewContact &&
-            (contact.contactDetails.length === 2)) {
-
-            // if name is empty this means that the contact is empty
-            var nameDetail = contact.detail(ContactDetail.Name)
-            if (nameDetail &&
-                (nameDetail.firstName && nameDetail.firstName != "") ||
-                (nameDetail.lastName && nameDetail.lastName != "")) {
-                // save contact
-            } else {
-                changed  = false
-            }
-        }
-
-        if (changed) {
-            // backend error will be handled by the root page (contact list)
-            var newContact = (contact.model == null)
-            contactEditor.model.saveContact(contact)
-            if (newContact && pageStack.contactListPage) {
-                pageStack.contactListPage.moveListToContact(contact)
-            }
-        }
-        pageStack.pop()
-    }
-
-    function makeMeVisible(item) {
-        if (!_edgeReady || !item) {
-            return
-        }
-
-        activeItem = item
-        var position = scrollArea.contentItem.mapFromItem(item, 0, activeItem.y);
-
-        // check if the item is already visible
-        var bottomY = scrollArea.contentY + scrollArea.height
-        var itemBottom = position.y + (item.height * 3) // extra margin
-        if (position.y >= scrollArea.contentY && itemBottom <= bottomY) {
-            return;
-        }
-
-        // if it is not, try to scroll and make it visible
-        var targetY = itemBottom - scrollArea.height
-        if (targetY >= 0 && position.y) {
-            scrollArea.contentY = targetY;
-        } else if (position.y < scrollArea.contentY) {
-            // if it is hidden at the top, also show it
-            scrollArea.contentY = position.y;
-        }
-        scrollArea.returnToBounds()
-    }
-
-    function ready()
-    {
-        enabled = true
-        _edgeReady = true
-
-        switch (contactEditor.initialFocusSection)
-        {
-        case "phones":
-            contactEditor.focusToLastPhoneField()
-            break;
-        case "name":
-            nameEditor.fieldDelegates[0].forceActiveFocus()
-            break;
-        }
-        contactEditor.initialFocusSection = ""
-    }
-
-    function focusToLastPhoneField()
-    {
-        var lastPhoneField = phonesEditor.detailDelegates[phonesEditor.detailDelegates.length - 2].item
-        lastPhoneField.forceActiveFocus()
-    }
-
-    title: isNewContact ? i18n.tr("New contact") : i18n.tr("Edit")
-
-    Timer {
-        id: focusTimer
-
-        interval: 1000
-        running: false
-        repeat: false
-        onTriggered: contactEditor.ready()
-    }
-
-    flickable: null
-    Flickable {
-        id: scrollArea
-        objectName: "scrollArea"
-
-        // this is necessary to avoid the page to appear bellow the header
-        clip: true
-        flickableDirection: Flickable.VerticalFlick
-        anchors {
-            fill: parent
-            bottomMargin: keyboard.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
-        onContentHeightChanged: contactEditor.makeMeVisible(contactEditor.activeItem)
-
-        Column {
-            id: contents
-
-            anchors {
-                top: parent.top
-                topMargin: units.gu(2)
-                left: parent.left
-                right: parent.right
-            }
-            height: childrenRect.height
-
-            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 {
-                id: phonesEditor
-                objectName: "phones"
-
-                contact: contactEditor.contact
-                anchors {
-                    left: parent.left
-                    right: parent.right
-                }
-                height: implicitHeight
-            }
-
-            ContactDetailEmailsEditor {
-                id: emailsEditor
-                objectName: "emails"
-
-                contact: contactEditor.contact
-                anchors {
-                    left: parent.left
-                    right: parent.right
-                }
-                height: implicitHeight
-            }
-
-            ContactDetailOnlineAccountsEditor {
-                id: accountsEditor
-                objectName: "ims"
-
-                contact: contactEditor.contact
-                anchors {
-                    left: parent.left
-                    right: parent.right
-                }
-                height: implicitHeight
-            }
-
-            ContactDetailAddressesEditor {
-                id: addressesEditor
-                objectName: "addresses"
-
-                contact: contactEditor.contact
-                anchors {
-                    left: parent.left
-                    right: parent.right
-                }
-                height: implicitHeight
-            }
-
-            ContactDetailOrganizationsEditor {
-                id: organizationsEditor
-                objectName: "professionalDetails"
-
-                contact: contactEditor.contact
-                anchors {
-                    left: parent.left
-                    right: parent.right
-                }
-                height: implicitHeight
-            }
-
-            ContactDetailSyncTargetEditor {
-                id: syncTargetEditor
-
-                active: contactEditor.active
-                contact: contactEditor.contact
-                anchors {
-                    left: parent.left
-                    right: parent.right
-                }
-                height: implicitHeight
-            }
-
-            ThinDivider {}
-
-            Item {
-                anchors {
-                    left: parent.left
-                    right: parent.right
-                }
-                height: units.gu(2)
-            }
-
-            ComboButtonAddField {
-                id: addNewFieldButton
-                objectName: "addNewFieldButton"
-
-                contact: contactEditor.contact
-                text: i18n.tr("Add Field")
-                anchors {
-                    left: parent.left
-                    right: parent.right
-                    margins: units.gu(2)
-                }
-                height: implicitHeight
-                onHeightChanged: {
-                    if (expanded && (height === expandedHeight) && !scrollArea.atYEnd) {
-                        moveToBottom.start()
-                    }
-                }
-
-                UbuntuNumberAnimation {
-                    id: moveToBottom
-
-                    target: scrollArea
-                    property: "contentY"
-                    from: scrollArea.contentY
-                    to: Math.min(scrollArea.contentHeight - scrollArea.height,
-                                 scrollArea.contentY + (addNewFieldButton.height - addNewFieldButton.collapsedHeight - units.gu(3)))
-                }
-
-                onFieldSelected: {
-                    if (qmlTypeName) {
-                        var newDetail = Qt.createQmlObject("import QtContacts 5.0; " + qmlTypeName + "{}", contactEditor)
-                        if (newDetail) {
-                            var newDetailsCopy = contactEditor.newDetails
-                            newDetailsCopy.push(newDetail)
-                            contactEditor.newDetails = newDetailsCopy
-                            contactEditor.contact.addDetail(newDetail)
-                        }
-                    }
-                }
-            }
-
-
-            Item {
-                anchors {
-                    left: parent.left
-                    right: parent.right
-                }
-                height: units.gu(2)
-            }
-
-            Button {
-                id: deleteButton
-
-                text: i18n.tr("Delete")
-                visible: !contactEditor.isNewContact
-                color: UbuntuColors.red
-                anchors {
-                    left: parent.left
-                    right: parent.right
-                    margins: units.gu(2)
-                }
-                onClicked: {
-                    var dialog = PopupUtils.open(removeContactDialog, null)
-                    dialog.contacts = [contactEditor.contact]
-                }
-            }
-
-
-            Item {
-                anchors {
-                    left: parent.left
-                    right: parent.right
-                }
-                height: units.gu(2)
-            }
-        }
-    }
-
-    KeyboardRectangle {
-        id: keyboard
-
-        onHeightChanged: {
-            if (activeItem) {
-                makeMeVisible(activeItem)
-            }
-        }
-    }
-
-    tools: ToolbarItems {
-        id: toolbar
-
-        back: ToolbarButton {
-            action: Action {
-                objectName: "cancel"
-
-                iconName: "back"
-                text: i18n.tr("Cancel")
-                onTriggered: {
-                    contactEditor.cancel()
-                    contactEditor.active = false
-                }
-            }
-        }
-
-        ToolbarButton {
-            action: Action {
-                objectName: "save"
-
-                iconName: "ok"
-                text: i18n.tr("Save")
-                // disable save button while avatar scale still running
-                enabled: !avatarEditor.busy && (!nameEditor.isEmpty() || !phonesEditor.isEmpty())
-                onTriggered: contactEditor.save()
-            }
-        }
-    }
-
-    Component.onCompleted: {
-        if (!enabled) {
-            return
-        }
-
-        if (contactEditor.initialFocusSection != "") {
-            focusTimer.restart()
-        } else {
-            contactEditor.ready()
-        }
-    }
-
-    Component {
-        id: removeContactDialog
-
-        RemoveContactsDialog {
-            id: removeContactsDialogMessage
-
-            property bool popPages: false
-
-            onCanceled: {
-                PopupUtils.close(removeContactsDialogMessage)
-            }
-
-            onAccepted: {
-                popPages = true
-                removeContacts(contactEditor.model)
-                PopupUtils.close(removeContactsDialogMessage)
-            }
-
-            // hide virtual keyboard if necessary
-            Component.onCompleted: Qt.inputMethod.hide()
-
-            // WORKAROUND: SDK element crash if pop the page where the dialog was created
-            Component.onDestruction: {
-                if (popPages) {
-                    contactEditor.pageStack.pop() // editor page
-                    contactEditor.pageStack.pop() // view page
-                }
-            }
-        }
-    }
-}

=== removed directory 'src/imports/ContactList'
=== removed file 'src/imports/ContactList/CMakeLists.txt'
--- src/imports/ContactList/CMakeLists.txt	2015-02-05 16:18:10 +0000
+++ src/imports/ContactList/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,11 +0,0 @@
-set(CONTACT_LIST_QMLS
-    ContactListPage.qml
-    VCardImportDialog.qml
-)
-
-install(FILES ${CONTACT_LIST_QMLS}
-    DESTINATION ${ADDRESS_BOOK_APP_DIR}/imports/ContactList
-)
-
-# make the files visible on qtcreator
-add_custom_target(contact_list_QmlFiles ALL SOURCES ${CONTACT_LIST_QMLS})

=== removed file 'src/imports/ContactList/ContactListPage.qml'
--- src/imports/ContactList/ContactListPage.qml	2015-03-06 13:59:58 +0000
+++ src/imports/ContactList/ContactListPage.qml	1970-01-01 00:00:00 +0000
@@ -1,554 +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 QtContacts 5.0
-
-import Ubuntu.Components 1.1
-import Ubuntu.Components.ListItems 1.0 as ListItem
-import Ubuntu.Components.Popups 1.0 as Popups
-import Ubuntu.Contacts 0.1 as ContactsUI
-import Ubuntu.Content 1.1 as ContentHub
-
-import "../Common"
-
-ContactsUI.PageWithBottomEdge {
-    id: mainPage
-    objectName: "contactListPage"
-
-    property bool pickMode: false
-    property alias contentHubTransfer: contactExporter.activeTransfer
-    property bool pickMultipleContacts: false
-    property QtObject contactIndex: null
-    property string newPhoneToAdd: ""
-    property alias contactManager: contactList.manager
-
-    readonly property bool isEmpty: (contactList.count === 0)
-    readonly property bool allowToQuit: (application.callbackApplication.length > 0)
-    readonly property var contactModel: contactList.listModel ? contactList.listModel : null
-    readonly property bool searching: (state === "searching" || state === "newphoneSearching")
-
-    // this function is used to reset the contact list page to the default state if it was called
-    // from the uri. For example when called to add a new contact
-    function returnToNormalState()
-    {
-        // these two states are the only state that need to be reset
-        if (state == "newphoneSearching" || state == "newphone") {
-            state = "default"
-        }
-        application.callbackApplication = ""
-    }
-
-    function createEmptyContact(phoneNumber)
-    {
-        var details = [ {detail: "PhoneNumber", field: "number", value: phoneNumber},
-                        {detail: "EmailAddress", field: "emailAddress", value: ""},
-                        {detail: "Name", field: "firstName", value: ""}
-                      ]
-
-        var newContact =  Qt.createQmlObject("import QtContacts 5.0; Contact{ }", mainPage)
-        var detailSourceTemplate = "import QtContacts 5.0; %1{ %2: \"%3\" }"
-        for (var i=0; i < details.length; i++) {
-            var detailMetaData = details[i]
-            var newDetail = Qt.createQmlObject(detailSourceTemplate.arg(detailMetaData.detail)
-                                            .arg(detailMetaData.field)
-                                            .arg(detailMetaData.value), mainPage)
-            newContact.addDetail(newDetail)
-        }
-        return newContact
-    }
-
-    function createContactWithPhoneNumber(phoneNumber)
-    {
-        var newContact = mainPage.createEmptyContact(phoneNumber)
-        //WORKAROUND: SKD changes the page header as soon as the page get created
-        // setting active false will avoid that
-        if (bottomEdgeEnabled) {
-            mainPage.showBottomEdgePage(Qt.resolvedUrl("../ContactEdit/ContactEditor.qml"),
-                                        {model: contactList.listModel,
-                                         contact: newContact,
-                                         active: false,
-                                         enabled: false,
-                                         initialFocusSection: "name"})
-        } else {
-            pageStack.push(Qt.resolvedUrl("../ContactEdit/ContactEditor.qml"),
-                           {model: contactList.listModel,
-                            contact: newContact,
-                            initialFocusSection: "name"})
-        }
-    }
-
-    function showContact(contactId)
-    {
-        pageStack.push(Qt.resolvedUrl("../ContactView/ContactView.qml"),
-                       {model: contactList.listModel, contactId: contactId})
-    }
-
-    function addPhoneToContact(contactId, phoneNumber)
-    {
-        pageStack.push(Qt.resolvedUrl("../ContactView/ContactView.qml"),
-                       {model: contactList.listModel,
-                        contactId: contactId,
-                        addPhoneToContact: phoneNumber})
-    }
-
-    function importContact(urls)
-    {
-        if (urls.length > 0) {
-            var importDialog = Qt.createQmlObject("VCardImportDialog{}",
-                               mainPage,
-                               "VCardImportDialog")
-            if (importDialog) {
-                importDialog.importVCards(contactList.listModel, urls)
-            }
-        }
-    }
-
-    function startPickMode(isSingleSelection, activeTransfer)
-    {
-        contentHubTransfer = activeTransfer
-        pickMode = true
-        pickMultipleContacts = !isSingleSelection
-        contactList.startSelection()
-    }
-
-    function moveListToContact(contact)
-    {
-        contactIndex = contact
-        mainPage.state = "default"
-        // this means a new contact was created
-        if (mainPage.allowToQuit) {
-            application.goBackToSourceApp()
-        }
-    }
-
-    function addNewPhone(phoneNumber)
-    {
-        newPhoneToAdd = phoneNumber
-        state = "newphone"
-        contactList.reset()
-    }
-
-    title: i18n.tr("Contacts")
-    bottomEdgeTitle: "+"
-    bottomEdgeEnabled: !contactList.isInSelectionMode
-
-    flickable: null
-    ContactsUI.ContactListView {
-        id: contactList
-        objectName: "contactListView"
-        showImportOptions:  !mainPage.pickMode &&
-                            mainPage.newPhoneToAdd === ""
-        anchors {
-            top: parent.top
-            left: parent.left
-            bottom: keyboard.top
-            right: parent.right
-        }
-        filterTerm: searchField.text
-        detailToPick: ContactDetail.PhoneNumber
-        multiSelectionEnabled: true
-        multipleSelection: (mainPage.pickMode && mainPage.pickMultipleContacts) || !mainPage.pickMode
-
-        leftSideAction: Action {
-            iconName: "delete"
-            text: i18n.tr("Delete")
-            onTriggered: value.remove()
-        }
-        onAddContactClicked: mainPage.createContactWithPhoneNumber(label)
-        onAddNewContactClicked: mainPage.createContactWithPhoneNumber(mainPage.newPhoneToAdd)
-
-        onInfoRequested: {
-            mainPage.state = "default"
-            pageStack.push(Qt.resolvedUrl("../ContactView/ContactView.qml"),
-                           {model: contactList.listModel,
-                            contact: contact})
-        }
-
-        onDetailClicked: {
-            if (action == "call")
-                Qt.openUrlExternally("tel:///" + encodeURIComponent(detail.number))
-            else if (action == "message")
-                Qt.openUrlExternally("message:///" + encodeURIComponent(detail.number))
-            else if ((mainPage.state === "newphone") || (mainPage.state === "newphoneSearching")) {
-                mainPage.addPhoneToContact(contact.contactId, mainPage.newPhoneToAdd)
-            }
-        }
-
-        onAddDetailClicked: mainPage.addPhoneToContact(contact.contactId, " ")
-        onIsInSelectionModeChanged: mainPage.state = isInSelectionMode ? "selection"  : "default"
-        onSelectionCanceled: {
-            if (pickMode) {
-                if (contentHubTransfer) {
-                    contentHubTransfer.state = ContentHub.ContentTransfer.Aborted
-                }
-                pickMode = false
-                contentHubTransfer = null
-                application.returnVcard("")
-            }
-            mainPage.state = "default"
-        }
-
-        onError: pageStack.contactModelError(error)
-    }
-
-    TextField {
-        id: searchField
-
-        anchors {
-            left: parent.left
-            right: parent.right
-            rightMargin: units.gu(2)
-        }
-        visible: mainPage.searching
-        onTextChanged: contactList.currentIndex = -1
-        inputMethodHints: Qt.ImhNoPredictiveText
-        placeholderText: i18n.tr("Search...")
-    }
-
-    Connections {
-        target: mainPage.head.sections
-        onSelectedIndexChanged: {
-            switch (mainPage.head.sections.selectedIndex) {
-            case 0:
-                contactList.showAllContacts()
-                break;
-            case 1:
-                contactList.showFavoritesContacts()
-                break;
-            default:
-                break;
-            }
-        }
-    }
-
-    state: "default"
-    states: [
-        PageHeadState {
-            id: defaultState
-
-            name: "default"
-            backAction: Action {
-                visible: mainPage.allowToQuit
-                iconName: "back"
-                text: i18n.tr("Quit")
-                onTriggered: {
-                    application.goBackToSourceApp()
-                    mainPage.returnToNormalState()
-                }
-            }
-            actions: [
-                Action {
-                    text: i18n.tr("Search")
-                    iconName: "search"
-                    visible: !mainPage.isEmpty
-                    onTriggered: {
-                        mainPage.state = (mainPage.state === "newphone" ? "newphoneSearching" : "searching")
-                        contactList.showAllContacts()
-                        searchField.forceActiveFocus()
-                    }
-                },
-                Action {
-                    visible: contactList.syncEnabled
-                    text: contactList.syncing ? i18n.tr("Syncing") : i18n.tr("Sync")
-                    iconName: "reload"
-                    enabled: !contactList.syncing
-                    onTriggered: contactList.sync()
-                },
-                Action {
-                    text: i18n.tr("Settings")
-                    iconName: "settings"
-                    onTriggered: pageStack.push(Qt.resolvedUrl("../Settings/SettingsPage.qml"),
-                                                {"contactListModel": contactList.listModel})
-                }
-            ]
-            PropertyChanges {
-                target: mainPage.head
-                backAction: defaultState.backAction
-                actions: defaultState.actions
-                // TRANSLATORS: this refers to all contacts
-                sections.model: [i18n.tr("All"), i18n.tr("Favorites")]
-            }
-            PropertyChanges {
-                target: searchField
-                text: ""
-            }
-        },
-        PageHeadState {
-            id: searchingState
-
-            name: "searching"
-            backAction: Action {
-                iconName: "back"
-                text: i18n.tr("Cancel")
-                onTriggered: {
-                    contactList.forceActiveFocus()
-                    mainPage.head.sections.selectedIndex = 0
-                    mainPage.state = (mainPage.state === "newphoneSearching" ? "newphone" : "default")
-                }
-            }
-
-            PropertyChanges {
-                target: mainPage.head
-                backAction: searchingState.backAction
-                contents: searchField
-            }
-
-            PropertyChanges {
-                target: searchField
-                text: ""
-            }
-        },
-        PageHeadState {
-            id: selectionState
-
-            name: "selection"
-            backAction: Action {
-                text: i18n.tr("Cancel selection")
-                iconName: "back"
-                onTriggered: contactList.cancelSelection()
-            }
-            actions: [
-                Action {
-                    text: (contactList.selectedItems.count === contactList.count) ? i18n.tr("Unselect All") : i18n.tr("Select All")
-                    iconName: "select"
-                    onTriggered: {
-                        if (contactList.selectedItems.count === contactList.count) {
-                            contactList.clearSelection()
-                        } else {
-                            contactList.selectAll()
-                        }
-                    }
-                    visible: contactList.multipleSelection && !mainPage.isEmpty
-                },
-                Action {
-                    objectName: "share"
-                    text: i18n.tr("Share")
-                    iconName: mainPage.pickMode ? "tick" : "share"
-                    enabled: (contactList.selectedItems.count > 0)
-                    visible: contactList.isInSelectionMode
-                    onTriggered: {
-                        var contacts = []
-                        var items = contactList.selectedItems
-
-                        for (var i=0, iMax=items.count; i < iMax; i++) {
-                            contacts.push(items.get(i).model.contact)
-                        }
-                        contactExporter.start(contacts)
-                        contactList.endSelection()
-                    }
-                },
-                Action {
-                    objectName: "delete"
-                    text: i18n.tr("Delete")
-                    iconName: "delete"
-                    enabled: (contactList.selectedItems.count > 0)
-                    visible: contactList.isInSelectionMode && !mainPage.pickMode
-                    onTriggered: {
-                        var contacts = []
-                        var items = contactList.selectedItems
-
-                        for (var i=0, iMax=items.count; i < iMax; i++) {
-                            contacts.push(items.get(i).model.contact)
-                        }
-
-                        var dialog = PopupUtils.open(removeContactDialog, null)
-                        dialog.contacts = contacts
-                        contactList.endSelection()
-                    }
-                }
-            ]
-            PropertyChanges {
-                target: mainPage.head
-                backAction: selectionState.backAction
-                actions: selectionState.actions
-            }
-            PropertyChanges {
-                target: mainPage
-                bottomEdgeEnabled: false
-                title: " "
-            }
-        },
-        PageHeadState {
-            name: "newphone"
-            extend: "default"
-            head: mainPage.head
-            PropertyChanges {
-                target: contactList
-                showAddNewButton: true
-            }
-            PropertyChanges {
-                target: mainPage
-                bottomEdgeEnabled: false
-                title: i18n.tr("Add contact")
-            }
-            PropertyChanges {
-                target: contactList
-                detailToPick: -1
-            }
-        },
-        PageHeadState {
-            name: "newphoneSearching"
-            extend: "searching"
-            head: mainPage.head
-            PropertyChanges {
-                target: contactList
-                detailToPick: -1
-                showAddNewButton: true
-            }
-            PropertyChanges {
-                target: mainPage
-                bottomEdgeEnabled: false
-            }
-        }
-    ]
-    onActiveChanged: {
-        if (active && contactList.showAddNewButton) {
-            contactList.positionViewAtBeginning()
-        }
-    }
-
-    // We need to reset the page proprerties in case of the page was created pre-populated,
-    // with phonenumber or contact.
-    onBottomEdgeDismissed: {
-        //WORKAROUND: SKD changes the page header as soon as the page get created
-        // setting active false will avoid that
-        var newContact = mainPage.createEmptyContact("")
-        mainPage.setBottomEdgePage(Qt.resolvedUrl("../ContactEdit/ContactEditor.qml"),
-                                   {model: contactList.listModel,
-                                    contact: newContact,
-                                    active: false,
-                                    enabled: false,
-                                    initialFocusSection: "name"})
-    }
-
-    KeyboardRectangle {
-        id: keyboard
-    }
-
-    Column {
-        id: emptyStateScreen
-
-        anchors.centerIn: parent
-        height: childrenRect.height
-        width: childrenRect.width
-        spacing: units.gu(2)
-        visible: (!contactList.busy &&
-                  !contactList.favouritesIsSelected &&
-                  mainPage.isEmpty &&
-                  (mainPage.newPhoneToAdd === "") &&
-                  !(contactList.filterTerm && contactList.filterTerm !== ""))
-
-        Behavior on visible {
-            SequentialAnimation {
-                 PauseAnimation {
-                     duration: !emptyStateScreen.visible ? 500 : 0
-                 }
-                 PropertyAction {
-                     target: emptyStateScreen
-                     property: "visible"
-                 }
-            }
-        }
-
-        Icon {
-            id: emptyStateIcon
-            anchors.horizontalCenter: emptyStateLabel.horizontalCenter
-            height: units.gu(5)
-            width: units.gu(5)
-            opacity: 0.3
-            name: "contact"
-        }
-        Label {
-            id: emptyStateLabel
-            width: mainPage.width - units.gu(12)
-            height: paintedHeight
-            text: mainPage.pickMode ?
-                      i18n.tr("You have no contacts.") :
-                      i18n.tr("Create a new contact by swiping up from the bottom of the screen.")
-            color: "#5d5d5d"
-            fontSize: "x-large"
-            wrapMode: Text.WordWrap
-            horizontalAlignment: Text.AlignHCenter
-        }
-    }
-
-    Connections {
-        target: mainPage.contactModel
-        onContactsChanged: {
-            if (contactIndex) {
-                contactList.positionViewAtContact(mainPage.contactIndex)
-                mainPage.contactIndex = null
-            }
-        }
-    }
-
-    ContactExporter {
-        id: contactExporter
-
-        contactModel: contactList.listModel
-        exportToDisk: mainPage.pickMode
-        onDone: {
-            mainPage.pickMode = false
-            mainPage.state = "default"
-            application.returnVcard(outputFile)
-        }
-
-        onContactsFetched: {
-            // Share contacts to an application chosen by the user
-            if (!mainPage.pickMode) {
-                contactExporter.dismissBusyDialog()
-                pageStack.push(Qt.resolvedUrl("../ContactShare/ContactSharePage.qml"),
-                               { contactModel: contactExporter.contactModel, contacts: contacts })
-            }
-        }
-    }
-
-    Component {
-        id: removeContactDialog
-
-        RemoveContactsDialog {
-            id: removeContactsDialogMessage
-
-            onCanceled: {
-                PopupUtils.close(removeContactsDialogMessage)
-            }
-
-            onAccepted: {
-                removeContacts(contactList.listModel)
-                PopupUtils.close(removeContactsDialogMessage)
-            }
-        }
-    }
-
-    Component.onCompleted: {
-        application.elapsed()
-        if ((typeof(TEST_DATA) !== "undefined") && (TEST_DATA !== "")) {
-            contactList.listModel.importContacts("file://" + TEST_DATA)
-        }
-
-        mainPage.setBottomEdgePage(Qt.resolvedUrl("../ContactEdit/ContactEditor.qml"),
-                                   {model: contactList.listModel,
-                                    contact: mainPage.createEmptyContact(""),
-                                    active: false,
-                                    enabled: false,
-                                    initialFocusSection: "name"})
-
-        if (pageStack) {
-            pageStack.contactListPage = mainPage
-        }
-    }
-}

=== removed file 'src/imports/ContactList/VCardImportDialog.qml'
--- src/imports/ContactList/VCardImportDialog.qml	2014-07-20 20:23:20 +0000
+++ src/imports/ContactList/VCardImportDialog.qml	1970-01-01 00:00:00 +0000
@@ -1,94 +0,0 @@
-/*
- * Copyright (C) 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 QtContacts 5.0
-import Ubuntu.Components 1.1
-import Ubuntu.Components.Popups 1.0 as Popups
-
-Item {
-    id: root
-
-    property alias model: modelConnections.target
-    property var vcards: []
-    property var importedVcards: []
-    property var importErrors: []
-    property var dialog: null
-
-    signal finished()
-
-    function importVCards(model, vcards)
-    {
-        if (dialog || vcards.length === 0) {
-            return
-        }
-
-        root.model = model
-        root.vcards = vcards
-        dialog = Popups.PopupUtils.open(importDialogComponent, root)
-
-        for(var i=0, iMax=vcards.length; i < iMax; i++) {
-            var vcardUrl = vcards[i]
-            model.importContacts(vcardUrl)
-        }
-    }
-
-    Connections {
-        id: modelConnections
-
-        onImportCompleted: {
-            var imported = root.importedVcards
-            var importErrors = root.importErrors
-            imported.push(url)
-            if (error !== ContactModel.ImportNoError) {
-                root.importErrors.push(error)
-                console.error("Fail to import vcard:" + error)
-            }
-            root.importedVcards = imported
-            root.importErrors = importErrors
-        }
-    }
-
-    Component {
-        id: importDialogComponent
-
-        Popups.Dialog {
-            id: importDialog
-
-            title: i18n.tr("Import vCards")
-            text: root.importedVcards.length === 0 ?  i18n.tr("Importing...") : i18n.tr("%1 vCards imported").arg(root.importedVcards.length)
-
-            Button {
-                anchors {
-                    left: parent.left
-                    right: parent.right
-                    margins: units.gu(1)
-                }
-                text: i18n.tr("Close")
-                enabled: (root.importedVcards.length === root.vcards.length)
-                onClicked: {
-                    root.dialog = null
-                    Popups.PopupUtils.close(importDialog)
-                }
-            }
-
-            Component.onDestruction: root.destroy()
-        }
-    }
-}
-
-
-

=== removed directory 'src/imports/ContactShare'
=== removed file 'src/imports/ContactShare/CMakeLists.txt'
--- src/imports/ContactShare/CMakeLists.txt	2014-06-11 21:25:08 +0000
+++ src/imports/ContactShare/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
-set(CONTACT_SHARE_QMLS
-    ContactSharePage.qml
-)
-
-install(FILES ${CONTACT_SHARE_QMLS}
-    DESTINATION ${ADDRESS_BOOK_APP_DIR}/imports/ContactShare
-)
-
-# make the files visible on qtcreator
-add_custom_target(contact_share_QmlFiles ALL SOURCES ${CONTACT_SHARE_QMLS})

=== removed file 'src/imports/ContactShare/ContactSharePage.qml'
--- src/imports/ContactShare/ContactSharePage.qml	2014-10-09 17:39:12 +0000
+++ src/imports/ContactShare/ContactSharePage.qml	1970-01-01 00:00:00 +0000
@@ -1,56 +0,0 @@
-/*
- * 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 QtContacts 5.0
-import Ubuntu.Components 1.1
-import Ubuntu.Content 1.1 as ContentHub
-import "../Common"
-
-Page {
-    id: picker
-
-    property alias contactModel: exporter.contactModel
-    property var contacts
-    property var curTransfer
-
-    ContentHub.ContentPeerPicker {
-        visible: true
-        anchors.fill: parent
-        contentType: ContentHub.ContentType.Contacts
-        handler: ContentHub.ContentHandler.Share
-
-        onPeerSelected: {
-            exporter.activeTransfer = peer.request();
-            if (exporter.activeTransfer.state === ContentHub.ContentTransfer.InProgress) {
-                exporter.start(picker.contacts)
-            }
-        }
-
-        onCancelPressed: {
-            if (exporter.activeTransfer) {
-                exporter.activeTransfer.state = ContentHub.ContentTransfer.Aborted
-            }
-            pageStack.pop()
-        }
-    }
-
-    ContactExporter {
-        id: exporter
-
-        onDone: pageStack.pop()
-    }
-}

=== removed file 'src/imports/ContactView/ContactView.qml'
--- src/imports/ContactView/ContactView.qml	2014-09-17 18:36:48 +0000
+++ src/imports/ContactView/ContactView.qml	1970-01-01 00:00:00 +0000
@@ -1,123 +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 1.1
-import Ubuntu.Components.Popups 1.0 as Popups
-import Ubuntu.Contacts 0.1
-
-ContactPreviewPage {
-    id: root
-    objectName: "contactViewPage"
-
-    property alias model: contactFetch.model
-    // used by main page to open the contact view on app startup
-    property string contactId: ""
-    property string addPhoneToContact: ""
-
-    onActiveChanged: {
-        if (active) {
-            //WORKAROUND: to correct scroll back the page
-            flickable.returnToBounds()
-        }
-    }
-
-    // Page page if the contact get removed
-    onContactChanged: {
-        if (!contact) {
-            pageStack.pop()
-        }
-    }
-
-    extensions: ContactDetailSyncTargetView {
-        contact: root.contact
-        anchors {
-            left: parent.left
-            right: parent.right
-        }
-        height: implicitHeight
-    }
-
-    ActivityIndicator {
-        id: busyIndicator
-
-        parent: root
-
-        running: (root.contact === null) && contactFetch.running
-        visible: running
-        anchors.centerIn: parent
-    }
-
-    ContactFetchError {
-        id: fetchErrorDialog
-    }
-
-    ContactFetch {
-        id: contactFetch
-
-        onContactRemoved: {
-            pageStack.pop()
-        }
-
-        onContactNotFound: Popups.PopupUtils.open(fetchErrorDialog, pageStack)
-
-        onContactFetched: {
-            root.contact = contact
-            if (root.addPhoneToContact != "") {
-                var detailSourceTemplate = "import QtContacts 5.0; PhoneNumber{ number: \"" + root.addPhoneToContact.trim() + "\" }"
-                var newDetail = Qt.createQmlObject(detailSourceTemplate, root.contact)
-                if (newDetail) {
-                    root.contact.addDetail(newDetail)
-                    pageStack.push(Qt.resolvedUrl("../ContactEdit/ContactEditor.qml"),
-                                   { model: root.model,
-                                     contact: root.contact,
-                                     initialFocusSection: "phones",
-                                     newDetails: [newDetail]})
-                    root.addPhoneToContact = ""
-                }
-            }
-        }
-    }
-
-    head.actions: [
-        Action {
-            objectName: "share"
-            text: i18n.tr("Share")
-            iconName: "share"
-            onTriggered: {
-                pageStack.push(Qt.resolvedUrl("../ContactShare/ContactSharePage.qml"),
-                               { contactModel: root.model, contacts: [root.contact] })
-            }
-        },
-        Action {
-            objectName: "edit"
-            text: i18n.tr("Edit")
-            iconName: "edit"
-            onTriggered: {
-                pageStack.push(Qt.resolvedUrl("../ContactEdit/ContactEditor.qml"),
-                               { model: root.model, contact: root.contact})
-            }
-        }
-    ]
-
-    // This will load the contact information when the app was launched with
-    // the URI: addressbook:///contact?id=<id>
-    Component.onCompleted: {
-        if (contactId !== "") {
-            contactFetch.fetchContact(contactId)
-        }
-    }
-}

=== modified file 'src/imports/ContentHubProxy.qml'
--- src/imports/ContentHubProxy.qml	2014-10-10 13:12:18 +0000
+++ src/imports/ContentHubProxy.qml	2015-06-01 22:08:49 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2013 Canonical, Ltd.
+ * Copyright (C) 2012-2015 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

=== modified file 'src/imports/MainWindow.qml'
--- src/imports/MainWindow.qml	2015-02-19 06:58:37 +0000
+++ src/imports/MainWindow.qml	2015-06-01 22:08:49 +0000
@@ -18,7 +18,6 @@
 import Ubuntu.Components 1.0
 import Ubuntu.Components.Popups 1.0 as Popups
 
-
 MainView {
     id: mainWindow
     objectName: "addressBookAppMainWindow"
@@ -140,7 +139,7 @@
         application.elapsed()
         i18n.domain = "address-book-app"
         i18n.bindtextdomain("address-book-app", i18nDirectory)
-        mainStack.push(Qt.resolvedUrl("./ContactList/ContactListPage.qml"))
+        mainStack.push(Qt.resolvedUrl("ABContactListPage.qml"))
         mainWindow.applicationReady()
     }
 

=== added directory 'src/imports/Ubuntu/AddressBook'
=== added directory 'src/imports/Ubuntu/AddressBook/Base'
=== added file 'src/imports/Ubuntu/AddressBook/Base/CMakeLists.txt'
--- src/imports/Ubuntu/AddressBook/Base/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ src/imports/Ubuntu/AddressBook/Base/CMakeLists.txt	2015-06-01 22:08:49 +0000
@@ -0,0 +1,30 @@
+set(AB_CONTACT_COMMON_QMLS
+    ContactDetailBase.qml
+    ContactDetailItem.qml
+    ContactDetailGroupBase.qml
+    ContactDetailGroupWithTypeBase.qml
+    ContactExporter.qml
+    KeyboardRectangle.qml
+    RemoveContactsDialog.qml
+    qmldir
+)
+
+# make the files visible on qtcreator
+add_custom_target(contact_common_QmlFiles ALL SOURCES ${AB_CONTACT_COMMON_QMLS})
+
+if(INSTALL_COMPONENTS)
+    install(FILES ${AB_CONTACT_COMMON_QMLS} DESTINATION ${ADDRESS_BOOK_QMLPLUGIN_INSTALL_PREFIX}/Base)
+endif()
+
+#copy qml files to build dir to make it possible to run without install
+foreach(QML_FILE ${AB_CONTACT_COMMON_QMLS})
+  add_custom_command(TARGET contact_common_QmlFiles PRE_BUILD
+                     COMMAND ${CMAKE_COMMAND} -E
+                         copy ${CMAKE_CURRENT_SOURCE_DIR}/${QML_FILE} ${CMAKE_CURRENT_BINARY_DIR}/)
+endforeach()
+
+if (NOT ${CMAKE_CURRENT_BINARY_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR})
+    add_dependencies(copyqmlfiles contact_common_QmlFiles)
+endif()
+
+

=== added file 'src/imports/Ubuntu/AddressBook/Base/ContactDetailBase.qml'
--- src/imports/Ubuntu/AddressBook/Base/ContactDetailBase.qml	1970-01-01 00:00:00 +0000
+++ src/imports/Ubuntu/AddressBook/Base/ContactDetailBase.qml	2015-06-01 22:08:49 +0000
@@ -0,0 +1,112 @@
+/*
+ * Copyright (C) 2012-2015 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 QtContacts 5.0 as QtContacts
+import Ubuntu.Components.ListItems 1.0 as ListItem
+
+ListItem.Empty {
+    id: root
+    objectName: detail ? "base_" + detailToString(detail.type, -1) + "_" + index : ""
+
+    property QtObject contact: null
+    property QtObject detail: null
+    property variant fields: null
+    signal actionTrigerred(string action)
+
+    // help to test used to retrieve the correct element
+    property int index: -1
+
+    function detailToString(detail, field)
+    {
+        // name
+        var nameMap = {}
+        nameMap[QtContacts.Name.FirstName] = "firstName"
+        nameMap[QtContacts.Name.LastName] = "lastName"
+
+        // phone
+        var phoneMap = {}
+        phoneMap[QtContacts.PhoneNumber.Number] = "phoneNumber"
+
+        // email
+        var emailMap = {}
+        emailMap[QtContacts.EmailAddress.EmailAddress] = "emailAddress"
+
+        // address
+        var addressMap = {}
+        addressMap[QtContacts.Address.Street] = "streetAddress"
+        addressMap[QtContacts.Address.Locality] = "localityAddress"
+        addressMap[QtContacts.Address.Region] = "regionAddress"
+        addressMap[QtContacts.Address.Postcode] = "postcodeAddress"
+        addressMap[QtContacts.Address.Country] = "countryAddress"
+        addressMap[QtContacts.Address.PostOfficeBox] = "postOfficeBoxAddress"
+
+        // im
+        var imMap = {}
+        imMap[QtContacts.OnlineAccount.AccountUri] = "imUri"
+        imMap[QtContacts.OnlineAccount.ServiceProvider] = "imProvider"
+        imMap[QtContacts.OnlineAccount.Protocol] = "imProtocol"
+        imMap[QtContacts.OnlineAccount.Capabilities] = "imCaps"
+
+        // organization
+        var organizationMap = {}
+        organizationMap[QtContacts.Organization.Name] = 'orgName'
+        organizationMap[QtContacts.Organization.Role] = 'orgRole'
+        organizationMap[QtContacts.Organization.Title] = 'orgTitle'
+
+        // SyncTarget
+        var syncTargetMap = {}
+        syncTargetMap[QtContacts.SyncTarget.SyncTarget] = "syncTarget"
+
+        // all
+        var detailMap = {}
+        detailMap[QtContacts.ContactDetail.Name] = nameMap
+        detailMap[QtContacts.ContactDetail.PhoneNumber] = phoneMap
+        detailMap[QtContacts.ContactDetail.Email] = emailMap
+        detailMap[QtContacts.ContactDetail.Address] = addressMap
+        detailMap[QtContacts.ContactDetail.OnlineAccount] = imMap
+        detailMap[QtContacts.ContactDetail.Organization] = organizationMap
+        detailMap[QtContacts.ContactDetail.SyncTarget] = syncTargetMap
+
+        // detail name
+        var detailNameMap = {}
+        detailNameMap[QtContacts.ContactDetail.Name] = "name"
+        detailNameMap[QtContacts.ContactDetail.PhoneNumber] = "phoneNumber"
+        detailNameMap[QtContacts.ContactDetail.Email] = "email"
+        detailNameMap[QtContacts.ContactDetail.Address] = "address"
+        detailNameMap[QtContacts.ContactDetail.OnlineAccount] = "onlineAccount"
+        detailNameMap[QtContacts.ContactDetail.SyncTarget] = "syncTarget"
+
+        if ((detail in detailMap) && (field in detailMap[detail])) {
+            return detailMap[detail][field]
+        } else if ((detail in detailNameMap) && (field == -1)){
+            return detailNameMap[detail]
+        } else {
+            console.debug("Unknown : [" + detail + "] [" + field + "]")
+            return "unknown"
+        }
+    }
+
+    highlightWhenPressed: false
+    showDivider: false
+
+    Rectangle {
+        anchors.fill: parent
+        opacity: 0.1
+        visible: root.selected
+        z: 100
+    }
+}

=== added file 'src/imports/Ubuntu/AddressBook/Base/ContactDetailGroupBase.qml'
--- src/imports/Ubuntu/AddressBook/Base/ContactDetailGroupBase.qml	1970-01-01 00:00:00 +0000
+++ src/imports/Ubuntu/AddressBook/Base/ContactDetailGroupBase.qml	2015-06-01 22:08:49 +0000
@@ -0,0 +1,159 @@
+/*
+ * Copyright (C) 2012-2015 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
+
+FocusScope {
+    id: root
+
+    property var details: []
+    readonly property alias detailDelegates: contents.children
+    readonly property int detailsCount: detailsModel.count
+
+    property variant inputFields: []
+    property QtObject contact: null
+    property int detailType: 0
+    property variant fields
+    property string title: null
+    property alias headerDelegate: headerItem.sourceComponent
+    property Component detailDelegate
+    property int minimumHeight: 0
+    property bool loaded: false
+    property bool showEmpty: true
+
+    signal newFieldAdded(var index)
+
+    function reloadDetails(clearFields)
+    {
+        if (clearFields) {
+            root.inputFields = []
+        }
+
+        if (contact && detailType) {
+            root.details = contact.details(detailType)
+        } else {
+            root.details = []
+        }
+    }
+
+    function filterDetails(details) {
+        var result = []
+        for(var d in details) {
+            var isEmpty = true
+            for(var f in root.fields) {
+                var fieldValue = details[d].value(root.fields[f])
+                if (fieldValue && (String(fieldValue) !== "")) {
+                    isEmpty = false
+                    break;
+                }
+            }
+            if (!isEmpty) {
+                result.push(details[d])
+            }
+        }
+        return result
+    }
+
+    onContactChanged: reloadDetails(true)
+    onDetailTypeChanged: reloadDetails(true)
+
+    Connections {
+        target: root.contact
+        onContactChanged: reloadDetails(false)
+    }
+
+    implicitHeight: detailsCount > 0 ? contents.implicitHeight : minimumHeight
+    visible: implicitHeight > 0
+
+    // This model is used to avoid rebuild the repeater every time that the details change
+    // With this model the changed info on the fields will remain after add a new field
+    ListModel {
+        id: detailsModel
+
+        property var values: root.showEmpty && root.details ? root.details : filterDetails(root.details)
+
+        onValuesChanged: {
+            if (!values) {
+                root.inputFields = []
+                clear()
+                return
+            }
+
+            while (count > values.length) {
+                remove(count - 1)
+            }
+
+            var modelCount = count
+            for(var i=0; i < values.length; i++) {
+                if (modelCount <= i) {
+                    append({"detail": values[i]})
+                } else if (get(i) != values[i]) {
+                    set(i, {"detail": values[i]})
+                }
+            }
+        }
+    }
+
+    Column {
+        id: contents
+
+        anchors {
+            left: parent.left
+            right: parent.right
+        }
+
+        Loader {
+            id: headerItem
+        }
+
+        Repeater {
+            id: detailFields
+
+            model: detailsModel
+
+            Loader {
+                id: detailItem
+
+                sourceComponent: root.detailDelegate
+                Binding {
+                    target: detailItem.item
+                    property: "detail"
+                    value: model.detail
+                }
+
+                Binding {
+                    target: detailItem.item
+                    property: "index"
+                    value: index
+                }
+
+                onStatusChanged: {
+                    if (status === Loader.Ready) {
+                        var newFields = root.inputFields
+                        newFields.push(detailItem.item)
+                        root.newFieldAdded(detailItem.item)
+                        root.inputFields = newFields
+                        if (root.loaded) {
+                            item.forceActiveFocus()
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    Component.onCompleted: root.loaded = true
+}

=== added file 'src/imports/Ubuntu/AddressBook/Base/ContactDetailGroupWithTypeBase.qml'
--- src/imports/Ubuntu/AddressBook/Base/ContactDetailGroupWithTypeBase.qml	1970-01-01 00:00:00 +0000
+++ src/imports/Ubuntu/AddressBook/Base/ContactDetailGroupWithTypeBase.qml	2015-06-01 22:08:49 +0000
@@ -0,0 +1,132 @@
+/*
+ * Copyright (C) 2012-2015 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 QtContacts 5.0 as QtContacts
+
+ContactDetailGroupBase {
+    id: root
+
+    property string defaultIcon : "artwork:/protocol-other.png"
+    property ListModel typeModel
+    property bool typeModelReady: false
+
+    function getType(detail) {
+        if (typeModel) {
+            return typeModel.get(typeModel.getTypeIndex(detail))
+        } else {
+            return ""
+        }
+    }
+
+    function updateDetail(detail, index) {
+        if (typeModel) {
+            return typeModel.updateDetail(detail, index)
+        }
+        return false
+    }
+
+    typeModel: ListModel {
+        signal loaded()
+
+        function getTypeIndex(detail) {
+            var context = -1;
+            for (var i = 0; i < detail.contexts.length; i++) {
+                context = detail.contexts[i];
+                break;
+            }
+            var subType = -1;
+            // not all details have subTypes
+            if (detail.subTypes) {
+                for (var i = 0; i < detail.subTypes.length; i++) {
+                    subType = detail.subTypes[i];
+                    break;
+                }
+            }
+            if (context === QtContacts.ContactDetail.ContextHome) {
+                return 0
+            } else if (context === QtContacts.ContactDetail.ContextWork) {
+                return 1
+            } else if (context === QtContacts.ContactDetail.ContextOther) {
+                return 2
+            } else {
+                return 0 // default value is "Home"
+            }
+        }
+
+        function isNotAModelValue(value) {
+            for(var i=0; i < count; i++) {
+                if (value === get(i).value) {
+                    return false
+                }
+            }
+            return true
+        }
+
+        function compareList(listA, listB) {
+            if (!listA && !listB) {
+                return true
+            }
+
+            if (!listA || !listB) {
+                return false
+            }
+
+            if (listA.length != listB.length) {
+                return false
+            }
+            for(var i=0; i < listA.length; i++) {
+                if (listA[i] != listB[i]) {
+                    return false
+                }
+            }
+            return true
+        }
+
+        function updateDetail(detail, index) {
+            var modelData = get(index)
+            if (!modelData) {
+                return false
+            }
+
+            var newContext = detail.contexts.filter(isNotAModelValue)
+            newContext.push(modelData.value)
+            if (!compareList(newContext, detail.contexts)) {
+                detail.contexts = newContext
+                return true
+            }
+            return false
+        }
+
+        Component.onCompleted: {
+            append({"value": QtContacts.ContactDetail.ContextHome,
+                    "label": i18n.dtr("address-book-app", "Home"),
+                    "icon": null})
+            append({"value": QtContacts.ContactDetail.ContextWork,
+                    "label": i18n.dtr("address-book-app", "Work"),
+                    "icon": null})
+            append({"value": QtContacts.ContactDetail.ContextOther,
+                    "label": i18n.dtr("address-book-app", "Other"),
+                    "icon": null})
+            loaded()
+        }
+    }
+    onTypeModelChanged: root.typeModelReady = false
+    Connections {
+        target: root.typeModel
+        onLoaded: root.typeModelReady = true
+    }
+}

=== added file 'src/imports/Ubuntu/AddressBook/Base/ContactDetailItem.qml'
--- src/imports/Ubuntu/AddressBook/Base/ContactDetailItem.qml	1970-01-01 00:00:00 +0000
+++ src/imports/Ubuntu/AddressBook/Base/ContactDetailItem.qml	2015-06-01 22:08:49 +0000
@@ -0,0 +1,62 @@
+/*
+ * Copyright (C) 2012-2015 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 1.1
+import Ubuntu.Contacts 0.1
+
+ContactDetailBase {
+    id: root
+
+    readonly property alias fieldDelegates: fieldsColumn.children
+    property Component fieldDelegate: null
+    property alias spacing: fieldsColumn.spacing
+
+    implicitHeight: fieldsColumn.height
+    Column {
+        id: fieldsColumn
+
+        anchors {
+            left: parent.left
+            right: parent.right
+        }
+        spacing: units.gu(2)
+
+        height: childrenRect.height
+        Repeater {
+            id: fieldRepeater
+
+            model: root.fields
+            Loader {
+                id: field
+
+                sourceComponent: fieldDelegate
+                Binding {
+                    target: item
+                    property: "field"
+                    value: modelData
+                }
+
+                Binding {
+                    target: item
+                    property: "detail"
+                    value: root.detail
+                }
+            }
+        }
+    }
+}

=== added file 'src/imports/Ubuntu/AddressBook/Base/ContactExporter.qml'
--- src/imports/Ubuntu/AddressBook/Base/ContactExporter.qml	1970-01-01 00:00:00 +0000
+++ src/imports/Ubuntu/AddressBook/Base/ContactExporter.qml	2015-06-01 22:08:49 +0000
@@ -0,0 +1,167 @@
+/*
+ * Copyright (C) 2012-2015 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 QtContacts 5.0
+
+import Ubuntu.Components 1.1
+import Ubuntu.Content 1.1
+import Ubuntu.Components.Popups 1.0
+
+Item {
+    id: root
+
+    property var contactModel
+    property bool exportToDisk: true
+    property var activeTransfer: null
+
+    signal contactsFetched(var contacts)
+    signal done(string outputFile)
+
+    function start(contacts) {
+        if (!contactModel) {
+            console.error("No contact model defined")
+            return
+        }
+
+        // skip if a query is running
+        if (priv.currentQueryId != -1) {
+            console.error("Export already running")
+            return
+        }
+
+        if (!priv.busyDialog) {
+            priv.busyDialog = PopupUtils.open(busyDialogComponent, root)
+        }
+
+        var ids = []
+        for (var i=0; i < contacts.length; i++) {
+            ids.push(contacts[i].contactId)
+        }
+        if (ids.length == 0) {
+            console.debug("The contact list is empty")
+            done("")
+        } else {
+            priv.currentQueryId = contactModel.fetchContacts(ids)
+        }
+    }
+
+    function dismissBusyDialog()
+    {
+        if (priv.busyDialog) {
+            PopupUtils.close(priv.busyDialog)
+            priv.busyDialog = null
+        }
+    }
+
+    Item {
+        id: priv
+
+        property var busyDialog: null
+        property int currentQueryId: -1
+        readonly property var detailsBlackList: [ ContactDetail.Favorite, ContactDetail.Tag ]
+
+        function filterContactDetails(contact)
+        {
+            var newContact = Qt.createQmlObject("import QtContacts 5.0;  Contact { }", root)
+            var allDetails = contact.contactDetails
+            for(var i=0; i < allDetails.length; i++) {
+                var det = allDetails[i]
+                if (detailsBlackList.indexOf(det.type) == -1) {
+                    newContact.addDetail(det)
+                }
+            }
+            return newContact
+        }
+
+        function generateOutputFileName(contacts)
+        {
+            if (contacts.length === 1) {
+                return "file:///tmp/%1.vcf".arg(contacts[0].displayLabel.label.replace(/\s/g, ''))
+            } else {
+                return "file:///tmp/ubuntu_contacts.vcf";
+            }
+        }
+
+        Connections {
+            target: root.contactModel
+
+            onExportCompleted: {
+                // send contacts back to source app (pick mode)
+                if (error === ContactModel.ExportNoError) {
+                    var obj = Qt.createQmlObject("import Ubuntu.Content 1.1;  ContentItem { url: '" + url + "' }", root)
+                    if (root.activeTransfer) {
+                        root.activeTransfer.items = [obj]
+                        root.activeTransfer.state = ContentTransfer.Charged
+                    } else {
+                        console.error("No active transfer")
+                    }
+                } else {
+                    root.activeTransfer = ContentHub.ContentTransfer.Aborted
+                    console.error("Fail to export contacts:" + error)
+                }
+                root.dismissBusyDialog()
+                root.done(url)
+            }
+
+            onContactsFetched: {
+                // currentQueryId == -2 is used during a fetch using "memory" manager
+                if ((priv.currentQueryId == -2) || (requestId == priv.currentQueryId)) {
+                    if (root.exportToDisk) {
+                        var contacts = []
+                        // remove unnecessary info from contacts
+                        for(var i=0; i < fetchedContacts.length; i++) {
+                            contacts.push(priv.filterContactDetails(fetchedContacts[i]))
+                        }
+                        // update outputFile with a friendly name
+                        var outputFile = priv.generateOutputFileName(contacts)
+                        root.contactModel.exportContacts(outputFile,
+                                                         [],
+                                                         contacts)
+                    }
+                    root.contactsFetched(fetchedContacts)
+                    priv.currentQueryId = -1
+                }
+            }
+        }
+
+        Connections {
+            target: root.activeTransfer
+
+            onStateChanged: {
+                if (root.activeTransfer.state === ContentTransfer.Aborted) {
+                    root.activeTransfer = null
+                    root.done("")
+                }
+            }
+        }
+    }
+
+    Component {
+        id: busyDialogComponent
+
+        Dialog {
+            title: i18n.dtr("address-book-app", "Exporting contacts...")
+
+            ActivityIndicator {
+                id: activity
+
+                anchors.horizontalCenter: parent.horizontalCenter
+                running: true
+            }
+        }
+    }
+}

=== added file 'src/imports/Ubuntu/AddressBook/Base/KeyboardRectangle.qml'
--- src/imports/Ubuntu/AddressBook/Base/KeyboardRectangle.qml	1970-01-01 00:00:00 +0000
+++ src/imports/Ubuntu/AddressBook/Base/KeyboardRectangle.qml	2015-06-01 22:08:49 +0000
@@ -0,0 +1,70 @@
+/*
+ * Copyright (C) 2012-2015 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
+
+Item {
+    id: keyboardRect
+    anchors.left: parent.left
+    anchors.right: parent.right
+    anchors.bottom: parent.bottom
+    height: Qt.inputMethod.visible ? Qt.inputMethod.keyboardRectangle.height : 0
+
+    states: [
+        State {
+            name: "hidden"
+            when: keyboardRect.height == 0
+        },
+        State {
+            name: "shown"
+            when: keyboardRect.height == Qt.inputMethod.keyboardRectangle.height
+        }
+    ]
+
+    function recursiveFindFocusedItem(parent) {
+        if (parent.activeFocus) {
+            return parent;
+        }
+
+        for (var i in parent.children) {
+            var child = parent.children[i];
+            if (child.activeFocus) {
+                return child;
+            }
+
+            var item = recursiveFindFocusedItem(child);
+
+            if (item != null) {
+                return item;
+            }
+        }
+
+        return null;
+    }
+
+    Connections {
+        target: Qt.inputMethod
+
+        onVisibleChanged: {
+            if (!Qt.inputMethod.visible) {
+                var focusedItem = recursiveFindFocusedItem(keyboardRect.parent);
+                if (focusedItem != null) {
+                    focusedItem.focus = false;
+                }
+            }
+        }
+    }
+}

=== added file 'src/imports/Ubuntu/AddressBook/Base/RemoveContactsDialog.qml'
--- src/imports/Ubuntu/AddressBook/Base/RemoveContactsDialog.qml	1970-01-01 00:00:00 +0000
+++ src/imports/Ubuntu/AddressBook/Base/RemoveContactsDialog.qml	2015-06-01 22:08:49 +0000
@@ -0,0 +1,78 @@
+/*
+ * Copyright (C) 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 1.1
+import Ubuntu.Components.Popups 1.0
+
+Dialog {
+    objectName: "removeContactsDialog"
+
+    property var contacts: []
+
+    signal canceled()
+    signal accepted()
+
+    function removeContacts(model)
+    {
+        var ids = []
+        for(var i=0, iMax=contacts.length; i < iMax; i++) {
+            ids.push(contacts[i].contactId)
+        }
+        model.removeContacts(ids)
+    }
+
+    title: {
+        if (contacts.length == 0) {
+            return i18n.dtr("address-book-app", "No contact selected.")
+        } else if (contacts.length == 1)  {
+            return contacts[0].displayLabel.label
+        } else {
+            return i18n.dtr("address-book-app", "Multiple contacts")
+        }
+    }
+    text: {
+        if (contacts.length == 1)  {
+            return i18n.dtr("address-book-app", "Are you sure that you want to remove this contact?")
+        } else {
+            return i18n.dtr("address-book-app", "Are you sure that you want to remove all selected contacts?")
+        }
+    }
+
+    Button {
+        objectName: "removeContactsDialog.Yes"
+        anchors {
+            left: parent.left
+            right: parent.right
+            margins: units.gu(1)
+        }
+        text: i18n.dtr("address-book-app", "Yes")
+        color: UbuntuColors.green
+        onClicked: accepted()
+    }
+
+    Button {
+        objectName: "removeContactsDialog.No"
+        anchors {
+            left: parent.left
+            right: parent.right
+            margins: units.gu(1)
+        }
+        text: i18n.dtr("address-book-app", "No")
+        color: UbuntuColors.red
+        onClicked: canceled()
+    }
+}

=== added file 'src/imports/Ubuntu/AddressBook/Base/qmldir'
--- src/imports/Ubuntu/AddressBook/Base/qmldir	1970-01-01 00:00:00 +0000
+++ src/imports/Ubuntu/AddressBook/Base/qmldir	2015-06-01 22:08:49 +0000
@@ -0,0 +1,9 @@
+module Ubuntu.AddressBook.Base
+
+ContactDetailBase 0.1 ContactDetailBase.qml
+ContactDetailItem 0.1 ContactDetailItem.qml
+ContactDetailGroupBase 0.1 ContactDetailGroupBase.qml
+ContactDetailGroupWithTypeBase 0.1 ContactDetailGroupWithTypeBase.qml
+ContactExporter 0.1 ContactExporter.qml
+RemoveContactsDialog 0.1 RemoveContactsDialog.qml
+KeyboardRectangle 0.1 KeyboardRectangle.qml

=== added file 'src/imports/Ubuntu/AddressBook/CMakeLists.txt'
--- src/imports/Ubuntu/AddressBook/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ src/imports/Ubuntu/AddressBook/CMakeLists.txt	2015-06-01 22:08:49 +0000
@@ -0,0 +1,4 @@
+add_subdirectory(Base)
+add_subdirectory(ContactEditor)
+add_subdirectory(ContactView)
+add_subdirectory(ContactShare)

=== renamed directory 'src/imports/ContactEdit' => 'src/imports/Ubuntu/AddressBook/ContactEditor'
=== modified file 'src/imports/Ubuntu/AddressBook/ContactEditor/CMakeLists.txt'
--- src/imports/ContactEdit/CMakeLists.txt	2014-08-20 18:27:37 +0000
+++ src/imports/Ubuntu/AddressBook/ContactEditor/CMakeLists.txt	2015-06-01 22:08:49 +0000
@@ -1,4 +1,4 @@
-set(CONTACT_EDIT_QMLS
+set(AB_CONTACT_EDITOR_QMLS
     AvatarImport.qml
     ComboButtonAddField.qml
     ContactDetailAddressesEditor.qml
@@ -11,14 +11,27 @@
     ContactDetailPhoneNumbersEditor.qml
     ContactDetailSyncTargetEditor.qml
     ContactDetailWithTypeEditor.qml
-    ContactEditor.qml
+    ContactEditorPage.qml
     TextInputDetail.qml
     ValueSelector.qml
-)
-
-install(FILES ${CONTACT_EDIT_QMLS}
-    DESTINATION ${ADDRESS_BOOK_APP_DIR}/imports/ContactEdit
+    qmldir
 )
 
 # make the files visible on qtcreator
-add_custom_target(contact_edit_QmlFiles ALL SOURCES ${CONTACT_EDIT_QMLS})
+add_custom_target(contact_editor_QmlFiles ALL SOURCES ${AB_CONTACT_EDITOR_QMLS})
+
+if(INSTALL_COMPONENTS)
+    install(FILES ${AB_CONTACT_EDITOR_QMLS} DESTINATION ${ADDRESS_BOOK_QMLPLUGIN_INSTALL_PREFIX}/ContactEditor)
+endif()
+
+#copy qml files to build dir to make it possible to run without install
+foreach(QML_FILE ${AB_CONTACT_EDITOR_QMLS})
+  add_custom_command(TARGET contact_editor_QmlFiles PRE_BUILD
+                     COMMAND ${CMAKE_COMMAND} -E
+                         copy ${CMAKE_CURRENT_SOURCE_DIR}/${QML_FILE} ${CMAKE_CURRENT_BINARY_DIR}/)
+endforeach()
+
+if (NOT ${CMAKE_CURRENT_BINARY_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR})
+    add_dependencies(copyqmlfiles contact_editor_QmlFiles)
+endif()
+

=== modified file 'src/imports/Ubuntu/AddressBook/ContactEditor/ComboButtonAddField.qml'
--- src/imports/ContactEdit/ComboButtonAddField.qml	2014-09-03 19:21:20 +0000
+++ src/imports/Ubuntu/AddressBook/ContactEditor/ComboButtonAddField.qml	2015-06-01 22:08:49 +0000
@@ -44,15 +44,15 @@
         switch (value)
         {
         case ContactDetail.PhoneNumber:
-            return i18n.tr("Phone")
+            return i18n.dtr("address-book-app", "Phone")
         case ContactDetail.Email:
-            return i18n.tr("Email")
+            return i18n.dtr("address-book-app", "Email")
         case ContactDetail.Address:
-            return i18n.tr("Address")
+            return i18n.dtr("address-book-app", "Address")
         case ContactDetail.OnlineAccount:
-            return i18n.tr("Social")
+            return i18n.dtr("address-book-app", "Social")
         case ContactDetail.Organization:
-            return i18n.tr("Professional Details")
+            return i18n.dtr("address-book-app", "Professional Details")
         default:
             console.error("Invalid contact detail enum value:" + value)
             return ""

=== modified file 'src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailAddressesEditor.qml'
--- src/imports/ContactEdit/ContactDetailAddressesEditor.qml	2014-08-13 20:52:57 +0000
+++ src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailAddressesEditor.qml	2015-06-01 22:08:49 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2013 Canonical, Ltd.
+ * Copyright (C) 2012-2015 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
@@ -20,7 +20,7 @@
 import Ubuntu.Contacts 0.1
 
 ContactDetailGroupWithTypeEditor {
-    title: i18n.tr("Address")
+    title: i18n.dtr("address-book-app", "Address")
     detailQmlTypeName: "Address"
     detailType: ContactDetail.Address
     fields: [ Address.Street,
@@ -28,10 +28,10 @@
         Address.Region,
         Address.Postcode,
         Address.Country ]
-    placeholderTexts: [ i18n.tr("Street"),
-                        i18n.tr("Locality"),
-                        i18n.tr("Region"),
-                        i18n.tr("Post code"),
-                        i18n.tr("Country") ]
+    placeholderTexts: [ i18n.dtr("address-book-app", "Street"),
+                        i18n.dtr("address-book-app", "Locality"),
+                        i18n.dtr("address-book-app", "Region"),
+                        i18n.dtr("address-book-app", "Post code"),
+                        i18n.dtr("address-book-app", "Country") ]
     inputMethodHints: Qt.ImhNoPredictiveText
 }

=== modified file 'src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailAvatarEditor.qml'
--- src/imports/ContactEdit/ContactDetailAvatarEditor.qml	2015-02-25 15:44:06 +0000
+++ src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailAvatarEditor.qml	2015-06-01 22:08:49 +0000
@@ -18,7 +18,9 @@
 import QtContacts 5.0
 
 import Ubuntu.Components 1.1
+
 import Ubuntu.Contacts 0.1
+import Ubuntu.AddressBook.Base 0.1
 
 ContactDetailBase {
     id: root
@@ -83,6 +85,10 @@
             height: units.gu(3)
             width: units.gu(3)
             visible: source == defaultAvatar
+            sourceSize {
+                width: units.gu(3)
+                height: units.gu(3)
+            }
 
             // 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
@@ -108,7 +114,7 @@
             // be updated
             avatarImage.source = ""
             // Update with the new value
-            avatarImage.source = application.copyImage(root.contact, avatarUrl);
+            avatarImage.source = Contacts.copyImage(root.contact, avatarUrl);
         }
     }
 

=== modified file 'src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailEmailsEditor.qml'
--- src/imports/ContactEdit/ContactDetailEmailsEditor.qml	2014-08-13 20:52:57 +0000
+++ src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailEmailsEditor.qml	2015-06-01 22:08:49 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2013 Canonical, Ltd.
+ * Copyright (C) 2012-2015 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
@@ -21,10 +21,10 @@
 
 
 ContactDetailGroupWithTypeEditor {
-    title: i18n.tr("Email")
+    title: i18n.dtr("address-book-app", "Email")
     detailQmlTypeName: "EmailAddress"
     detailType: ContactDetail.Email
     fields: [ 0 ]
-    placeholderTexts: [ i18n.tr("Enter an email address") ]
+    placeholderTexts: [ i18n.dtr("address-book-app", "Enter an email address") ]
     inputMethodHints: Qt.ImhEmailCharactersOnly
 }

=== modified file 'src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailGroupWithTypeEditor.qml'
--- src/imports/ContactEdit/ContactDetailGroupWithTypeEditor.qml	2014-08-13 20:52:57 +0000
+++ src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailGroupWithTypeEditor.qml	2015-06-01 22:08:49 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2013 Canonical, Ltd.
+ * Copyright (C) 2012-2015 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
@@ -21,6 +21,8 @@
 import Ubuntu.Components.ListItems 1.0
 import Ubuntu.Contacts 0.1
 
+import Ubuntu.AddressBook.Base 0.1
+
 ContactDetailGroupWithTypeBase {
     id: root
 

=== modified file 'src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailNameEditor.qml'
--- src/imports/ContactEdit/ContactDetailNameEditor.qml	2014-08-13 20:52:57 +0000
+++ src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailNameEditor.qml	2015-06-01 22:08:49 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2013 Canonical, Ltd.
+ * Copyright (C) 2012-2015 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
@@ -19,7 +19,7 @@
 
 import Ubuntu.Components 1.1
 
-import "../Common"
+import Ubuntu.AddressBook.Base 0.1
 
 ContactDetailItem {
     id: root
@@ -81,7 +81,8 @@
         x: units.gu(2)
         detail: root.detail
         height: units.gu(4)
-        placeholderText: field == Name.FirstName ? i18n.tr("First name") : i18n.tr("Last name")
+        placeholderText: field == Name.FirstName ? i18n.dtr("address-book-app", "First name") :
+                                                   i18n.dtr("address-book-app", "Last name")
         inputMethodHints: Qt.ImhNoPredictiveText
         onTextChanged: checkIsEmpty()
         onFieldChanged: checkIsEmpty()

=== modified file 'src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailOnlineAccountsEditor.qml'
--- src/imports/ContactEdit/ContactDetailOnlineAccountsEditor.qml	2014-08-13 20:52:57 +0000
+++ src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailOnlineAccountsEditor.qml	2015-06-01 22:08:49 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2013 Canonical, Ltd.
+ * Copyright (C) 2012-2015 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
@@ -20,11 +20,11 @@
 import Ubuntu.Contacts 0.1
 
 ContactDetailGroupWithTypeEditor {
-    title: i18n.tr("IM")
+    title: i18n.dtr("address-book-app", "IM")
     detailType: ContactDetail.OnlineAccount
     detailQmlTypeName: "OnlineAccount"
     fields: [ OnlineAccount.AccountUri ]
-    placeholderTexts: [ i18n.tr("Enter a social alias") ]
+    placeholderTexts: [ i18n.dtr("address-book-app", "Enter a social alias") ]
     typeModel: ContactDetailOnlineAccountTypeModel { }
     inputMethodHints: Qt.ImhEmailCharactersOnly
 }

=== modified file 'src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailOrganizationsEditor.qml'
--- src/imports/ContactEdit/ContactDetailOrganizationsEditor.qml	2014-08-14 20:20:42 +0000
+++ src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailOrganizationsEditor.qml	2015-06-01 22:08:49 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2013 Canonical, Ltd.
+ * Copyright (C) 2012-2015 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
@@ -18,16 +18,16 @@
 import QtContacts 5.0
 
 ContactDetailGroupWithTypeEditor {
-    title: i18n.tr("Professional Details")
+    title: i18n.dtr("address-book-app", "Professional Details")
     typeModel: null
     detailQmlTypeName: "Organization"
     detailType: ContactDetail.Organization
     fields: [ Organization.Name,
               Organization.Role,
               Organization.Title ]
-    placeholderTexts: [ i18n.tr("Organization"),
-                        i18n.tr("Role"),
-                        i18n.tr("Title")
+    placeholderTexts: [ i18n.dtr("address-book-app", "Organization"),
+                        i18n.dtr("address-book-app", "Role"),
+                        i18n.dtr("address-book-app", "Title")
                       ]
     inputMethodHints: Qt.ImhNoPredictiveText
 }

=== modified file 'src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailPhoneNumbersEditor.qml'
--- src/imports/ContactEdit/ContactDetailPhoneNumbersEditor.qml	2014-08-13 20:52:57 +0000
+++ src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailPhoneNumbersEditor.qml	2015-06-01 22:08:49 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2013 Canonical, Ltd.
+ * Copyright (C) 2012-2015 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
@@ -20,11 +20,11 @@
 import Ubuntu.Contacts 0.1
 
 ContactDetailGroupWithTypeEditor {
-    title: i18n.tr("Phone")
+    title: i18n.dtr("address-book-app", "Phone")
     detailType: ContactDetail.PhoneNumber
     detailQmlTypeName: "PhoneNumber"
     fields: [ PhoneNumber.Number ]
-    placeholderTexts: [ i18n.tr("Enter a number") ]
+    placeholderTexts: [ i18n.dtr("address-book-app", "Enter a number") ]
     typeModel: ContactDetailPhoneNumberTypeModel { }
     inputMethodHints: Qt.ImhDialableCharactersOnly
     usePhoneFormat: true

=== modified file 'src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailSyncTargetEditor.qml'
--- src/imports/ContactEdit/ContactDetailSyncTargetEditor.qml	2014-09-03 19:21:20 +0000
+++ src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailSyncTargetEditor.qml	2015-06-01 22:08:49 +0000
@@ -1,5 +1,5 @@
  /*
- * Copyright (C) 2012-2013 Canonical, Ltd.
+ * Copyright (C) 2012-2015 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
@@ -19,7 +19,9 @@
 
 import Ubuntu.Components 1.1
 import Ubuntu.Components.ListItems 1.0
+
 import Ubuntu.Contacts 0.1
+import Ubuntu.AddressBook.Base 0.1
 
 ContactDetailBase {
     id: root
@@ -73,7 +75,7 @@
     Label {
         id: label
 
-        text: i18n.tr("Addressbook")
+        text: i18n.dtr("address-book-app", "Addressbook")
         anchors {
             left: parent.left
             top: parent.top

=== modified file 'src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailWithTypeEditor.qml'
--- src/imports/ContactEdit/ContactDetailWithTypeEditor.qml	2014-08-13 20:52:57 +0000
+++ src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailWithTypeEditor.qml	2015-06-01 22:08:49 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2013 Canonical, Ltd.
+ * Copyright (C) 2012-2015 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
@@ -18,7 +18,9 @@
 import QtContacts 5.0
 
 import Ubuntu.Components 1.1
+
 import Ubuntu.Contacts 0.1
+import Ubuntu.AddressBook.Base 0.1
 
 ContactDetailBase {
     id: root

=== added file 'src/imports/Ubuntu/AddressBook/ContactEditor/ContactEditorPage.qml'
--- src/imports/Ubuntu/AddressBook/ContactEditor/ContactEditorPage.qml	1970-01-01 00:00:00 +0000
+++ src/imports/Ubuntu/AddressBook/ContactEditor/ContactEditorPage.qml	2015-06-01 22:08:49 +0000
@@ -0,0 +1,444 @@
+/*
+ * Copyright (C) 2012-2015 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 QtContacts 5.0
+
+import Ubuntu.Components 1.1
+import Ubuntu.Components.ListItems 1.0
+import Ubuntu.Components.Popups 1.0
+
+import Ubuntu.AddressBook.Base 0.1
+
+Page {
+    id: contactEditor
+
+    property QtObject contact: null
+    property QtObject model: null
+    property QtObject activeItem: null
+
+
+    property string initialFocusSection: ""
+    property var newDetails: []
+
+    readonly property bool isNewContact: contact && (contact.contactId === "qtcontacts:::")
+    readonly property bool isContactValid: !avatarEditor.busy && (!nameEditor.isEmpty() || !phonesEditor.isEmpty())
+
+    signal contactSaved(var contact);
+
+    // priv
+    property bool _edgeReady: false
+
+    function cancel() {
+        for (var i = 0; i < contactEditor.newDetails.length; ++i) {
+            contactEditor.contact.removeDetail(contactEditor.newDetails[i])
+        }
+        contactEditor.newDetails = []
+
+        for(var i = 0; i < contents.children.length; ++i) {
+            var field = contents.children[i]
+            if (field.cancel) {
+                field.cancel()
+            }
+        }
+        pageStack.pop()
+    }
+
+    function save() {
+        var changed = false
+        for(var i = 0; i < contents.children.length; ++i) {
+            var field = contents.children[i]
+            if (field.save) {
+                if (field.save()) {
+                    changed = true
+                }
+            }
+        }
+
+        // new contact and there is only two details (name, avatar)
+        // name and avatar, are not removable details, because of that the contact will have at least 2 details
+        if (isNewContact &&
+            (contact.contactDetails.length === 2)) {
+
+            // if name is empty this means that the contact is empty
+            var nameDetail = contact.detail(ContactDetail.Name)
+            if (nameDetail &&
+                (nameDetail.firstName && nameDetail.firstName != "") ||
+                (nameDetail.lastName && nameDetail.lastName != "")) {
+                // save contact
+            } else {
+                changed  = false
+            }
+        }
+
+        if (changed) {
+            // backend error will be handled by the root page (contact list)
+            var newContact = (contact.model == null)
+            contactEditor.model.saveContact(contact)
+            if (newContact) {
+                contactEditor.contactSaved(contact)
+            }
+        }
+        pageStack.pop()
+    }
+
+    function makeMeVisible(item) {
+        if (!_edgeReady || !item) {
+            return
+        }
+
+        activeItem = item
+        var position = scrollArea.contentItem.mapFromItem(item, 0, activeItem.y);
+
+        // check if the item is already visible
+        var bottomY = scrollArea.contentY + scrollArea.height
+        var itemBottom = position.y + (item.height * 3) // extra margin
+        if (position.y >= scrollArea.contentY && itemBottom <= bottomY) {
+            return;
+        }
+
+        // if it is not, try to scroll and make it visible
+        var targetY = itemBottom - scrollArea.height
+        if (targetY >= 0 && position.y) {
+            scrollArea.contentY = targetY;
+        } else if (position.y < scrollArea.contentY) {
+            // if it is hidden at the top, also show it
+            scrollArea.contentY = position.y;
+        }
+        scrollArea.returnToBounds()
+    }
+
+    function ready()
+    {
+        console.debug("READYYYYY: " + contactEditor.initialFocusSection)
+        enabled = true
+        _edgeReady = true
+
+        switch (contactEditor.initialFocusSection)
+        {
+        case "phones":
+            contactEditor.focusToLastPhoneField()
+            break;
+        case "name":
+            nameEditor.fieldDelegates[0].forceActiveFocus()
+            break;
+        }
+        contactEditor.initialFocusSection = ""
+    }
+
+    function focusToLastPhoneField()
+    {
+        var lastPhoneField = phonesEditor.detailDelegates[phonesEditor.detailDelegates.length - 2].item
+        console.debug("Focus last phone field:" + lastPhoneField)
+        console.debug("PHONES SIZE>" + phonesEditor.detailDelegates.length)
+        lastPhoneField.forceActiveFocus()
+    }
+
+    title: isNewContact ? i18n.dtr("address-book-app", "New contact") : i18n.dtr("address-book-app", "Edit")
+
+    Timer {
+        id: focusTimer
+
+        interval: 1000
+        running: false
+        repeat: false
+        onTriggered: contactEditor.ready()
+    }
+
+    flickable: null
+    Flickable {
+        id: scrollArea
+        objectName: "scrollArea"
+
+        // this is necessary to avoid the page to appear bellow the header
+        clip: true
+        flickableDirection: Flickable.VerticalFlick
+        anchors{
+            left: parent.left
+            top: parent.top
+            right: parent.right
+            bottom: keyboardRectangle.top
+        }
+        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
+        onContentHeightChanged: contactEditor.makeMeVisible(contactEditor.activeItem)
+
+        Column {
+            id: contents
+
+            anchors {
+                top: parent.top
+                topMargin: units.gu(2)
+                left: parent.left
+                right: parent.right
+            }
+            height: childrenRect.height
+
+            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 {
+                id: phonesEditor
+                objectName: "phones"
+
+                contact: contactEditor.contact
+                anchors {
+                    left: parent.left
+                    right: parent.right
+                }
+                height: implicitHeight
+            }
+
+            ContactDetailEmailsEditor {
+                id: emailsEditor
+                objectName: "emails"
+
+                contact: contactEditor.contact
+                anchors {
+                    left: parent.left
+                    right: parent.right
+                }
+                height: implicitHeight
+            }
+
+            ContactDetailOnlineAccountsEditor {
+                id: accountsEditor
+                objectName: "ims"
+
+                contact: contactEditor.contact
+                anchors {
+                    left: parent.left
+                    right: parent.right
+                }
+                height: implicitHeight
+            }
+
+            ContactDetailAddressesEditor {
+                id: addressesEditor
+                objectName: "addresses"
+
+                contact: contactEditor.contact
+                anchors {
+                    left: parent.left
+                    right: parent.right
+                }
+                height: implicitHeight
+            }
+
+            ContactDetailOrganizationsEditor {
+                id: organizationsEditor
+                objectName: "professionalDetails"
+
+                contact: contactEditor.contact
+                anchors {
+                    left: parent.left
+                    right: parent.right
+                }
+                height: implicitHeight
+            }
+
+            ContactDetailSyncTargetEditor {
+                id: syncTargetEditor
+
+                active: contactEditor.active
+                contact: contactEditor.contact
+                anchors {
+                    left: parent.left
+                    right: parent.right
+                }
+                height: implicitHeight
+            }
+
+            ThinDivider {}
+
+            Item {
+                anchors {
+                    left: parent.left
+                    right: parent.right
+                }
+                height: units.gu(2)
+            }
+
+            ComboButtonAddField {
+                id: addNewFieldButton
+                objectName: "addNewFieldButton"
+
+                contact: contactEditor.contact
+                text: i18n.dtr("address-book-app", "Add Field")
+                anchors {
+                    left: parent.left
+                    right: parent.right
+                    margins: units.gu(2)
+                }
+                height: implicitHeight
+                onHeightChanged: {
+                    if (expanded && (height === expandedHeight) && !scrollArea.atYEnd) {
+                        moveToBottom.start()
+                    }
+                }
+
+                UbuntuNumberAnimation {
+                    id: moveToBottom
+
+                    target: scrollArea
+                    property: "contentY"
+                    from: scrollArea.contentY
+                    to: Math.min(scrollArea.contentHeight - scrollArea.height,
+                                 scrollArea.contentY + (addNewFieldButton.height - addNewFieldButton.collapsedHeight - units.gu(3)))
+                }
+
+                onFieldSelected: {
+                    if (qmlTypeName) {
+                        var newDetail = Qt.createQmlObject("import QtContacts 5.0; " + qmlTypeName + "{}", contactEditor)
+                        if (newDetail) {
+                            var newDetailsCopy = contactEditor.newDetails
+                            newDetailsCopy.push(newDetail)
+                            contactEditor.newDetails = newDetailsCopy
+                            contactEditor.contact.addDetail(newDetail)
+                        }
+                    }
+                }
+            }
+
+
+            Item {
+                anchors {
+                    left: parent.left
+                    right: parent.right
+                }
+                height: units.gu(2)
+            }
+
+            Button {
+                id: deleteButton
+
+                text: i18n.dtr("address-book-app", "Delete")
+                visible: !contactEditor.isNewContact
+                color: UbuntuColors.red
+                anchors {
+                    left: parent.left
+                    right: parent.right
+                    margins: units.gu(2)
+                }
+                onClicked: {
+                    var dialog = PopupUtils.open(removeContactDialog, null)
+                    dialog.contacts = [contactEditor.contact]
+                }
+            }
+
+
+            Item {
+                anchors {
+                    left: parent.left
+                    right: parent.right
+                }
+                height: units.gu(2)
+            }
+        }
+    }
+
+    KeyboardRectangle {
+        id: keyboardRectangle
+
+        onHeightChanged: {
+            if (activeItem) {
+                makeMeVisible(activeItem)
+            }
+        }
+    }
+
+    Component.onCompleted: {
+        console.debug("Editor completed: " + enabled)
+        if (!enabled) {
+            return
+        }
+
+        console.debug("initialFocusSection: " + contactEditor.initialFocusSection)
+        if (contactEditor.initialFocusSection != "") {
+            focusTimer.restart()
+        } else {
+            contactEditor.ready()
+        }
+    }
+
+    Component {
+        id: removeContactDialog
+
+        RemoveContactsDialog {
+            id: removeContactsDialogMessage
+
+            property bool popPages: false
+
+            onCanceled: {
+                PopupUtils.close(removeContactsDialogMessage)
+            }
+
+            onAccepted: {
+                popPages = true
+                removeContacts(contactEditor.model)
+                PopupUtils.close(removeContactsDialogMessage)
+            }
+
+            // hide virtual keyboard if necessary
+            Component.onCompleted: Qt.inputMethod.hide()
+
+            // WORKAROUND: SDK element crash if pop the page where the dialog was created
+            Component.onDestruction: {
+                if (popPages) {
+                    contactEditor.pageStack.pop() // editor page
+                    contactEditor.pageStack.pop() // view page
+                }
+            }
+        }
+    }
+}

=== modified file 'src/imports/Ubuntu/AddressBook/ContactEditor/TextInputDetail.qml'
--- src/imports/ContactEdit/TextInputDetail.qml	2014-10-31 13:41:27 +0000
+++ src/imports/Ubuntu/AddressBook/ContactEditor/TextInputDetail.qml	2015-06-01 22:08:49 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2013 Canonical, Ltd.
+ * Copyright (C) 2012-2015 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
@@ -73,7 +73,7 @@
         // Ubuntu.Keyboard
         // TRANSLATORS: This is the text that will be used on the "return" key for the virtual keyboard,
         // this word must be less than 5 characters
-        InputMethod.extensions: { "enterKeyText": i18n.tr("Next") }
+        InputMethod.extensions: { "enterKeyText": i18n.dtr("address-book-app", "Next") }
         readOnly: root.detail ? root.detail.readOnly : true
         style: TextFieldStyle {
             overlaySpacing: 0

=== modified file 'src/imports/Ubuntu/AddressBook/ContactEditor/ValueSelector.qml'
--- src/imports/ContactEdit/ValueSelector.qml	2014-07-22 23:09:03 +0000
+++ src/imports/Ubuntu/AddressBook/ContactEditor/ValueSelector.qml	2015-06-01 22:08:49 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2013 Canonical, Ltd.
+ * Copyright (C) 2012-2015 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

=== added file 'src/imports/Ubuntu/AddressBook/ContactEditor/qmldir'
--- src/imports/Ubuntu/AddressBook/ContactEditor/qmldir	1970-01-01 00:00:00 +0000
+++ src/imports/Ubuntu/AddressBook/ContactEditor/qmldir	2015-06-01 22:08:49 +0000
@@ -0,0 +1,18 @@
+module Ubuntu.AddressBook.ContactView
+
+ContactEditorPage 0.1 ContactEditorPage.qml
+
+internal AvatarImport AvatarImport.qml
+internal ComboButtonAddField ComboButtonAddField.qml
+internal ContactDetailAddressesEditor ContactDetailAddressesEditor.qml
+internal ContactDetailAvatarEditor ContactDetailAvatarEditor.qml
+internal ContactDetailEmailsEditor ContactDetailEmailsEditor.qml
+internal ContactDetailGroupWithTypeEditor ContactDetailGroupWithTypeEditor.qml
+internal ContactDetailNameEditor ContactDetailNameEditor.qml
+internal ContactDetailOnlineAccountsEditor ContactDetailOnlineAccountsEditor.qml
+internal ContactDetailOrganizationsEditor ContactDetailOrganizationsEditor.qml
+internal ContactDetailPhoneNumbersEditor ContactDetailPhoneNumbersEditor.qml
+internal ContactDetailSyncTargetEditor ContactDetailSyncTargetEditor.qml
+internal ContactDetailWithTypeEditor ContactDetailWithTypeEditor.qml
+internal TextInputDetail TextInputDetail.qml
+internal ValueSelector ValueSelector.qml

=== added directory 'src/imports/Ubuntu/AddressBook/ContactShare'
=== added file 'src/imports/Ubuntu/AddressBook/ContactShare/CMakeLists.txt'
--- src/imports/Ubuntu/AddressBook/ContactShare/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ src/imports/Ubuntu/AddressBook/ContactShare/CMakeLists.txt	2015-06-01 22:08:49 +0000
@@ -0,0 +1,26 @@
+set(AB_CONTACT_SHARE_QMLS
+    ContactSharePage.qml
+    qmldir
+)
+
+install(FILES ${AB_CONTACT_SHARE_QMLS}
+    DESTINATION ${ADDRESS_BOOK_APP_DIR}/imports/ContactShare
+)
+
+# make the files visible on qtcreator
+add_custom_target(contact_share_QmlFiles ALL SOURCES ${AB_CONTACT_SHARE_QMLS})
+
+if(INSTALL_COMPONENTS)
+    install(FILES ${AB_CONTACT_SHARE_QMLS} DESTINATION ${ADDRESS_BOOK_QMLPLUGIN_INSTALL_PREFIX}/ContactShare)
+endif()
+
+#copy qml files to build dir to make it possible to run without install
+foreach(QML_FILE ${AB_CONTACT_SHARE_QMLS})
+  add_custom_command(TARGET contact_share_QmlFiles PRE_BUILD
+                     COMMAND ${CMAKE_COMMAND} -E
+                         copy ${CMAKE_CURRENT_SOURCE_DIR}/${QML_FILE} ${CMAKE_CURRENT_BINARY_DIR}/)
+endforeach()
+
+if (NOT ${CMAKE_CURRENT_BINARY_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR})
+    add_dependencies(copyqmlfiles contact_share_QmlFiles)
+endif()

=== added file 'src/imports/Ubuntu/AddressBook/ContactShare/ContactSharePage.qml'
--- src/imports/Ubuntu/AddressBook/ContactShare/ContactSharePage.qml	1970-01-01 00:00:00 +0000
+++ src/imports/Ubuntu/AddressBook/ContactShare/ContactSharePage.qml	2015-06-01 22:08:49 +0000
@@ -0,0 +1,60 @@
+/*
+ * 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 QtContacts 5.0
+
+import Ubuntu.Components 1.1
+import Ubuntu.Content 1.1 as ContentHub
+
+import Ubuntu.AddressBook.Base 0.1
+
+Page {
+    id: root
+
+    property alias contactModel: exporter.contactModel
+    property var contacts
+
+    signal canceled()
+    signal completed()
+
+    ContentHub.ContentPeerPicker {
+        visible: true
+        anchors.fill: parent
+        contentType: ContentHub.ContentType.Contacts
+        handler: ContentHub.ContentHandler.Share
+
+        onPeerSelected: {
+            exporter.activeTransfer = peer.request();
+            if (exporter.activeTransfer.state === ContentHub.ContentTransfer.InProgress) {
+                exporter.start(root.contacts)
+            }
+        }
+
+        onCancelPressed: {
+            if (exporter.activeTransfer) {
+                exporter.activeTransfer.state = ContentHub.ContentTransfer.Aborted
+            }
+            pageStack.pop()
+        }
+    }
+
+    ContactExporter {
+        id: exporter
+
+        onDone: pageStack.pop()
+    }
+}

=== added file 'src/imports/Ubuntu/AddressBook/ContactShare/qmldir'
--- src/imports/Ubuntu/AddressBook/ContactShare/qmldir	1970-01-01 00:00:00 +0000
+++ src/imports/Ubuntu/AddressBook/ContactShare/qmldir	2015-06-01 22:08:49 +0000
@@ -0,0 +1,3 @@
+module Ubuntu.AddressBook.ContactShare
+
+ContactSharePage 0.1 ContactSharePage.qml

=== renamed directory 'src/imports/ContactView' => 'src/imports/Ubuntu/AddressBook/ContactView'
=== added file 'src/imports/Ubuntu/AddressBook/ContactView/ActionButton.qml'
--- src/imports/Ubuntu/AddressBook/ContactView/ActionButton.qml	1970-01-01 00:00:00 +0000
+++ src/imports/Ubuntu/AddressBook/ContactView/ActionButton.qml	2015-06-01 22:08:49 +0000
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2012-2015 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 1.1
+
+AbstractButton {
+    id: root
+
+    property QtObject actions
+    property alias iconName: icon.name
+    property real iconSize: units.gu(2.5)
+
+    Icon {
+        id: icon
+
+        anchors.centerIn: parent
+        height: root.iconSize
+        width: root.iconSize
+    }
+}

=== added file 'src/imports/Ubuntu/AddressBook/ContactView/BasicFieldView.qml'
--- src/imports/Ubuntu/AddressBook/ContactView/BasicFieldView.qml	1970-01-01 00:00:00 +0000
+++ src/imports/Ubuntu/AddressBook/ContactView/BasicFieldView.qml	2015-06-01 22:08:49 +0000
@@ -0,0 +1,85 @@
+/*
+ * Copyright (C) 2012-2015 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 1.1
+
+ Item {
+    id: root
+
+    property alias typeLabel: typeLabel.text
+    property alias values: valueList.model
+    property double lineHeight: units.gu(2)
+    property QtObject detail: null
+    property variant fields: null
+    property int parentIndex: -1
+
+    implicitHeight: typeLabel.height + fieldValues.height + units.gu(2)
+
+    Column {
+        id: fieldValues
+
+        anchors {
+            left: parent.left
+            top: parent.top
+            topMargin: units.gu(1)
+            right: parent.right
+        }
+        height: (valueList.count * root.lineHeight)
+
+        Repeater {
+            id: valueList
+
+            Label {
+                id: label
+                objectName: detail && fields ? "label_" + detailToString(detail.type, fields[index]) + "_" + root.parentIndex + "." + index : ""
+
+                anchors {
+                    left: parent ? parent.left : undefined
+                    right: parent ? parent.right : undefined
+                }
+                height: root.lineHeight
+                verticalAlignment: Text.AlignVCenter
+                text: modelData ? modelData : ""
+                elide: Text.ElideRight
+
+                // style
+                fontSize: "medium"
+                color: UbuntuColors.lightAubergine
+            }
+        }
+    }
+
+    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/Ubuntu/AddressBook/ContactView/CMakeLists.txt'
--- src/imports/ContactView/CMakeLists.txt	2014-08-13 20:52:57 +0000
+++ src/imports/Ubuntu/AddressBook/ContactView/CMakeLists.txt	2015-06-01 22:08:49 +0000
@@ -1,12 +1,37 @@
-set(CONTACT_VIEW_QMLS
+set(AB_CONTACT_VIEW_QMLS
+    ActionButton.qml
+    BasicFieldView.qml
+    ContactDetailAddressesView.qml
+    ContactDetailAvatarView.qml
+    ContactDetailEmailsView.qml
+    ContactDetailGroupWithTypeView.qml
+    ContactDetailNameView.qml
+    ContactDetailOnlineAccountsView.qml
+    ContactDetailOrganizationsView.qml
+    ContactDetailPhoneNumbersView.qml
+    ContactDetailPhoneNumberView.qml
     ContactDetailSyncTargetView.qml
+    ContactDetailWithTypeView.qml
     ContactFetchError.qml
-    ContactView.qml
-)
-
-install(FILES ${CONTACT_VIEW_QMLS}
-    DESTINATION ${ADDRESS_BOOK_APP_DIR}/imports/ContactView
+    #ContactHeaderView.qml
+    ContactViewPage.qml
+    qmldir
 )
 
 # make the files visible on qtcreator
-add_custom_target(contact_view_QmlFiles ALL SOURCES ${CONTACT_VIEW_QMLS})
+add_custom_target(contact_view_QmlFiles ALL SOURCES ${AB_CONTACT_VIEW_QMLS})
+
+if(INSTALL_COMPONENTS)
+    install(FILES ${AB_CONTACT_VIEW_QMLS} DESTINATION ${ADDRESS_BOOK_QMLPLUGIN_INSTALL_PREFIX}/ContactView)
+endif()
+
+#copy qml files to build dir to make it possible to run without install
+foreach(QML_FILE ${AB_CONTACT_VIEW_QMLS})
+  add_custom_command(TARGET contact_view_QmlFiles PRE_BUILD
+                     COMMAND ${CMAKE_COMMAND} -E
+                         copy ${CMAKE_CURRENT_SOURCE_DIR}/${QML_FILE} ${CMAKE_CURRENT_BINARY_DIR}/)
+endforeach()
+
+if (NOT ${CMAKE_CURRENT_BINARY_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR})
+    add_dependencies(copyqmlfiles contact_view_QmlFiles)
+endif()

=== added file 'src/imports/Ubuntu/AddressBook/ContactView/ContactDetailAddressesView.qml'
--- src/imports/Ubuntu/AddressBook/ContactView/ContactDetailAddressesView.qml	1970-01-01 00:00:00 +0000
+++ src/imports/Ubuntu/AddressBook/ContactView/ContactDetailAddressesView.qml	2015-06-01 22:08:49 +0000
@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) 2012-2015 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 QtContacts 5.0 as QtContacts
+import Ubuntu.Components 1.1
+
+ContactDetailGroupWithTypeView {
+    id: root
+
+    title: i18n.dtr("address-book-app", "Address")
+    defaultIcon: "image://theme/location"
+    detailType: QtContacts.ContactDetail.Address
+    fields: [ QtContacts.Address.Street,
+              QtContacts.Address.Locality,
+              QtContacts.Address.Region,
+              QtContacts.Address.Postcode,
+              QtContacts.Address.Country]
+}

=== added file 'src/imports/Ubuntu/AddressBook/ContactView/ContactDetailAvatarView.qml'
--- src/imports/Ubuntu/AddressBook/ContactView/ContactDetailAvatarView.qml	1970-01-01 00:00:00 +0000
+++ src/imports/Ubuntu/AddressBook/ContactView/ContactDetailAvatarView.qml	2015-06-01 22:08:49 +0000
@@ -0,0 +1,89 @@
+/*
+ * Copyright (C) 2012-2015 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 QtGraphicalEffects 1.0
+import QtContacts 5.0
+import Ubuntu.Components 1.1
+
+import Ubuntu.Contacts 0.1
+import Ubuntu.AddressBook.Base 0.1
+
+ContactDetailBase {
+    id: root
+
+    implicitHeight: units.gu(12)
+    implicitWidth: parent.width
+
+    Connections {
+        id: connections
+
+        target: avatar.contactElement
+        ignoreUnknownSignals: true
+        onContactChanged: avatar.reload()
+    }
+
+    Image {
+        id: imageBg
+
+        source: avatar.avatarUrl
+        anchors.fill: parent
+        fillMode: Image.PreserveAspectCrop
+        visible: false
+    }
+
+    FastBlur {
+        anchors.fill: imageBg
+        source: imageBg
+        radius: 32
+        visible: avatar.avatarUrl !== avatar.fallbackAvatarUrl
+    }
+
+    ContactAvatar {
+        id: avatar
+        objectName: "contactAvatarDetail"
+
+        contactElement: root.contact
+        height: units.gu(8)
+        width: height
+
+        anchors {
+            left: parent.left
+            verticalCenter: parent.verticalCenter
+            leftMargin: units.gu(2)
+        }
+
+    }
+
+    ActionButton {
+        id: favImage
+
+        iconName: root.contact && root.contact.favorite.favorite ? "starred" : "non-starred"
+        height: units.gu(4)
+        iconSize: units.gu(3)
+        width: height
+        anchors {
+            right: parent.right
+            rightMargin: units.gu(2)
+            verticalCenter: parent.verticalCenter
+        }
+
+        onClicked: {
+            root.contact.favorite.favorite = !root.contact.favorite.favorite
+            root.contact.save()
+        }
+    }
+}

=== added file 'src/imports/Ubuntu/AddressBook/ContactView/ContactDetailEmailsView.qml'
--- src/imports/Ubuntu/AddressBook/ContactView/ContactDetailEmailsView.qml	1970-01-01 00:00:00 +0000
+++ src/imports/Ubuntu/AddressBook/ContactView/ContactDetailEmailsView.qml	2015-06-01 22:08:49 +0000
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C) 2012-2015 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 QtContacts 5.0 as QtContacts
+import Ubuntu.Components 1.1
+
+ContactDetailGroupWithTypeView {
+    detailType: QtContacts.ContactDetail.Email
+    title: i18n.dtr("address-book-app", "Email")
+    fields: [ 0 ]
+    defaultAction: Action {
+        text: i18n.dtr("address-book-app", "Email")
+        iconName: "email"
+    }
+}

=== added file 'src/imports/Ubuntu/AddressBook/ContactView/ContactDetailGroupWithTypeView.qml'
--- src/imports/Ubuntu/AddressBook/ContactView/ContactDetailGroupWithTypeView.qml	1970-01-01 00:00:00 +0000
+++ src/imports/Ubuntu/AddressBook/ContactView/ContactDetailGroupWithTypeView.qml	2015-06-01 22:08:49 +0000
@@ -0,0 +1,66 @@
+/*
+ * Copyright (C) 2012-2015 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 QtContacts 5.0 as QtContacts
+
+import Ubuntu.Components 1.1
+import Ubuntu.Components.ListItems 1.0 as ListItem
+
+import Ubuntu.AddressBook.Base 0.1
+
+ContactDetailGroupWithTypeBase {
+    id: root
+
+    property Action defaultAction
+    signal actionTrigerred(string action, QtObject detail)
+
+    showEmpty: false
+    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 {
+            anchors {
+                verticalCenter: parent.verticalCenter
+                left: parent.left
+                right: parent.right
+                margins: units.gu(2)
+            }
+
+            text: root.title
+
+            // style
+            fontSize: "medium"
+        }
+    }
+
+    detailDelegate: ContactDetailWithTypeView {
+        property variant detailType: detail && root.contact && root.typeModelReady ? root.getType(detail) : ""
+
+        action: root.defaultAction
+        contact: root.contact
+        fields: root.fields
+        typeLabel: detailType ? detailType.label : ""
+
+        height: implicitHeight
+        width: root.width
+        onClicked: root.actionTrigerred(action, detail)
+    }
+}

=== modified file 'src/imports/Ubuntu/AddressBook/ContactView/ContactDetailNameView.qml'
--- src/imports/ContactView/ContactDetailNameView.qml	2014-07-20 20:23:20 +0000
+++ src/imports/Ubuntu/AddressBook/ContactView/ContactDetailNameView.qml	2015-06-01 22:08:49 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2013 Canonical, Ltd.
+ * Copyright (C) 2012-2015 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
@@ -18,7 +18,7 @@
 import Ubuntu.Components 1.1
 import QtContacts 5.0
 
-import "../Common"
+import Ubuntu.AddressBook.Base 0.1
 
 ContactDetailBase {
     id: root

=== added file 'src/imports/Ubuntu/AddressBook/ContactView/ContactDetailOnlineAccountsView.qml'
--- src/imports/Ubuntu/AddressBook/ContactView/ContactDetailOnlineAccountsView.qml	1970-01-01 00:00:00 +0000
+++ src/imports/Ubuntu/AddressBook/ContactView/ContactDetailOnlineAccountsView.qml	2015-06-01 22:08:49 +0000
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2012-2015 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 QtContacts 5.0 as QtContacts
+
+import Ubuntu.Components 1.1
+import Ubuntu.Contacts 0.1
+
+ContactDetailGroupWithTypeView {
+    detailType: QtContacts.ContactDetail.OnlineAccount
+    fields: [ QtContacts.OnlineAccount.AccountUri ]
+    title: i18n.dtr("address-book-app", "Social")
+    typeModel: ContactDetailOnlineAccountTypeModel { }
+    defaultAction: Action {
+        text: i18n.dtr("address-book-app", "Touch")
+    }
+}

=== added file 'src/imports/Ubuntu/AddressBook/ContactView/ContactDetailOrganizationsView.qml'
--- src/imports/Ubuntu/AddressBook/ContactView/ContactDetailOrganizationsView.qml	1970-01-01 00:00:00 +0000
+++ src/imports/Ubuntu/AddressBook/ContactView/ContactDetailOrganizationsView.qml	2015-06-01 22:08:49 +0000
@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) 2012-2015 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