Merge lp:~renatofilho/address-book-app/fix-1199109 into lp:address-book-app

[Renato Araujo Oliveira Filho]

Use single click to show contact details.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:10
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/35/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-saucy-amd64-ci/35
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-saucy-armhf-ci/35
        deb: http://jenkins.qa.ubuntu.com/job/address-book-app-saucy-armhf-ci/35/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-saucy-i386-ci/35

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

review: Approve (continuous-integration)

[Bill Filler (bfiller)]

Not working right. Single click always opens the details of the first contact in the list no matter which one you click on. Looks like the first contact is shown in a selected state. Should not be any selected state at all.

review: Needs Fixing

[lp:~renatofilho/address-book-app/fix-1199109]

11. By Renato Araujo Oliveira Filho on 2013-07-12

Removed missing files, and fixed one click to edit contacts.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:11
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/42/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-saucy-amd64-ci/42
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-saucy-armhf-ci/42
        deb: http://jenkins.qa.ubuntu.com/job/address-book-app-saucy-armhf-ci/42/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-saucy-i386-ci/42

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

review: Approve (continuous-integration)

[lp:~renatofilho/address-book-app/fix-1199109]

12. By Renato Araujo Oliveira Filho on 2013-07-12

Does not select any contact.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:12
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/43/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/address-book-app-saucy-amd64-ci/43/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/address-book-app-saucy-armhf-ci/43/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/address-book-app-saucy-i386-ci/43/console

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

review: Needs Fixing (continuous-integration)

[lp:~renatofilho/address-book-app/fix-1199109]

13. By Renato Araujo Oliveira Filho on 2013-07-12

Merged mailine.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:13
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/44/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-saucy-amd64-ci/44
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-saucy-armhf-ci/44
        deb: http://jenkins.qa.ubuntu.com/job/address-book-app-saucy-armhf-ci/44/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-saucy-i386-ci/44

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

review: Approve (continuous-integration)

[Bill Filler (bfiller)]

approved

review: Approve

=== modified file 'src/imports/ContactList/CMakeLists.txt'
--- src/imports/ContactList/CMakeLists.txt	2013-07-12 00:13:01 +0000
+++ src/imports/ContactList/CMakeLists.txt	2013-07-12 23:49:26 +0000
@@ -1,5 +1,4 @@
 set(CONTACT_LIST_QMLS
-    ContactList.js
     ContactList.qml
 )
 

=== removed file 'src/imports/ContactList/ContactList.js'
--- src/imports/ContactList/ContactList.js	2013-07-12 00:13:01 +0000
+++ src/imports/ContactList/ContactList.js	1970-01-01 00:00:00 +0000
@@ -1,45 +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/>.
- */
-
-var sectionData = [];
-var _sections = [];
-
-function initSectionData(list) {
-    if (!list || !list.model) {
-        return;
-    }
-
-    sectionData = [];
-    _sections = [];
-
-    var current = "",
-        prop = list.section.property,
-        item;
-
-    for (var i = 0, count = list.model.contacts.length; i < count; i++) {
-        item = list.sectionValueForContact(list.model.contacts[i])
-        if (item !== current) {
-            current = item;
-            _sections.push(current);
-            sectionData.push({ index: i, header: current });
-        }
-    }
-}
-
-function getIndexFor(sectionName) {
-    var val = sectionData[_sections.indexOf(sectionName)].index;
-    return val === 0 || val > 0 ? val : -1;
-}

=== modified file 'src/imports/ContactList/ContactList.qml'
--- src/imports/ContactList/ContactList.qml	2013-07-12 22:06:54 +0000
+++ src/imports/ContactList/ContactList.qml	2013-07-12 23:49:26 +0000
@@ -20,8 +20,6 @@
 import Ubuntu.Components.ListItems 0.1 as ListItem
 import Ubuntu.Components.Popups 0.1 as Popups
 
-import "ContactList.js" as Sections
-
 Page {
     id: mainPage
 
@@ -115,41 +113,15 @@
         }
 
         delegate: ListItem.Subtitled {
-            property variant contactObject: contact
-            property string contactId: contact.contactId
-            property string sectionName: ListView.section
-
             icon: contact && contact.avatar && (contact.avatar.imageUrl != "") ?  Qt.resolvedUrl(contact.avatar.imageUrl) : "artwork:/avatar-default.png"
-            text: contactListView.formatNameToDisplay(contactObject)
+            text: contactListView.formatNameToDisplay(contact)
             subText: contact && contact.phoneNumber ? contact.phoneNumber.number : ""
-            selected: contactListView.currentIndex === index
-
-            MouseArea {
-                anchors.fill:  parent
-                onClicked: {
-                    contactListView.currentIndex = index
-                }
-                onDoubleClicked: {
-                    pageStack.push(Qt.resolvedUrl("../ContactView/ContactView.qml"),
-                                   {model: contactsModel, contactId: contactListView.currentItem.contactObject.contactId})
-                }
-            }
-        }
-
-        UbuntuNumberAnimation { id: scroolToSectionAnimation; target: contactListView; property: "contentY"; }
-        function scroolToSection(targetSection) {
-            scroolToSectionAnimation.from = contactListView.contentY
-            contactListView.positionViewAtIndex(Sections.getIndexFor(targetSection), ListView.Beginning)
-            scroolToSectionAnimation.to = contactListView.contentY
-            scroolToSectionAnimation.running = true
-        }
-
-        // function used to build the section cache by "ContactList.js"
-        function sectionValueForContact(contact) {
-            if (contact) {
-                return contact.name && contact.name.firstName ? contact.name.firstName[0] : ""
-            } else {
-                return null
+
+            onClicked: {
+                contactListView.currentIndex = index
+                pageStack.push(Qt.resolvedUrl("../ContactView/ContactView.qml"),
+                               {model: contactsModel, contactId: contact.contactId})
+
             }
         }
     }