Merge lp:~renatofilho/address-book-app/fix-1380094 into lp:~phablet-team/address-book-app/staging

[Renato Araujo Oliveira Filho]

Format contact preview page title based on designer spec.

1- Name
2- Company
3- Phone
4- Email
5- Alias
6- No name

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:314
http://jenkins.qa.ubuntu.com/job/phablet-team-address-book-app-staging-ci/354/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5884
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/4065
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-team-address-book-app-staging-utopic-i386-ci/354
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5528
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7136
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7136/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14605
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/3431
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4394
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4394/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:315
http://jenkins.qa.ubuntu.com/job/phablet-team-address-book-app-staging-ci/355/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5897/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/4071/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/phablet-team-address-book-app-staging-utopic-i386-ci/355/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7149/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4400/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:316
http://jenkins.qa.ubuntu.com/job/phablet-team-address-book-app-staging-ci/356/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5927
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/4080
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-team-address-book-app-staging-utopic-i386-ci/356
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5567
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7179
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7179/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14660
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/3442
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4409
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4409/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:317
http://jenkins.qa.ubuntu.com/job/phablet-team-address-book-app-staging-ci/357/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5943
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/4087
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-team-address-book-app-staging-utopic-i386-ci/357
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5585
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7195
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7195/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14682
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/3449
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4416
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4416/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:318
http://jenkins.qa.ubuntu.com/job/phablet-team-address-book-app-staging-ci/358/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5947
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/4089
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-team-address-book-app-staging-utopic-i386-ci/358
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5588
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7199
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7199/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14687
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/3451
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4418
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4418/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/phablet-team-address-book-app-staging-autolanding/106/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/6190
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/4194
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-team-address-book-app-staging-utopic-i386-autolanding/106
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5813
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7442
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7442/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/15025
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/3551
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4552
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4552/artifact/work/output/*zip*/output.zip

review: Needs Fixing (continuous-integration)

=== modified file 'src/imports/Ubuntu/Contacts/ContactAvatar.qml'
--- src/imports/Ubuntu/Contacts/ContactAvatar.qml	2014-08-21 00:45:37 +0000
+++ src/imports/Ubuntu/Contacts/ContactAvatar.qml	2014-10-14 18:54:07 +0000
@@ -37,7 +37,7 @@
     function reload()
     {
         img.avatarUrl = Qt.binding(function() { return ContactsJS.getAvatar(contactElement, fallbackAvatarUrl) })
-        initialsLabel.contactDisplayName = Qt.binding(function() { return ContactsJS.formatToDisplay(contactElement, ContactDetail.Name, [Name.FirstName, Name.LastName], fallbackDisplayName) })
+        initialsLabel.contactDisplayName = Qt.binding(function() { return ContactsJS.formatToDisplayWithDetails(contactElement, ContactDetail.Name, [Name.FirstName, Name.LastName], fallbackDisplayName) })
     }
 
     radius: "medium"
@@ -47,7 +47,7 @@
         id: initialsLabel
         objectName: "avatarInitials"
 
-        property string contactDisplayName: ContactsJS.formatToDisplay(contactElement, ContactDetail.Name, [Name.FirstName, Name.LastName], fallbackDisplayName)
+        property string contactDisplayName: ContactsJS.formatToDisplayWithDetails(contactElement, ContactDetail.Name, [Name.FirstName, Name.LastName], fallbackDisplayName)
 
         anchors.centerIn: parent
         text: Contacts.contactInitialsFromString(contactDisplayName)

=== modified file 'src/imports/Ubuntu/Contacts/ContactDelegate.qml'
--- src/imports/Ubuntu/Contacts/ContactDelegate.qml	2014-09-02 19:23:05 +0000
+++ src/imports/Ubuntu/Contacts/ContactDelegate.qml	2014-10-14 18:54:07 +0000
@@ -26,12 +26,10 @@
     property bool showAvatar: true
     property bool isCurrentItem: false
     property string defaultAvatarUrl: ""
-    property string defaultTitle: ""
-    property int titleDetail: ContactDetail.Name
-    property variant titleFields: [ Name.FirstName, Name.LastName ]
     property bool detailsShown: false
     property int loaderOpacity: 0.0
     property bool flicking: false
+    readonly property string displayLabel: contact ? ContactsJS.formatToDisplay(contact, "") : ""
 
     signal clicked(int index, QtObject contact)
     signal pressAndHold(int index, QtObject contact)
@@ -84,7 +82,7 @@
             id: avatar
 
             contactElement: contact
-            fallbackDisplayName: name.text
+            fallbackDisplayName: root.displayLabel
             anchors {
                 left: parent.left
                 top: parent.top
@@ -107,7 +105,7 @@
 
             }
             color: UbuntuColors.lightAubergine
-            text: contact ? ContactsJS.formatToDisplay(contact, root.titleDetail, root.titleFields, "") : root.defaultTitle
+            text: root.displayLabel != "" ? root.displayLabel : i18n.dtr("address-book-app", "No name")
             elide: Text.ElideRight
         }
 

=== modified file 'src/imports/Ubuntu/Contacts/ContactListView.qml'
--- src/imports/Ubuntu/Contacts/ContactListView.qml	2014-08-27 22:40:35 +0000
+++ src/imports/Ubuntu/Contacts/ContactListView.qml	2014-10-14 18:54:07 +0000
@@ -69,20 +69,6 @@
     */
     property alias showAvatar: view.showAvatar
     /*!
-      \qmlproperty int titleDetail
-
-      This property holds the contact detail which will be used to display the contact title in the delegate
-      By default this is set to ContactDetail.Name.
-    */
-    property alias titleDetail: view.titleDetail
-    /*!
-      \qmlproperty list<int> titleFields
-
-      This property holds the list of all fields which will be used to display the contact title in the delegate
-      By default this is set to [ Name.FirstName, Name.LastName ]
-    */
-    property alias titleFields: view.titleFields
-    /*!
       \qmlproperty list<SortOrder> sortOrders
 
       This property holds a list of sort orders used by the contacts model.

=== modified file 'src/imports/Ubuntu/Contacts/ContactPreviewPage.qml'
--- src/imports/Ubuntu/Contacts/ContactPreviewPage.qml	2014-09-17 18:36:48 +0000
+++ src/imports/Ubuntu/Contacts/ContactPreviewPage.qml	2014-10-14 18:54:07 +0000
@@ -20,6 +20,7 @@
 import Ubuntu.Components.ListItems 1.0 as ListItem
 import Ubuntu.Contacts 0.1 as ContactsUI
 import Ubuntu.Components.Popups 1.0 as Popups
+import "Contacts.js" as ContactsJS
 
 Page {
     id: root
@@ -27,22 +28,15 @@
     property QtObject contact: null
     property alias extensions: extensionsContents.children
 
-    function formatNameToDisplay(contact) {
-        if (!contact) {
-            return ""
-        }
-        if (contact.name) {
-            var detail = contact.name
-            return (detail.firstName + " " + detail.lastName).trim()
-        } else if (contact.displayLabel && contact.displayLabel.label && contact.displayLabel.label !== "") {
-            return contact.displayLabel.label
-        } else {
-            return ""
+    title: ContactsJS.formatToDisplay(contact, i18n.dtr("address-book-app", "No name"))
+
+    Connections {
+        target: contact
+        onContactChanged: {
+            root.title = ContactsJS.formatToDisplay(contact, i18n.dtr("address-book-app", "No name"))
         }
     }
 
-    title: formatNameToDisplay(contact)
-
     Flickable {
         id: flickable
 

=== modified file 'src/imports/Ubuntu/Contacts/ContactSimpleListView.qml'
--- src/imports/Ubuntu/Contacts/ContactSimpleListView.qml	2014-09-04 18:21:29 +0000
+++ src/imports/Ubuntu/Contacts/ContactSimpleListView.qml	2014-10-14 18:54:07 +0000
@@ -54,20 +54,6 @@
     property bool showAvatar: true
 
     /*!
-      \qmlproperty int titleDetail
-
-      This property holds the contact detail which will be used to display the contact title in the delegate
-      By default this is set to ContactDetail.Name.
-    */
-    property int titleDetail: ContactDetail.DisplayLabel
-    /*!
-      \qmlproperty list<int> titleFields
-
-      This property holds the list of all fields which will be used to display the contact title in the delegate
-      By default this is set to [ Name.FirstName, Name.LastName ]
-    */
-    property variant titleFields: [ DisplayLabel.Label ]
-    /*!
       \qmlproperty list<SortOrder> sortOrders
 
       This property holds a list of sort orders used by the contacts model.
@@ -101,7 +87,7 @@
         detailTypesHint: {
             var hints = [ ContactDetail.Tag,          // sections
                           ContactDetail.PhoneNumber,  // expansion
-                          contactListView.titleDetail ]
+                          ContactDetail.DisplayLabel ]
 
             if (contactListView.showAvatar) {
                 hints.push(ContactDetail.Avatar)
@@ -292,8 +278,6 @@
         selected: contactListView.multiSelectionEnabled && contactListView.isSelected(contactDelegate)
         selectionMode: contactListView.isInSelectionMode
         defaultAvatarUrl: contactListView.defaultAvatarImageUrl
-        titleDetail: contactListView.titleDetail
-        titleFields: contactListView.titleFields
         isCurrentItem: ListView.isCurrentItem
 
         // actions

=== modified file 'src/imports/Ubuntu/Contacts/Contacts.js'
--- src/imports/Ubuntu/Contacts/Contacts.js	2014-07-05 22:00:02 +0000
+++ src/imports/Ubuntu/Contacts/Contacts.js	2014-10-14 18:54:07 +0000
@@ -2,7 +2,8 @@
 var phoneTypeModel = null
 
 // Format contact name to be displayed
-function formatToDisplay(contact, contactDetail, detailFields, defaultTitle) {
+function formatToDisplayWithDetails(contact, contactDetail, detailFields, defaultTitle)
+{
     if (!contact) {
         return defaultTitle
     }
@@ -28,6 +29,59 @@
     return values
 }
 
+function formatToDisplay(contact, defaultTitle)
+{
+    if (!contact) {
+        return defaultTitle
+    }
+
+    var detail = contact.detail(ContactDetail.DisplayLabel)
+    if (detail && (detail.label.length > 0)) {
+        return detail.label
+    }
+
+    detail = contact.detail(ContactDetail.Name)
+    if (detail) {
+        var fullName = (detail.firstName + " " + detail.lastName).trim()
+        if (fullName.length > 0) {
+            return fullName
+        }
+    }
+
+    detail = contact.detail(ContactDetail.Organization)
+    if (detail) {
+        if (detail.name && (detail.name.length > 0)) {
+            return detail.name
+        }
+    }
+
+    var details = contact.details(ContactDetail.PhoneNumber)
+    if (details.length > 0) {
+        detail = details[0]
+        if (detail.number && detail.number.length > 0) {
+            return detail.number
+        }
+    }
+
+    details = contact.details(ContactDetail.Email)
+    if (details.length > 0) {
+        detail = details[0]
+        if (detail.emailAddress && detail.emailAddress.length > 0) {
+            return detail.emailAddress
+        }
+    }
+
+    details = contact.details(ContactDetail.OnlineAccount)
+    if (details.length > 0) {
+        detail = details[0]
+        if (detail.accountUri && detail.accountUri.length > 0) {
+            return detail.accountUri
+        }
+    }
+
+    return defaultTitle
+}
+
 function getAvatar(contact, defaultValue)
 {
     // use this verbose mode to avoid problems with binding loops

=== modified file 'src/imports/Ubuntu/Contacts/MostCalledModel.qml'
--- src/imports/Ubuntu/Contacts/MostCalledModel.qml	2014-09-04 20:34:55 +0000
+++ src/imports/Ubuntu/Contacts/MostCalledModel.qml	2014-10-14 18:54:07 +0000
@@ -75,8 +75,6 @@
 
         defaultAvatarUrl: "image://theme/contacts"
         width: parent ? parent.width : 0
-        titleDetail: ContactDetail.DisplayLabel
-        titleFields: [ DisplayLabel.Label ]
         isCurrentItem: root.currentIndex === index
         locked: true