Merge lp:~renatofilho/address-book-app/split-contactlist into lp:~phablet-team/address-book-app/staging

[Renato Araujo Oliveira Filho]

[Contacts] Split ContactListView in two components (ContactListView and ContactListModel)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:244
http://jenkins.qa.ubuntu.com/job/phablet-team-address-book-app-staging-ci/285/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/3613
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/2829
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-team-address-book-app-staging-utopic-amd64-ci/285
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-team-address-book-app-staging-utopic-armhf-ci/285
        deb: http://jenkins.qa.ubuntu.com/job/phablet-team-address-book-app-staging-utopic-armhf-ci/285/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-team-address-book-app-staging-utopic-i386-ci/285
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/3498
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4860
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4860/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/11560
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/2294
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3113
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3113/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/285/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:245
http://jenkins.qa.ubuntu.com/job/phablet-team-address-book-app-staging-ci/286/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/3621/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/2832
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-team-address-book-app-staging-utopic-amd64-ci/286
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-team-address-book-app-staging-utopic-armhf-ci/286
        deb: http://jenkins.qa.ubuntu.com/job/phablet-team-address-book-app-staging-utopic-armhf-ci/286/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-team-address-book-app-staging-utopic-i386-ci/286
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/3509/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4868
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4868/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/11575
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/2297
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3116
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3116/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/286/rebuild

review: Needs Fixing (continuous-integration)

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

244. By Renato Araujo Oliveira Filho on 2014-08-18

[Contacts] Split ContactListView in two components (ContactListView and ContactListModel)

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

If you changed UI labels, did you update the pot file? NO NECESSARY

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

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

245. By Renato Araujo Oliveira Filho on 2014-08-18

Merged parent branch.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:245
http://jenkins.qa.ubuntu.com/job/phablet-team-address-book-app-staging-ci/305/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/4019
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3097
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-team-address-book-app-staging-utopic-i386-ci/305
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/3861
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5271
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5271/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/12080
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/2526
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3382
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3382/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/305/rebuild

review: Approve (continuous-integration)

[Tiago Salem Herrmann (tiagosh)]

Looks good. Works as expected.

review: Approve

=== modified file 'src/imports/Ubuntu/Contacts/CMakeLists.txt'
--- src/imports/Ubuntu/Contacts/CMakeLists.txt	2014-08-13 20:52:57 +0000
+++ src/imports/Ubuntu/Contacts/CMakeLists.txt	2014-08-18 18:28:33 +0000
@@ -22,6 +22,7 @@
     ContactDetailWithTypeView.qml
     ContactFetch.qml
     ContactList.js
+    ContactListModel.qml
     ContactListView.qml
     ContactPreviewPage.qml
     ContactSimpleListView.qml
 
=== added file 'src/imports/Ubuntu/Contacts/ContactListModel.qml'
--- src/imports/Ubuntu/Contacts/ContactListModel.qml	1970-01-01 00:00:00 +0000
+++ src/imports/Ubuntu/Contacts/ContactListModel.qml	2014-08-18 18:28:33 +0000
@@ -0,0 +1,171 @@
+    /*
+ * 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
+
+ContactModel {
+    id: root
+
+    property var externalFilter: null
+    property string filterTerm: ""
+    property bool onlyFavorites: false
+    property var view: null
+
+    /* internal */
+    property bool _clearModel: false
+    property list<QtObject> _extraFilters
+    property QtObject _timeout
+
+
+    function changeFilter(newFilter)
+    {
+        if (root.contacts.length > 0) {
+            root._clearModel = true
+        }
+        root.externalFilter = newFilter
+    }
+
+
+    filter: {
+        if (root._clearModel) {
+            return invalidFilter
+        } else if (contactsFilter.active) {
+            return contactsFilter
+        } else {
+            return null
+        }
+    }
+
+    _extraFilters: [
+        InvalidFilter {
+            id: invalidFilter
+        },
+        DetailFilter {
+            id: favouritesFilter
+
+            detail: ContactDetail.Favorite
+            field: Favorite.Favorite
+            value: true
+            matchFlags: DetailFilter.MatchExactly
+        },
+        UnionFilter {
+            id: contactTermFilter
+
+            property string value: ""
+
+            DetailFilter {
+                detail: ContactDetail.DisplayLabel
+                field: DisplayLabel.Label
+                value: contactTermFilter.value
+                matchFlags: DetailFilter.MatchContains
+            }
+
+            DetailFilter {
+                detail: ContactDetail.PhoneNumber
+                field: PhoneNumber.Number
+                value: contactTermFilter.value
+                matchFlags: DetailFilter.MatchPhoneNumber
+            }
+
+            DetailFilter {
+                detail: ContactDetail.PhoneNumber
+                field: PhoneNumber.Number
+                value: contactTermFilter.value
+                matchFlags: DetailFilter.MatchContains
+            }
+        },
+        IntersectionFilter {
+            id: contactsFilter
+
+            // avoid runtime warning "depends on non-NOTIFYable properties"
+            readonly property alias filtersProxy: contactsFilter.filters
+
+            property bool active: {
+                var filters_ = []
+                if (contactTermFilter.value.length > 0) {
+                    filters_.push(contactTermFilter)
+                } else if (root.onlyFavorites) {
+                    filters_.push(favouritesFilter)
+                }
+
+                if (root.externalFilter) {
+                    filters_.push(root.externalFilter)
+                }
+
+                // check if the filter has changed
+                var oldFilters = filtersProxy
+                if (oldFilters.length !== filters_.length) {
+                    contactsFilter.filters = filters_
+                } else {
+                    for(var i=0; i < oldFilters.length; i++) {
+                        if (filters_.indexOf(oldFilters[i]) === -1) {
+                            contactsFilter.filters = filters_
+                        }
+                    }
+                }
+
+                return (filters_.length > 0)
+            }
+        }
+    ]
+
+    _timeout: Timer {
+        id: contactSearchTimeout
+
+        running: false
+        repeat: false
+        interval: 300
+        onTriggered: {
+            if (root.view) {
+                view.positionViewAtBeginning()
+            }
+
+            root.changeFilter(root.externalFilter)
+            contactTermFilter.value = root.filterTerm
+
+            // manually update if autoUpdate is disabled
+            if (!root.autoUpdate) {
+                root.update()
+            }
+        }
+    }
+
+    onFilterTermChanged: contactSearchTimeout.restart()
+
+    onErrorChanged: {
+        if (error) {
+            console.error("Contact List error:" + error)
+        }
+    }
+
+    onContactsChanged: {
+        //WORKAROUND: clear the model before start populate it with the new contacts
+        //otherwise the model will wait for all contacts before show any new contact
+
+        //after all contacts get removed we can populate the model again, this will show
+        //new contacts as soon as it arrives in the model
+        if (root._clearModel && contacts.length === 0) {
+            root._clearModel = false
+            // do a new update if autoUpdate is false
+            if (!root.autoUpdate) {
+                root.update()
+            }
+
+        }
+    }
+}
+
 
=== modified file 'src/imports/Ubuntu/Contacts/ContactListView.qml'
--- src/imports/Ubuntu/Contacts/ContactListView.qml	2014-08-12 23:51:38 +0000
+++ src/imports/Ubuntu/Contacts/ContactListView.qml	2014-08-18 18:28:33 +0000
@@ -52,7 +52,7 @@
       This property holds a string that will be used to filter contacts on the list
       By default this is set to empty
     */
-    property string filterTerm: ""
+    property alias filterTerm: contactsModel.filterTerm
     /*!
       \qmlproperty Filter filter
 
@@ -60,7 +60,7 @@
 
       \sa Filter
     */
-    property var filter: null
+    property alias filter: contactsModel.externalFilter
     /*!
       \qmlproperty bool showAvatar
 
@@ -285,10 +285,7 @@
     }
     function changeFilter(newFilter)
     {
-        if (root.count > 0) {
-            contactsModel._clearModel = true
-        }
-        root.filter = newFilter
+        contactsModel.changeFilter(newFilter)
     }
     function reset()
     {
@@ -324,8 +321,6 @@
         contactsModel.update()
     }
 
-    onFilterTermChanged: contactSearchTimeout.restart()
-
     // colapse contacts if the keyboard appears
     Connections {
         target: Qt.inputMethod
@@ -341,7 +336,7 @@
         id: view
 
         property bool showFavourites: true
-        property bool favouritesIsSelected: false
+        property alias favouritesIsSelected: contactsModel.onlyFavorites
 
         function getSectionText(index) {
             var tag = listModel.contacts[index].tag.tag
@@ -488,139 +483,12 @@
         onContactDisappeared: root.contactDisappeared(contact)
         clip: true
 
-        InvalidFilter {
-            id: invalidFilter
-        }
-
-        DetailFilter {
-            id: favouritesFilter
-
-            detail: ContactDetail.Favorite
-            field: Favorite.Favorite
-            value: true
-            matchFlags: DetailFilter.MatchExactly
-        }
-
-        UnionFilter {
-            id: contactTermFilter
-
-            property string value: ""
-
-            DetailFilter {
-                detail: ContactDetail.DisplayLabel
-                field: DisplayLabel.Label
-                value: contactTermFilter.value
-                matchFlags: DetailFilter.MatchContains
-            }
-
-            DetailFilter {
-                detail: ContactDetail.PhoneNumber
-                field: PhoneNumber.Number
-                value: contactTermFilter.value
-                matchFlags: DetailFilter.MatchPhoneNumber
-            }
-
-            DetailFilter {
-                detail: ContactDetail.PhoneNumber
-                field: PhoneNumber.Number
-                value: contactTermFilter.value
-                matchFlags: DetailFilter.MatchContains
-            }
-        }
-
-
-        IntersectionFilter {
-            id: contactsFilter
-
-            // avoid runtime warning "depends on non-NOTIFYable properties"
-            readonly property alias filtersProxy: contactsFilter.filters
-
-            property bool active: {
-                var filters_ = []
-                if (contactTermFilter.value.length > 0) {
-                    filters_.push(contactTermFilter)
-                } else if (view.favouritesIsSelected) {
-                    filters_.push(favouritesFilter)
-                }
-
-                if (root.filter) {
-                    filters_.push(root.filter)
-                }
-
-                // check if the filter has changed
-                var oldFilters = filtersProxy
-                if (oldFilters.length !== filters_.length) {
-                    contactsFilter.filters = filters_
-                } else {
-                    for(var i=0; i < oldFilters.length; i++) {
-                        if (filters_.indexOf(oldFilters[i]) === -1) {
-                            contactsFilter.filters = filters_
-                        }
-                    }
-                }
-
-                return (filters_.length > 0)
-            }
-        }
-
-        Timer {
-            id: contactSearchTimeout
-
-            running: false
-            repeat: false
-            interval: 300
-            onTriggered: {
-                view.positionViewAtBeginning()
-
-                root.changeFilter(root.filter)
-                contactTermFilter.value = root.filterTerm
-
-                // manually update if autoUpdate is disabled
-                if (!root.autoUpdate) {
-                    contactsModel.update()
-                }
-            }
-        }
-
-        listModel: ContactModel {
+        listModel: ContactListModel {
             id: contactsModel
 
-            property bool _clearModel: false
-
             manager: root.manager
             sortOrders: root.sortOrders
             fetchHint: root.fetchHint
-            filter: {
-                if (contactsModel._clearModel) {
-                    return invalidFilter
-                } else if (contactsFilter.active) {
-                    return contactsFilter
-                } else {
-                    return null
-                }
-            }
-
-            onErrorChanged: {
-                if (error) {
-                    console.error("Contact List error:" + error)
-                }
-            }
-
-            onContactsChanged: {
-                //WORKAROUND: clear the model before start populate it with the new contacts
-                //otherwise the model will wait for all contacts before show any new contact
-
-                //after all contacts get removed we can populate the model again, this will show
-                //new contacts as soon as it arrives in the model
-                if (contactsModel._clearModel && contacts.length === 0) {
-                    contactsModel._clearModel = false
-                    // do a new update if autoUpdate is false
-                    if (!contactsModel.autoUpdate) {
-                        contactsModel.update()
-                    }
-
-                }
-            }
         }
     }
 
 
=== modified file 'src/imports/Ubuntu/Contacts/qmldir'
--- src/imports/Ubuntu/Contacts/qmldir	2014-08-13 20:52:57 +0000
+++ src/imports/Ubuntu/Contacts/qmldir	2014-08-18 18:28:33 +0000
@@ -6,6 +6,7 @@
 ContactDetailOnlineAccountTypeModel 0.1 ContactDetailOnlineAccountTypeModel.qml
 ContactDetailPhoneNumberTypeModel 0.1 ContactDetailPhoneNumberTypeModel.qml
 ContactFetch 0.1 ContactFetch.qml
+ContactListModel 0.1 ContactListModel.qml
 ContactListView 0.1 ContactListView.qml
 ContactPreviewPage 0.1 ContactPreviewPage.qml
 ListItemWithActions 0.1 ListItemWithActions.qml