Merge lp:~tiagosh/address-book-app/fix-delegate-size into lp:address-book-app

[Tiago Salem Herrmann]

- Fix bugs 1217520, 1211712 and 1217526
- Update visuals to match design spec

- Fix bugs 1217520, 1211712 and 1217526
- Update visuals to match design spec

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:56
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/123/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-saucy-amd64-ci/123
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-saucy-armhf-ci/124
        deb: http://jenkins.qa.ubuntu.com/job/address-book-app-saucy-armhf-ci/124/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-saucy-i386-ci/123
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/2747
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/361
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/2753
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/2753/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/2330
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/363
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/363/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/326
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/333

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

review: Approve (continuous-integration)

[Gustavo Pichorim Boiko (boiko)]

Looks good and works as expected.

review: Approve

=== modified file 'src/imports/ContactEdit/ContactDetailAddressesEditor.qml'
--- src/imports/ContactEdit/ContactDetailAddressesEditor.qml	2013-07-25 21:16:28 +0000
+++ src/imports/ContactEdit/ContactDetailAddressesEditor.qml	2013-08-28 17:11:16 +0000
@@ -32,5 +32,5 @@
                         i18n.tr("Locality"),
                         i18n.tr("Region"),
                         i18n.tr("Post code"),
-                        i18n.tr("Cuntry") ]
+                        i18n.tr("Country") ]
 }

=== modified file 'src/imports/ContactEdit/ContactDetailWithTypeEditor.qml'
--- src/imports/ContactEdit/ContactDetailWithTypeEditor.qml	2013-07-26 00:19:09 +0000
+++ src/imports/ContactEdit/ContactDetailWithTypeEditor.qml	2013-08-28 17:11:16 +0000
@@ -95,6 +95,14 @@
 
             focus: true
             TextInputDetail {
+                id: detail
+                Component.onCompleted: {
+                    if (index == 0) {
+                        focus = true
+                        detail.forceActiveFocus()
+                    }
+                }
+                focus: false
                 detail: root.detail
                 field: modelData
                 placeholderText: root.placeholderTexts[index]

=== modified file 'src/imports/ContactEdit/ContactEditor.qml'
--- src/imports/ContactEdit/ContactEditor.qml	2013-08-07 18:57:30 +0000
+++ src/imports/ContactEdit/ContactEditor.qml	2013-08-28 17:11:16 +0000
@@ -27,6 +27,12 @@
 
     property QtObject activeItem: null
 
+    // we use a custom toolbar in this view
+    tools: ToolbarItems {
+        locked: true
+        opened: false
+    }
+
     function save() {
         var changed = false
         for(var i = 0; i < contents.children.length; ++i) {

=== modified file 'src/imports/ContactEdit/TextInputDetail.qml'
--- src/imports/ContactEdit/TextInputDetail.qml	2013-07-25 21:47:36 +0000
+++ src/imports/ContactEdit/TextInputDetail.qml	2013-08-28 17:11:16 +0000
@@ -29,6 +29,8 @@
 
     signal removeClicked()
 
+    Component.onCompleted: makeMeVisible(root)
+
     focus: true
     text: originalValue ? originalValue : ""
     style: TextFieldStyle {

=== modified file 'src/imports/ContactView/ContactView.qml'
--- src/imports/ContactView/ContactView.qml	2013-07-26 15:56:16 +0000
+++ src/imports/ContactView/ContactView.qml	2013-08-28 17:11:16 +0000
@@ -33,7 +33,7 @@
 
         if (contact.name) {
             var detail = contact.name
-            return detail.firstName + "\n" + detail.lastName
+            return detail.firstName +" " + detail.lastName
         } else if (contact.displayLabel && contact.displayLabel.label && contact.displayLabel.label !== "") {
             return contact.displayLabel.label
         } else {

=== modified file 'src/imports/Ubuntu/Contacts/ContactDetailPickerPhoneNumberDelegate.qml'
--- src/imports/Ubuntu/Contacts/ContactDetailPickerPhoneNumberDelegate.qml	2013-08-01 01:15:45 +0000
+++ src/imports/Ubuntu/Contacts/ContactDetailPickerPhoneNumberDelegate.qml	2013-08-28 17:11:16 +0000
@@ -27,40 +27,73 @@
         id: phoneTypeModel
     }
 
-    height: details.height
+    height: details.height + units.gu(2)
     anchors {
         left: parent.left
         right: parent.right
     }
 
-    Column {
+    UbuntuShape {
         id: details
-        anchors.top: parent.top
         height: childrenRect.height
-        width: parent.width
-
-        Repeater {
-            model: contact ? contact.phoneNumbers : undefined
-            ListItem.Empty {
-                Column {
-                    anchors.verticalCenter: parent.verticalCenter
-                    anchors.left: parent.left
-                    anchors.right: parent.right
-                    anchors.leftMargin: units.gu(2)
-                    anchors.rightMargin: units.gu(2)
-                    Label {
-                        id: context
-                        text: phoneTypeModel.get(phoneTypeModel.getTypeIndex(modelData)).label
-                        fontSize: "small"
-                        color: "#a3a3a3"
-                    }
-                    Label {
-                        text: number
-                        fontSize: "large"
+        color: Qt.rgba(0,0,0,0.1)
+        anchors {
+            top: parent.top
+            //topMargin: units.gu(2)
+            left: parent.left
+            leftMargin: units.gu(2)
+            right: parent.right
+            rightMargin: units.gu(2)
+        }
+
+        Column {
+            id: detailItems
+            anchors.top: parent.top
+            height: childrenRect.height
+            width: parent.width
+
+            Repeater {
+                model: contact ? contact.phoneNumbers : undefined
+                ListItem.Empty {
+                    showDivider: false
+                    Column {
+                        anchors.verticalCenter: parent.verticalCenter
+                        anchors.left: parent.left
+                        anchors.right: parent.right
+                        anchors.leftMargin: units.gu(2)
+                        anchors.rightMargin: units.gu(2)
+                        Label {
+                            id: context
+                            text: phoneTypeModel.get(phoneTypeModel.getTypeIndex(modelData)).label
+                            fontSize: "small"
+                            opacity: 0.2
+                        }
+                        Label {
+                            text: number
+                            fontSize: "medium"
+                        }
+                    }
+
+                    onClicked: detailClicked(modelData)
+                    Image {
+                        height: units.gu(3)
+                        width: units.gu(3)
+                        source: "../assets/dialer_call.png"
+                        fillMode: Image.PreserveAspectFit
+                        anchors {
+                            right: parent.right
+                            verticalCenter: parent.verticalCenter
+                        }
+                    }
+                    ListItem.ThinDivider {
+                        visible: index != 0
+                        anchors {
+                            bottom: parent.top
+                            right: parent.right
+                            left: parent.left
+                        }
                     }
                 }
-
-                onClicked: detailClicked(modelData)
             }
         }
     }

=== modified file 'src/imports/Ubuntu/Contacts/ContactListView.qml'
--- src/imports/Ubuntu/Contacts/ContactListView.qml	2013-08-08 23:04:47 +0000
+++ src/imports/Ubuntu/Contacts/ContactListView.qml	2013-08-28 17:11:16 +0000
@@ -47,6 +47,7 @@
 
         ContactSimpleListView {
             header: ListItem.Header {
+                height: units.gu(5)
                 text: i18n.tr("Favourites")
             }
 
@@ -79,6 +80,7 @@
             }
         }
         ListItem.Header {
+            height: units.gu(5)
             text: i18n.tr("All contacts")
         }
     }

=== modified file 'src/imports/Ubuntu/Contacts/ContactSimpleListView.qml'
--- src/imports/Ubuntu/Contacts/ContactSimpleListView.qml	2013-08-27 17:13:04 +0000
+++ src/imports/Ubuntu/Contacts/ContactSimpleListView.qml	2013-08-28 17:11:16 +0000
@@ -223,17 +223,52 @@
             }
         }
 
-        ListItem.Subtitled {
+        ListItem.Empty {
             id: delegate
             property bool detailsShown: false
+            height: units.gu(10)
+            showDivider : false
 
             selected: contactListView.multiSelectionEnabled && contactListView.isSelected(item)
             removable: contactListView.swipeToDelete && !detailsShown && !isInSelectionMode
-            icon: contactListView.showAvatar && contact && contact.avatar && (contact.avatar.imageUrl != "") ?
-                      Qt.resolvedUrl(contact.avatar.imageUrl) :
-                      contactListView.defaultAvatarImageUrl
-            text: contactListView.formatToDisplay(contact, contactListView.titleDetail, contactListView.titleFields)
-            subText: contactListView.formatToDisplay(contact, contactListView.subTitleDetail, contactListView.subTitleFields)
+            UbuntuShape {
+                id: avatar
+                height: units.gu(7)
+                width: units.gu(7)
+                anchors {
+                    left: parent.left
+                    leftMargin: units.gu(2)
+                    verticalCenter: parent.verticalCenter
+                }
+                image: Image {
+
+                    source: contactListView.showAvatar && contact && contact.avatar && (contact.avatar.imageUrl != "") ?
+                                    Qt.resolvedUrl(contact.avatar.imageUrl) :
+                                    contactListView.defaultAvatarImageUrl
+                }
+            }
+
+            Row {
+                spacing: units.gu(1)
+                anchors {
+                    left: avatar.right
+                    leftMargin: units.gu(2)
+                    verticalCenter: parent.verticalCenter
+                }
+                Label {
+                    id: name
+                    height: paintedHeight
+                    text: contactListView.formatToDisplay(contact, contactListView.titleDetail, contactListView.titleFields)
+                    fontSize: "large"
+                }
+                Label {
+                    id: company
+                    height: paintedHeight
+                    text: contactListView.formatToDisplay(contact, contactListView.subTitleDetail, contactListView.subTitleFields)
+                    fontSize: "medium"
+                    opacity: 0.2
+                }
+            }
 
             onClicked: {
                 if (contactListView.isInSelectionMode) {
@@ -313,6 +348,14 @@
                 }
             }
         }
+        ListItem.ThinDivider {
+            anchors {
+                bottom: pickerLoader.bottom
+                right: parent.right
+                left: parent.left
+            }
+        }
+
         Connections {
             target: pickerLoader.item
             onDetailClicked: detailClicked(contact, detail)