Merge lp:~renatofilho/dialer-app/favorites-contacts into lp:dialer-app

[Renato Araujo Oliveira Filho]

Add header section on ContactsPage to allow the user to switch between the "all" and "favorites" contacts.
Add an "Add new" button on contact list header.

[Renato Araujo Oliveira Filho (renatofilho)]

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

Is your branch in sync with latest trunk? YES

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

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

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

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

[lp:~renatofilho/dialer-app/favorites-contacts]

218. By Renato Araujo Oliveira Filho on 2014-08-12

use i18n.tr for strings on page header section.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:218
http://jenkins.qa.ubuntu.com/job/dialer-app-ci/380/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dialer-app-utopic-amd64-ci/151
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dialer-app-utopic-armhf-ci/150
        deb: http://jenkins.qa.ubuntu.com/job/dialer-app-utopic-armhf-ci/150/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dialer-app-utopic-i386-ci/151
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/3434/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/2696
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4681/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/2181
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2973
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2973/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/dialer-app-ci/380/rebuild

review: Needs Fixing (continuous-integration)

[Gustavo Pichorim Boiko (boiko)]

10 - property QtObject contact
11 + property QtObject contact

This change is not needed and breaks indentation.

review: Needs Fixing

[lp:~renatofilho/dialer-app/favorites-contacts]

219. By Renato Araujo Oliveira Filho on 2014-08-13

Fixed identation.

[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.
No, but the failure is not related to this MR

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

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:219
http://jenkins.qa.ubuntu.com/job/dialer-app-ci/384/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dialer-app-utopic-amd64-ci/155
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dialer-app-utopic-armhf-ci/154
        deb: http://jenkins.qa.ubuntu.com/job/dialer-app-utopic-armhf-ci/154/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dialer-app-utopic-i386-ci/155
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/3484
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/2741
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/3383
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4731
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4731/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/11407
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/2214
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3018
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3018/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/dialer-app-ci/384/rebuild

review: Needs Fixing (continuous-integration)

=== modified file 'src/qml/ContactsPage/ContactsPage.qml'
--- src/qml/ContactsPage/ContactsPage.qml	2014-08-01 14:59:45 +0000
+++ src/qml/ContactsPage/ContactsPage.qml	2014-08-13 15:18:51 +0000
@@ -26,10 +26,12 @@
 Page {
     id: contactsPage
     objectName: "contactsPage"
+
+    property QtObject contact
+
     title: i18n.tr("Contacts")
-    property QtObject contact
 
-    __customHeaderContents: TextField {
+    TextField {
         id: searchField
 
         anchors {
@@ -44,6 +46,77 @@
         onTextChanged: contactList.currentIndex = -1
         inputMethodHints: Qt.ImhNoPredictiveText
         placeholderText: i18n.tr("Search...")
+        visible: false
+    }
+
+    state: "default"
+    states: [
+        PageHeadState {
+            id: defaultState
+
+            name: "default"
+            actions: [
+                Action {
+                    text: i18n.tr("Search")
+                    iconName: "search"
+                    onTriggered: {
+                        contactsPage.state = "searching"
+                        searchField.forceActiveFocus()
+                    }
+                }
+            ]
+            PropertyChanges {
+                target: contactsPage.head
+                actions: defaultState.actions
+                sections.model: [i18n.tr("All"), i18n.tr("Favorites")]
+            }
+            PropertyChanges {
+                target: searchField
+                text: ""
+                visible: false
+            }
+        },
+        PageHeadState {
+            id: searchingState
+
+            name: "searching"
+            backAction: Action {
+                iconName: "close"
+                text: i18n.tr("Cancel")
+                onTriggered: {
+                    contactList.forceActiveFocus()
+                    contactsPage.state = "default"
+                }
+            }
+
+            PropertyChanges {
+                target: contactsPage.head
+                backAction: searchingState.backAction
+                contents: searchField
+            }
+
+            PropertyChanges {
+                target: searchField
+                text: ""
+                visible: true
+            }
+        }
+    ]
+
+    Connections {
+        target: contactsPage.head.sections
+        onSelectedIndexChanged: {
+            switch (contactsPage.head.sections.selectedIndex) {
+            case 0:
+                contactList.showAllContacts()
+                break;
+            case 1:
+                contactList.showFavoritesContacts()
+                break;
+            default:
+                break;
+            }
+        }
     }
 
     // background
@@ -61,6 +134,67 @@
             right: parent.right
             bottom: keyboardRect.top
         }
+
+
+        header: Item {
+            id: addNewContactButton
+            objectName: "addNewContact"
+
+            anchors {
+                left: parent.left
+                right: parent.right
+            }
+            height: units.gu(8)
+
+            Rectangle {
+                anchors.fill: parent
+                color: Theme.palette.selected.background
+                opacity: addNewContactButtonArea.pressed ?  1.0 : 0.0
+            }
+
+            UbuntuShape {
+                id: addIcon
+
+                anchors {
+                    left: parent.left
+                    top: parent.top
+                    bottom: parent.bottom
+                    margins: units.gu(1)
+                }
+                width: height
+                radius: "medium"
+                color: Theme.palette.normal.overlay
+                Image {
+                    anchors.centerIn: parent
+                    width: units.gu(2)
+                    height: units.gu(2)
+                    source: "image://theme/add"
+                }
+            }
+
+            Label {
+                id: name
+
+                anchors {
+                    left: addIcon.right
+                    leftMargin: units.gu(2)
+                    verticalCenter: parent.verticalCenter
+                    right: parent.right
+                    rightMargin: units.gu(2)
+                }
+                color: UbuntuColors.lightAubergine
+                text: i18n.tr("+ Create New")
+                elide: Text.ElideRight
+            }
+
+            MouseArea {
+                id: addNewContactButtonArea
+
+                anchors.fill: parent
+                onClicked: mainView.createNewContactForPhone(" ")
+            }
+        }
+
         onInfoRequested: {
            mainView.viewContact(contact.contactId)
         }

=== modified file 'src/qml/dialer-app.qml'
--- src/qml/dialer-app.qml	2014-08-01 14:59:45 +0000
+++ src/qml/dialer-app.qml	2014-08-13 15:18:51 +0000
@@ -84,6 +84,11 @@
         return false;
     }
 
+    function createNewContactForPhone(phoneNumber)
+    {
+        Qt.openUrlExternally("addressbook:///create?callback=dialer-app.desktop&phone=" + encodeURIComponent(phoneNumber))
+    }
+
     function viewContact(contactId) {
         Qt.openUrlExternally("addressbook:///contact?callback=dialer-app.desktop&id=" + encodeURIComponent(contactId))
     }