address-book-app

Merge lp:~renatofilho/address-book-app/update-bottom-edge into lp:address-book-app

update-bottom-edge
Merge into trunk

Proposed by Renato Araujo Oliveira Filho on 2016-08-17

Status:	Merged
Approved by:	Bill Filler on 2016-08-19
Approved revision:	627
Merged at revision:	622
Proposed branch:	lp:~renatofilho/address-book-app/update-bottom-edge
Merge into:	lp:address-book-app
Diff against target:	804 lines (+200/-171) 13 files modified src/imports/ABContactEditorPage.qml (+1/-1) src/imports/ABContactListPage.qml (+71/-84) src/imports/ABContactViewPage.qml (+5/-5) src/imports/ABMultiColumnEmptyState.qml (+14/-6) src/imports/ABNewContactBottomEdge.qml (+37/-32) src/imports/MainWindow.qml (+15/-8) src/imports/Ubuntu/AddressBook/Base/ContactDetailBase.qml (+0/-1) src/imports/Ubuntu/AddressBook/Base/ContactDetailItem.qml (+5/-17) src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailNameEditor.qml (+7/-3) src/imports/Ubuntu/AddressBook/ContactEditor/ContactEditorPage.qml (+22/-14) src/imports/Ubuntu/Contacts/ContactListView.qml (+4/-0) src/imports/Ubuntu/Contacts/ContactSimpleListView.qml (+18/-0) tests/qml/tst_ContactEditor.qml (+1/-0)
To merge this branch:	bzr merge lp:~renatofilho/address-book-app/update-bottom-edge
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
system-apps-ci-bot	continuous-integration		Approve on 2016-08-19
Ubuntu Phablet Team		2016-08-17	Pending
Review via email: mp+303174@code.launchpad.net

Commit message

Keep bottom edge page live while changing app: munticolumn <-> single column

Revision history for this message

system-apps-ci-bot (system-apps-ci-bot) wrote on 2016-08-17:

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-address-book-app-ci/13/rebuild

review: Needs Fixing (continuous-integration)

lp:~renatofilho/address-book-app/update-bottom-edge updated on 2016-08-17

622. By Renato Araujo Oliveira Filho on 2016-08-17: Fix input hint for name field.

Revision history for this message

system-apps-ci-bot (system-apps-ci-bot) wrote on 2016-08-17:

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-address-book-app-ci/14/rebuild

review: Approve (continuous-integration)

lp:~renatofilho/address-book-app/update-bottom-edge updated on 2016-08-18

623. By Renato Araujo Oliveira Filho on 2016-08-18: Make sure that the recent created contact is visible after close edit page.

Revision history for this message

system-apps-ci-bot (system-apps-ci-bot) wrote on 2016-08-18:

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-address-book-app-ci/15/rebuild

review: Approve (continuous-integration)

lp:~renatofilho/address-book-app/update-bottom-edge updated on 2016-08-18

624. By Renato Araujo Oliveira Filho on 2016-08-18: Make sure that the Firs name get focus.

Revision history for this message

system-apps-ci-bot (system-apps-ci-bot) wrote on 2016-08-18:

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-address-book-app-ci/16/rebuild

review: Needs Fixing (continuous-integration)

lp:~renatofilho/address-book-app/update-bottom-edge updated on 2016-08-18

625. By Renato Araujo Oliveira Filho on 2016-08-18: Fixed contact editor enable state.
626. By Renato Araujo Oliveira Filho on 2016-08-18: Make sure that the edit page is enabled during the unit test.

Revision history for this message

system-apps-ci-bot (system-apps-ci-bot) wrote on 2016-08-18:

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-address-book-app-ci/17/rebuild

review: Approve (continuous-integration)

Revision history for this message

system-apps-ci-bot (system-apps-ci-bot) wrote on 2016-08-18:

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-address-book-app-ci/18/rebuild

review: Approve (continuous-integration)

lp:~renatofilho/address-book-app/update-bottom-edge updated on 2016-08-19

627. By Renato Araujo Oliveira Filho on 2016-08-19: Make sure that bootom edge works if settings page is opened.

Revision history for this message

system-apps-ci-bot (system-apps-ci-bot) wrote on 2016-08-19:

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-address-book-app-ci/19/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/ABContactEditorPage.qml'
 --- src/imports/ABContactEditorPage.qml	2016-01-04 20:03:58 +0000
 +++ src/imports/ABContactEditorPage.qml	2016-08-19 12:45:42 +0000
@@ -63,7 +63,7 @@
      onContactSaved: {
          if (pageStack.contactListPage) {
--            pageStack.contactListPage.moveListToContact(contact)
++            pageStack.contactListPage.onNewContactSaved(contact)
              pageStack.contactListPage.forceActiveFocus()
+         }
+     }
 === modified file 'src/imports/ABContactListPage.qml'
 --- src/imports/ABContactListPage.qml	2016-07-13 18:40:39 +0000
 +++ src/imports/ABContactListPage.qml	2016-08-19 12:45:42 +0000
@@ -37,12 +37,12 @@
      property bool pickMode: false
      property alias contentHubTransfer: contactExporter.activeTransfer
      property bool pickMultipleContacts: false
--    property QtObject contactIndex: null
      property alias contactManager: contactList.manager
      property var _busyDialog: null
      property bool _importingTestData: false
      property bool _creatingContact: false
++    property string _newContactId: ""
      readonly property string currentViewContactId: viewPage && viewPage.contact ? viewPage.contact.contactId : ""
      readonly property bool isEmpty: (contactList.count === 0)
@@ -110,7 +110,7 @@
      function showContact(contact)
+     {
--        var currentContact = contactList.listModel.contacts[contactList.currentIndex]
++        var currentContact = contactList.currentIndex != -1 ? contactList.listModel.contacts[contactList.currentIndex] : null
          if (currentContact && (mainPage.currentViewContactId === currentContact.contactId)) {
              // contact view already opened with this contact
              return
@@ -130,39 +130,45 @@
          if (pageStack.columns === 1)
              return
--        if (!emptyPage) {
++        var newEmptyPage = null
++        if (!mainPage.emptyPage) {
              contactList.currentIndex = -1
              pageStack.removePages(mainPage)
--            if ((pageStack.columns > 1) && !hasChildPage()) {
--                emptyPage  = pageStack.addFileToNextColumnSync(pageStack.primaryPage,
--                                                                        Qt.resolvedUrl("ABMultiColumnEmptyState.qml"),
--                                                                        { 'headerTitle': "",
--                                                                          'pageStack': mainPage.pageStack,
--                                                                          'model': mainPage.contactModel })
--                emptyPage.Component.onDestruction.connect(function() {
++            if (pageStack.columns) {
++                newEmptyPage  = pageStack.addFileToNextColumnSync(pageStack.primaryPage,
++                                                               Qt.resolvedUrl("ABMultiColumnEmptyState.qml"),
++                                                               { 'headerTitle': "",
++                                                                 'pageStack': mainPage.pageStack,
++                                                                 'model': mainPage.contactModel })
++                newEmptyPage.Component.onDestruction.connect(function() {
                      mainPage.emptyPage = null
                  })
+             }
++        } else {
++            newEmptyPage = mainPage.emptyPage
+         }
++
          if (openBottomEdge) {
--            mainPage.emptyPage.commitBottomEdge()
++            newEmptyPage.commitBottomEdge()
+         }
++        mainPage.emptyPage = newEmptyPage
++
+     }
      function showSettingsPage()
+     {
--        pageStack.removePages(mainPage)
--
--
          if (settingsPage) {
              settingsPage.Component.onDestruction.disconnect(clearSettingsPage)
+         }
          pageStack.removePages(mainPage)
          viewPage = null
++        settingsPage = null
++        emptyPage = null
++
          settingsPage = pageStack.addFileToNextColumnSync(mainPage,
                                                           Qt.resolvedUrl("./Settings/SettingsPage.qml"),
@@ -203,27 +209,8 @@
          contactList.startSelection()
+     }
--    function moveListToContact(contact)
--    {
--        if ((state !== "searching") &&
--            (state !== "vcardImported")) {
--            mainPage.state = "default"
--        }
--
--        contactIndex = contact
--        // this means a new contact was created
--        if (mainPage.allowToQuit) {
--            application.goBackToSourceApp()
--        }
--    }
--
--
      function onNewContactSaved(contact) {
--        _creatingContact = true
--        moveListToContact(contact)
--        if (pageStack.columns > 1) {
--            showContact(contact);
--        }
++        _newContactId = contact.contactId
+     }
      // Delay contact fetch for some msecs (check 'fetchNewContactTimer')
@@ -234,7 +221,7 @@
      function fetchContact()
+     {
--        if (pageStack.columns > 1 && !contactList.showNewContact) {
++        if (pageStack.columns > 1 && !contactList.showNewContact && !pageStack.bottomEdgeOpened) {
              var currentContact = null
              if (contactList.currentIndex >= 0)
                  currentContact = contactList.listModel.contacts[contactList.currentIndex]
@@ -306,8 +293,7 @@
          focus: true
          showImportOptions: !mainPage.pickMode &&
--                           pageStack.bottomEdge &&
--                           (pageStack.bottomEdge.status !== BottomEdge.Committed)
++                           !pageStack.bottomEdgeOpened
          anchors {
              top: parent.top
              topMargin: pageHeader.height
@@ -319,8 +305,8 @@
          filterTerm: searchField.text
          multiSelectionEnabled: true
          multipleSelection: (mainPage.pickMode && mainPage.pickMultipleContacts) || !mainPage.pickMode
--        showNewContact: (pageStack.columns > 1) && pageStack.bottomEdge && (pageStack.bottomEdge.status === BottomEdge.Committed)
--        highlightSelected: !showNewContact && pageStack.hasKeyboard && !mainPage._creatingContact
++        showNewContact: (pageStack.columns > 1) && pageStack.bottomEdgeOpened
++        highlightSelected: !showNewContact && pageStack.hasKeyboard && (mainPage._newContactId === "")
          onAddContactClicked: mainPage.createContactWithPhoneNumber(label)
          onContactClicked: mainPage.showContact(contact)
          onIsInSelectionModeChanged: mainPage.state = isInSelectionMode ? "selection"  : "default"
@@ -345,8 +331,7 @@
+         }
          onCurrentIndexChanged: {
--            if (!mainPage.contactIndex)
--                mainPage.delayFetchContact()
++            mainPage.delayFetchContact()
+         }
          onOnlineAccountFinished: {
@@ -367,7 +352,7 @@
          //because of that we need this
          Keys.onRightPressed: {
              // only move focus away when in edit mode
--            if (pageStack.bottomEdge.status === BottomEdge.Committed) {
++            if (pageStack.bottomEdgeOpened) {
                  var next = pageStack._nextItemInFocusChain(view, true)
                  if (next === searchField) {
                      pageStack._nextItemInFocusChain(next, true)
@@ -444,24 +429,25 @@
                              viewPage.cancelEdit()
+                         }
++
++                        if (pageStack.bottomEdgeOpened) {
++                            pageStack.closeBottomEdge()
++                        } else {
++                            showEmptyPage(false)
++                        }
                          mainPage.state = "searching"
                          contactList.showAllContacts()
--                        if (pageStack.bottomEdge) {
--                            pageStack.bottomEdge.collapse()
--                        } else {
--                            showEmptyPage(false)
--                        }
                          searchField.forceActiveFocus()
+                     }
                  },
                  Action {
                      iconName: "contact-new"
--                    enabled: visible && (!pageStack.bottomEdge || (pageStack.bottomEdge.enabled && (pageStack.bottomEdge.status === BottomEdge.Hidden)))
++                    enabled: visible && !pageStack.bottomEdgeOpened
                      visible: (pageStack.columns > 1)
                      shortcut: "Ctrl+N"
                      onTriggered: {
--                        if (pageStack.bottomEdge) {
--                            pageStack.bottomEdge.commit()
++                        if (!pageStack.bottomEdgeOpened && (viewPage || emptyPage)) {
++                            pageStack._bottomEdge.commit()
                          } else {
                              showEmptyPage(true)
+                         }
@@ -689,7 +675,7 @@
      KeyboardRectangle {
          id: keyboard
          active: mainPage.active &&
--                (pageStack.bottomEdge && (pageStack.bottomEdge.status === BottomEdge.Hidden))
++                !pageStack.bottomEdgeOpened
+     }
      ABEmptyState {
@@ -809,7 +795,7 @@
          id: bottomEdgeLoader
          enabled: false
--        active: (pageStack.columns === 1) && bottomEdgeLoader.enabled
++        active: true
          asynchronous: true
          sourceComponent: ABNewContactBottomEdge {
              id: bottomEdge
@@ -818,40 +804,40 @@
              hint.flickable: contactList.view
              pageStack: mainPage.pageStack
              enabled: mainPage.active
++            hintVisible: (pageStack.columns === 1) && bottomEdgeLoader.enabled
++            visible: hintVisible
+         }
+     }
++    Binding {
++        target: pageStack
++        property: '_bottomEdge'
++        value: bottomEdgeLoader.item
++        when: (bottomEdgeLoader.status === Loader.Ready) &&
++              (pageStack.columns === 1) &&
++              bottomEdgeLoader.enabled
++    }
++
      Action {
          iconName: "contact-new"
--        enabled: mainPage.active &&
--                 (bottomEdgeLoader.status === Loader.Ready) &&
--                 (bottomEdgeLoader.item.status === BottomEdge.Hidden)
++        enabled: mainPage.active && !mainPage.bottomEdgeOpened
          shortcut: "Ctrl+N"
          onTriggered: {
              bottomEdgeLoader.item.commit()
+         }
+     }
--
--    Binding {
--        target: pageStack
--        property: 'bottomEdge'
--        value: bottomEdgeLoader.item
--        when: bottomEdgeLoader.status == Loader.Ready
--    }
--
      Connections {
          target: mainPage.contactModel
          onContactsChanged: {
--            if (contactIndex) {
--                contactList.positionViewAtContact(mainPage.contactIndex)
--                mainPage.contactIndex = null
--                // at this point the operation has finished already
--                mainPage._creatingContact = false
--                mainPage.delayFetchContact()
++            // if is a new contact show it
++            if (mainPage._newContactId != "") {
++                contactList.positionViewAtContactId(mainPage._newContactId)
++                mainPage._newContactId = ""
+             }
+         }
++
          onImportCompleted: {
              if (mainPage._importingTestData) {
                  mainPage._importingTestData = false
@@ -879,22 +865,23 @@
+     }
      Connections {
--        target: pageStack.bottomEdge
--        onCommitCompleted: {
--            if (mainPage.state !== "default") {
--                mainPage.head.sections.selectedIndex = 0
--                mainPage.state = "default"
--            }
--        }
--        onCollapseCompleted: {
--            if (!mainPage._creatingContact) {
--                if (contactList.currentIndex === -1)
--                    contactList.currentIndex = 0
--                mainPage.delayFetchContact()
--            }
++        target: pageStack
++        onBottomEdgeOpenedChanged: {
++            if (pageStack.bottomEdgeOpened) {
++                if (mainPage.state !== "default") {
++                    mainPage.head.sections.selectedIndex = 0
++                    mainPage.state = "default"
++                }
++            } else {
++                if (mainPage._creatingContact === "") {
++                    if (contactList.currentIndex === -1)
++                        contactList.currentIndex = 0
++                    mainPage.delayFetchContact()
++                }
--            if (mainPage.status === "default") {
--                contactList.forceActiveFocus()
++                if (mainPage.status === "default") {
++                    contactList.forceActiveFocus()
++                }
+             }
+         }
+     }
 === modified file 'src/imports/ABContactViewPage.qml'
 --- src/imports/ABContactViewPage.qml	2016-02-13 02:35:02 +0000
 +++ src/imports/ABContactViewPage.qml	2016-08-19 12:45:42 +0000
@@ -41,7 +41,7 @@
              _editPage = null
+         }
          if (pageStack.bottomEdge) {
--            pageStack.bottomEdge.collapse()
++            pageStack.bottomEdge.close()
+         }
+     }
@@ -55,7 +55,7 @@
+     }
      // Shortcut in case of single column
--     Action {
++    Action {
          id: backAction
          name: "cancel"
@@ -123,7 +123,6 @@
      Loader {
          id: bottomEdgeLoader
--        active: (pageStack.columns > 1)
          asynchronous: true
          sourceComponent: ABNewContactBottomEdge {
              id: bottomEdge
@@ -135,13 +134,14 @@
              pageStack: root.pageStack
              hintVisible: false
              enabled: !root.editing
++            visible: (pageStack.columns > 1)
+         }
+     }
      Binding {
          target: pageStack
--        property: 'bottomEdge'
++        property: '_bottomEdge'
          value: bottomEdgeLoader.item
--        when: bottomEdgeLoader.status === Loader.Ready
++        when: (bottomEdgeLoader.status === Loader.Ready) && (pageStack.columns > 1)
+     }
+ }
 === modified file 'src/imports/ABMultiColumnEmptyState.qml'
 --- src/imports/ABMultiColumnEmptyState.qml	2016-05-10 15:51:21 +0000
 +++ src/imports/ABMultiColumnEmptyState.qml	2016-08-19 12:45:42 +0000
@@ -42,7 +42,7 @@
      function close()
+     {
          if (bottomEdge.item) {
--            bottomEdge.item.collapse()
++            bottomEdge.item.close()
+         }
+     }
@@ -64,12 +64,12 @@
      Loader {
          id: bottomEdgeLoader
--        active: (pageStack.columns > 1)
          asynchronous: true
          sourceComponent: ABNewContactBottomEdge {
              id: bottomEdge
              hintVisible: false
++            visible: (pageStack.columns > 1)
              parent: root
              height: root.height
              modelToEdit: root.model
@@ -88,17 +88,25 @@
      Binding {
          target: pageStack
--        property: 'bottomEdge'
++        property: '_bottomEdge'
          value: bottomEdgeLoader.item
--        when: bottomEdgeLoader.status === Loader.Ready
++        when: (bottomEdgeLoader.status === Loader.Ready) && (pageStack.columns > 1)
+     }
++
++    // Remove empty page when app changes to 1 column mode
      Connections {
          target: pageStack
--        onColumnsChanged: {
--            if (pageStack.columns === 1) {
++        onBottomEdgeOpenedChanged: {
++            if (!pageStack.bottomEdgeOpened && (pageStack.columns === 1)) {
                  pageStack.removePages(root)
+             }
+         }
+     }
++    onActiveChanged: {
++        if (active && (pageStack.columns === 1)) {
++            pageStack.removePages(root)
++        }
++
++    }
+ }
 === modified file 'src/imports/ABNewContactBottomEdge.qml'
 --- src/imports/ABNewContactBottomEdge.qml	2016-02-12 23:03:19 +0000
 +++ src/imports/ABNewContactBottomEdge.qml	2016-08-19 12:45:42 +0000
@@ -26,11 +26,6 @@
      property var pageStack: null
      property alias hintVisible: bottomEdgeHint.visible
      property var _contactToEdit: null
--    // WORKAROUND: BottomEdge component loads the page async while draging it
--    // this cause a very bad visual.
--    // To avoid that we create it as soon as the component is ready and keep
--    // it invisible until the user start to drag it.
--    property var _realPage: null
      function editContact(contact)
+     {
@@ -38,6 +33,31 @@
          commit()
+     }
++    function close()
++    {
++        if (pageStack.bottomEdgeFloatingPage) {
++            pageStack.removePages(pageStack.bottomEdgeFloatingPage)
++        }
++    }
++
++    function pushPage()
++    {
++        var properties = {enabled: true,
++                          visible: true,
++                          parent: bottomEdge.parent}
++        if (bottomEdge._contactToEdit)
++            properties[contact] = bottomEdge._contactToEdit
++
++
++        var incubator = pageStack.addPageToNextColumn(bottomEdge.parent, editorPageBottomEdge, properties)
++        incubator.forceCompletion()
++        pageStack.bottomEdgeFloatingPage = incubator.object
++        incubator.object.Component.onDestruction.connect(function() {
++            pageStack.bottomEdgeFloatingPage = null
++        })
++        bottomEdge._contactToEdit = null
++    }
++
      hint {
          id: bottomEdgeHint
          action: Action {
@@ -48,42 +68,27 @@
+         }
+     }
--    contentComponent: Item {
--        id: pageContent
--
--        implicitWidth: bottomEdge.width
--        implicitHeight: bottomEdge.height
--        children: bottomEdge._realPage
--    }
--
++    contentComponent: editorPageBottomEdge
++    preloadContent: visible
      onCommitCompleted: {
--        if (bottomEdge._contactToEdit)
--            editorPage.contact = bottomEdge._contactToEdit
--        bottomEdge._contactToEdit = null
--    }
--
--    onCollapseCompleted: {
--        _realPage = editorPageBottomEdge.createObject(null)
--    }
--
--    Component.onCompleted:  {
--        _realPage = editorPageBottomEdge.createObject(null)
++        pushPage()
++        collapse()
+     }
      Component {
          id: editorPageBottomEdge
          ABContactEditorPage {
--            implicitWidth: bottomEdge.width
--            implicitHeight: bottomEdge.height
--            contact: ContactsUI.ContactsJS.createEmptyContact("", bottomEdge)
++            id: editorPageItem
++
++            implicitHeight: mainWindow.height
++            implicitWidth: parent ? parent.width : bottomEdge.width
++            enabled: false
              model: bottomEdge.modelToEdit
--            enabled: bottomEdge.status === BottomEdge.Committed
--            active: bottomEdge.status === BottomEdge.Committed
--            visible: bottomEdge.status !== BottomEdge.Hidden
--            onCanceled: bottomEdge.collapse()
--            onContactSaved: bottomEdge.collapse()
++            contact: ContactsUI.ContactsJS.createEmptyContact("", editorPageItem)
++            onCanceled: pageStack.removePages(editorPageItem)
++            onContactSaved: pageStack.removePages(editorPageItem)
              pageStack: bottomEdge.pageStack
+         }
+     }
 === modified file 'src/imports/MainWindow.qml'
 --- src/imports/MainWindow.qml	2016-07-14 18:22:28 +0000
 +++ src/imports/MainWindow.qml	2016-08-19 12:45:42 +0000
@@ -114,17 +114,21 @@
          objectName: "mainStack"
          property var contactListPage: null
--        property var bottomEdge: null
--        readonly property bool bottomEdgeOpened: (bottomEdge && bottomEdge.status === BottomEdge.Committed)
++        property var bottomEdgeFloatingPage: null
++        readonly property bool bottomEdgeOpened: bottomEdgeFloatingPage != null
          readonly property bool hasMouse: ((miceModel.count > 0) || (touchPadModel.count > 0))
          readonly property bool hasKeyboard: (keyboardsModel.count > 0)
++        property var _bottomEdge: null
++
++        function closeBottomEdge()
++        {
++            if (bottomEdgeFloatingPage)
++                mainStack.removePages(bottomEdgeFloatingPage);
++        }
          function resetStack()
+         {
--            if (bottomEdge)
--                bottomEdge.collapse()
              mainStack.removePages(primaryPage);
--
+         }
          function _nextItemInFocusChain(item, foward)
@@ -182,13 +186,16 @@
              if (mainStack.columns > 1) {
                  if (mainStack.contactListPage)
+                 {
--                    if (!mainStack.contactListPage.hasChildPage())
++                    if (!mainStack.contactListPage.hasChildPage() && !mainStack.bottomEdgeOpened)
++                        console.debug("Fech contact:" + mainStack.bottomEdgeOpened)
                          mainStack.contactListPage.delayFetchContact()
+                 }
                  else
+                 {
--                    if (!contactPage.hasChildPage())
++                    if (!contactPage.hasChildPage() && !mainStack.bottomEdgeOpened) {
++                        console.debug("Push empty page:" + mainStack.bottomEdgeOpened)
                          mainStack.addPageToNextColumn(contactPage, Qt.resolvedUrl("./ABMultiColumnEmptyState.qml"))
++                    }
+                 }
+             }
+         }
@@ -208,7 +215,7 @@
      // WORKAROUND: Due the missing feature on SDK, they can not detect if
      // there is a mouse attached to device or not. And this will cause the
--    // bootom edge component to not work correct on desktop.
++    // bottom edge component to not work correct on desktop.
      // We will consider that  a mouse is always attached until it get implement on SDK.
      Binding {
          target:  QuickUtils
 === modified file 'src/imports/Ubuntu/AddressBook/Base/ContactDetailBase.qml'
 --- src/imports/Ubuntu/AddressBook/Base/ContactDetailBase.qml	2015-12-10 19:15:15 +0000
 +++ src/imports/Ubuntu/AddressBook/Base/ContactDetailBase.qml	2016-08-19 12:45:42 +0000
@@ -97,7 +97,6 @@
          } else if ((detail in detailNameMap) && (field == -1)){
              return detailNameMap[detail]
          } else {
--            console.debug("Unknown : [" + detail + "] [" + field + "]")
              return "unknown"
+         }
+     }
 === modified file 'src/imports/Ubuntu/AddressBook/Base/ContactDetailItem.qml'
 --- src/imports/Ubuntu/AddressBook/Base/ContactDetailItem.qml	2015-10-26 13:18:11 +0000
 +++ src/imports/Ubuntu/AddressBook/Base/ContactDetailItem.qml	2016-08-19 12:45:42 +0000
@@ -23,7 +23,7 @@
      id: root
      readonly property alias fieldDelegates: fieldsColumn.children
--    property Component fieldDelegate: null
++    property alias fieldDelegate: fieldRepeater.delegate
      property alias spacing: fieldsColumn.spacing
      implicitHeight: fieldsColumn.height
@@ -36,26 +36,14 @@
+         }
          spacing: units.gu(2)
--        height: childrenRect.height
++        //height: childrenRect.height
          Repeater {
              id: fieldRepeater
              model: root.fields
--            Loader {
--                id: field
--
--                sourceComponent: fieldDelegate
--                Binding {
--                    target: item
--                    property: "field"
--                    value: modelData
--                }
--
--                Binding {
--                    target: item
--                    property: "detail"
--                    value: root.detail
--                }
++            onItemAdded: {
++                item.field = Qt.binding(function() { return model[index] })
++                item.detail = Qt.binding(function() { return root.detail })
+             }
+         }
+     }
 === modified file 'src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailNameEditor.qml'
 --- src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailNameEditor.qml	2016-05-06 17:03:26 +0000
 +++ src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailNameEditor.qml	2016-08-19 12:45:42 +0000
@@ -96,11 +96,15 @@
+         }
          focus: true
--        width: root.width - units.gu(4)
--        x: units.gu(2)
++        anchors {
++            left: parent.left
++            right: parent.right
++            margins: units.gu(2)
++        }
++        height: units.gu(4)
          detail: root.detail
          visible: field === Name.MiddleName ? root.showMiddleName : true
--        height: visible ? units.gu(4) : 0
++
          placeholderText: placeholderTextFromField(field)
          inputMethodHints: Qt.ImhNoPredictiveText
          onTextChanged: checkIsEmpty()
 === modified file 'src/imports/Ubuntu/AddressBook/ContactEditor/ContactEditorPage.qml'
 --- src/imports/Ubuntu/AddressBook/ContactEditor/ContactEditorPage.qml	2016-05-04 19:42:04 +0000
 +++ src/imports/Ubuntu/AddressBook/ContactEditor/ContactEditorPage.qml	2016-08-19 12:45:42 +0000
@@ -43,6 +43,15 @@
      signal contactSaved(var contact);
      signal canceled()
++    function close() {
++        if (pageStack.removePages) {
++            pageStack.removePages(contactEditor)
++        } else {
++            pageStack.pop()
++        }
++    }
++
++
      function cancel() {
          for (var i = 0; i < contactEditor.newDetails.length; ++i) {
              contactEditor.contact.removeDetail(contactEditor.newDetails[i])
@@ -93,15 +102,11 @@
          if (changed) {
              // backend error will be handled by the root page (contact list)
              var newContact = (contact.model == null)
++            contactEditor.enabled = false
++            contact.onContactChanged.connect(contactEditor._onContactSaved)
              contactEditor.model.saveContact(contact)
--            if (newContact) {
--                contactEditor.contactSaved(contact)
--            }
--        }
--        if (pageStack.removePages) {
--            pageStack.removePages(contactEditor)
          } else {
--            pageStack.pop()
++            close()
+         }
+     }
@@ -174,6 +179,13 @@
+         }
+     }
++    function _onContactSaved()
++    {
++        contact.onContactChanged.disconnect(contactEditor._onContactSaved)
++        contactEditor.contactSaved(contact)
++        close()
++    }
++
      Timer {
          id: timerMakemakeMeVisible
@@ -196,7 +208,7 @@
+         }
+     }
--    enabled: false
++    enabled: active
      flickable: null
      Timer {
          id: focusTimer
@@ -482,15 +494,11 @@
+     }
      onActiveChanged: {
--        if (!active) {
++        if (!active || !enabled) {
              return
+         }
--        if (contactEditor.initialFocusSection != "") {
--            focusTimer.restart()
--        } else {
--            contactEditor.ready()
--        }
++        focusTimer.restart()
+     }
      Component {
 === modified file 'src/imports/Ubuntu/Contacts/ContactListView.qml'
 --- src/imports/Ubuntu/Contacts/ContactListView.qml	2016-06-21 00:57:29 +0000
 +++ src/imports/Ubuntu/Contacts/ContactListView.qml	2016-08-19 12:45:42 +0000
@@ -332,6 +332,10 @@
+     {
          view.positionViewAtContact(contact)
+     }
++    function positionViewAtContactId(contactId)
++    {
++        view.positionViewAtContactId(contactId)
++    }
      function positionViewAtBeginning()
+     {
          moveToBegining.restart()
 === modified file 'src/imports/Ubuntu/Contacts/ContactSimpleListView.qml'
 --- src/imports/Ubuntu/Contacts/ContactSimpleListView.qml	2016-02-05 16:07:45 +0000
 +++ src/imports/Ubuntu/Contacts/ContactSimpleListView.qml	2016-08-19 12:45:42 +0000
@@ -208,6 +208,24 @@
          positionViewAtIndex(currentIndex, ListView.Center)
+     }
++
++    /*!
++      Scroll the list to requested contact if the contact exists in the list
++    */
++    function positionViewAtContactId(contactId)
++    {
++        var contacts = listModel.contacts
++
++        for (var i = 0, count = contacts.length; i < count; i++) {
++            var c = contacts[i]
++            if (c.contactId === contactId) {
++                currentIndex = i
++                positionViewAtIndex(i, ListView.Center)
++                return
++            }
++        }
++    }
++
      /*!
        private
        Fetch contact and emit contact clicked signal
 === modified file 'tests/qml/tst_ContactEditor.qml'
 --- tests/qml/tst_ContactEditor.qml	2015-12-16 18:35:33 +0000
 +++ tests/qml/tst_ContactEditor.qml	2016-08-19 12:45:42 +0000
@@ -46,6 +46,7 @@
              anchors.fill: parent
              model: dummyDataModel
              contact: createEmptyContact('')
++            enabled: true
+         }
+     }

address-book-app

Merge lp:~renatofilho/address-book-app/update-bottom-edge into lp:address-book-app

Commit message

Description of the change

Preview Diff

Subscribers