address-book-app

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

fix-1199983
Merge into trunk

Proposed by Renato Araujo Oliveira Filho on 2013-09-11

Status:

Merged

Approved by:

Renato Araujo Oliveira Filho on 2013-09-24

Approved revision:

Merged at revision:

Proposed branch:

lp:~renatofilho/address-book-app/fix-1199983

Merge into:

lp:address-book-app

Diff against target:

139 lines (+61/-1)

4 files modified

src/imports/ContactEdit/ContactEditor.qml (+1/-0)
src/imports/ContactList/ContactListPage.qml (+3/-0)
src/imports/Ubuntu/Contacts/ContactSimpleListView.qml (+56/-1)
src/imports/main.qml (+1/-0)

To merge this branch:

bzr merge lp:~renatofilho/address-book-app/fix-1199983

Critical

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Approve on 2013-09-23
Bill Filler (community)		2013-09-11	Approve on 2013-09-23
Review via email: mp+185057@code.launchpad.net

Commit message

Move list view to new contact after creation.

Description of the change

To test this you will need this qtpim branch: https://codereview.qt-project.org/62404

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-09-11:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Bill Filler (bfiller) wrote on 2013-09-13:

if the list is not expanded then you don't see the new contact. Whenever a new contact is added the list should be expanded if it's collapsed so the contact becomes visible

review: Needs Fixing

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-09-13:

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

review: Approve (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-09-13:

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

review: Approve (continuous-integration)

Revision history for this message

Bill Filler (bfiller) wrote on 2013-09-18:

If the list is not expanded, then it won't scroll the new entry into view.

Steps to reproduce
1) have enough contacts to fill more than one page
2) collapse the list
3) add a contact with name "Zzzz Zzzz"

Expected results:
- list expanded and new entry visible

Results:
- list expanded but new entry not visible

review: Needs Fixing

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-09-19:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-09-19:

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

review: Approve (continuous-integration)

Revision history for this message

Bill Filler (bfiller) wrote on 2013-09-23:

test, works

review: Approve

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-09-23:

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/address-book-app-autolanding/65/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/address-book-app-saucy-amd64-autolanding/65/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/address-book-app-saucy-armhf-autolanding/65/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/address-book-app-saucy-i386-autolanding/65/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/3868/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/1406/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/3890/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1408/console

review: Needs Fixing (continuous-integration)

lp:~renatofilho/address-book-app/fix-1199983 updated on 2013-09-23

53. By Renato Araujo Oliveira Filho on 2013-09-23: Merged mainline.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-09-23:

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

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Renato Araujo Oliveira Filho

Rufus

Ubuntu Phablet Team

 === modified file 'src/imports/ContactEdit/ContactEditor.qml'
 --- src/imports/ContactEdit/ContactEditor.qml	2013-09-23 20:30:17 +0000
 +++ src/imports/ContactEdit/ContactEditor.qml	2013-09-23 20:31:21 +0000
@@ -258,6 +258,7 @@
          onContactsChanged: {
              if (saving) {
++                pageStack.contactCreated(contactEditor.contact)
                  pageStack.pop()
              } else if (contactEditor.contact) {
                  for (var i=0; i < contactEditor.model.contacts.length; i++) {
 === modified file 'src/imports/ContactList/ContactListPage.qml'
 --- src/imports/ContactList/ContactListPage.qml	2013-09-17 22:19:02 +0000
 +++ src/imports/ContactList/ContactListPage.qml	2013-09-23 20:31:21 +0000
@@ -138,5 +138,8 @@
              pageStack.push(Qt.resolvedUrl("../ContactEdit/ContactEditor.qml"),
                             {model: contactList.listModel, contactId: contactId, newPhoneNumber: phoneNumber })
+         }
++        onContactCreated: {
++            contactList.positionViewAtContact(contact)
++        }
+     }
+ }
 === modified file 'src/imports/Ubuntu/Contacts/ContactSimpleListView.qml'
 --- src/imports/Ubuntu/Contacts/ContactSimpleListView.qml	2013-09-21 21:59:30 +0000
 +++ src/imports/Ubuntu/Contacts/ContactSimpleListView.qml	2013-09-23 20:31:21 +0000
@@ -149,6 +149,14 @@
        This property holds the current contact expanded
      */
      property int currentContactExpanded: -1
++
++    /*!
++      \qmlproperty bool animating
++
++      This property holds if the list is on animating state (expanding/collapsing)
++    */
++    readonly property alias animating: priv.animating
++
      /*!
        \qmlproperty bool showSections
@@ -169,6 +177,37 @@
      */
      signal detailClicked(QtObject contact, QtObject detail)
++    /*!
++      Retrieve the contact index inside of the list
++    */
++    function getIndex(contact)
++    {
++        var contacts = listModel.contacts;
++
++        for (var i = 0, count = contacts.length; i < count; i++) {
++            var itemId = contacts[i].contactId
++            if (itemId === contact.contactId) {
++                return i
++            }
++        }
++
++        return -1
++    }
++
++    /*!
++      Scroll the list to requested contact if the contact exists in the list
++    */
++    function positionViewAtContact(contact)
++    {
++        if (expanded) {
++            positionViewAtIndex(getIndex(contact), ListView.Center)
++        } else {
++            priv.pendingTargetIndex = getIndex(contact)
++            priv.pendingTargetMode = ListView.Center
++            expanded = true
++        }
++    }
++
      function formatToDisplay(contact, contactDetail, detailFields) {
          if (!contact) {
              return ""
@@ -192,7 +231,7 @@
+     }
      clip: true
--    snapMode: ListView.NoSnap
++    snapMode: ListView.SnapToItem
      section {
          property: showSections ? "contact.tag.tag" : ""
          criteria: ViewSection.FirstCharacter
@@ -236,6 +275,9 @@
          sourceComponent: height > units.gu(5) ? delegateItem : null
          asynchronous: false
          height: contactListView.expanded ? (((currentContactExpanded == index) && detailToPick != 0) ? delegateHeight : units.gu(10) ) : 0
++        onHeightChanged: {
++            priv.animating = (height != 0) && (height != units.gu(10))
++        }
          width: parent.width
          visible: loaderDelegate.status == Loader.Ready
@@ -256,6 +298,15 @@
              when: loaderDelegate.status == Loader.Ready
+         }
+     }
++
++    onAnimatingChanged: {
++        if (!animating && priv.pendingTargetIndex >= 0) {
++            contactListView.positionViewAtIndex(priv.pendingTargetIndex, priv.pendingTargetMode)
++            priv.pendingTargetIndex = -1
++            priv.pendingTargetMode = null
++        }
++    }
++
      Component {
         id: delegateItem
         Item {
@@ -524,6 +575,10 @@
          property int currentOperation: -1
          property string activeSection: ""
++        property bool animating: false
++
++        property int pendingTargetIndex: 0
++        property variant pendingTargetMode: null
          function scrollToSection() {
              var index = Sections.getIndexFor(activeSection)
 === modified file 'src/imports/main.qml'
 --- src/imports/main.qml	2013-09-23 20:30:17 +0000
 +++ src/imports/main.qml	2013-09-23 20:31:21 +0000
@@ -48,6 +48,7 @@
          signal contactRequested(string contactId)
          signal createContactRequested(string phoneNumber)
          signal editContatRequested(string contactId, string phoneNumber)
++        signal contactCreated(QtObject contact)
          anchors {
              fill: parent