Merge lp:~fboucault/address-book-app/multicolumns into lp:address-book-app

[Florian Boucault]

Use AdaptivePageLayout instead of PageStack to support multi column layouts.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:471
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/905/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/208/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4008/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4005/console

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

review: Needs Fixing (continuous-integration)

[lp:~fboucault/address-book-app/multicolumns]

472. By Florian Boucault on 2015-09-04

Merged from toolkit13

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:472
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/907/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/210
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4020
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3281
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4017
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4017/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/23065

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

review: Needs Fixing (continuous-integration)

[Renato Araujo Oliveira Filho (renatofilho)]

- Is correct that the edit page has a small header than other pages?
- Is correct that when opening the edit page from the bottom edge it fills only the right side page? Keeping the left side page empty?

[lp:~fboucault/address-book-app/multicolumns]

473. By Florian Boucault on 2015-09-04

Merged from toolkit13

[Florian Boucault (fboucault)]

> - Is correct that the edit page has a small header than other pages?

I'm not sure why the new contact page has a smaller header. That will probably be fixed anyway with the next MR that changes the bottom edge.

> - Is correct that when opening the edit page from the bottom edge it fills
> only the right side page? Keeping the left side page empty?

I intend to fix that in the next merge request as this is not good UX wise but not a regression.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:473
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/909/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/212
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4025
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3284
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4022
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4022/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/23069

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

review: Needs Fixing (continuous-integration)

[lp:~fboucault/address-book-app/multicolumns]

474. By Florian Boucault on 2015-10-16

Merged from toolkit13

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:474
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/959/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/262
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4681
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3775
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4678
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4678/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/24286

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

review: Needs Fixing (continuous-integration)

[Renato Araujo Oliveira Filho (renatofilho)]

Looks good.

review: Approve

=== modified file 'src/imports/ABContactListPage.qml'
--- src/imports/ABContactListPage.qml	2015-10-16 13:35:56 +0000
+++ src/imports/ABContactListPage.qml	2015-10-16 13:35:56 +0000
@@ -66,25 +66,29 @@
                                          enabled: false,
                                          initialFocusSection: "name"})
         } else {
-            pageStack.push(Qt.resolvedUrl("ABContactEditorPage.qml"),
-                           {model: contactList.listModel,
-                            contact: newContact,
-                            initialFocusSection: "name"})
+            pageStack.addPageToNextColumn(mainPage,
+                                          Qt.resolvedUrl("ABContactEditorPage.qml"),
+                                          {model: contactList.listModel,
+                                           contact: newContact,
+                                           initialFocusSection: "name"})
         }
     }
 
     function showContact(contactId)
     {
-        pageStack.push(Qt.resolvedUrl("ABContactViewPage.qml"),
-                       {model: contactList.listModel, contactId: contactId})
+        pageStack.addPageToNextColumn(mainPage,
+                                      Qt.resolvedUrl("ABContactViewPage.qml"),
+                                      {model: contactList.listModel,
+                                       contactId: contactId})
     }
 
     function addPhoneToContact(contactId, phoneNumber)
     {
-        pageStack.push(Qt.resolvedUrl("ABContactViewPage.qml"),
-                       {model: contactList.listModel,
-                        contactId: contactId,
-                        addPhoneToContact: phoneNumber})
+        pageStack.addPageToNextColumn(mainPage,
+                                      Qt.resolvedUrl("ABContactViewPage.qml"),
+                                      {model: contactList.listModel,
+                                       contactId: contactId,
+                                       addPhoneToContact: phoneNumber})
     }
 
     function importContact(urls)
@@ -149,9 +153,10 @@
 
         onContactClicked: {
             mainPage.state = "default"
-            pageStack.push(Qt.resolvedUrl("ABContactViewPage.qml"),
-                           {model: contactList.listModel,
-                            contact: contact})
+            pageStack.addPageToNextColumn(mainPage,
+                                          Qt.resolvedUrl("ABContactViewPage.qml"),
+                                          {model: contactList.listModel,
+                                           contact: contact})
         }
         onIsInSelectionModeChanged: mainPage.state = isInSelectionMode ? "selection"  : "default"
         onSelectionCanceled: {
@@ -241,8 +246,9 @@
                 Action {
                     text: i18n.tr("Settings")
                     iconName: "settings"
-                    onTriggered: pageStack.push(Qt.resolvedUrl("./Settings/SettingsPage.qml"),
-                                                {"contactListModel": contactList.listModel})
+                    onTriggered: pageStack.addPageToNextColumn(mainPage,
+                                                               Qt.resolvedUrl("./Settings/SettingsPage.qml"),
+                                                               {"contactListModel": contactList.listModel})
                 }
             ]
             PropertyChanges {
@@ -481,9 +487,10 @@
             // Share contacts to an application chosen by the user
             if (!mainPage.pickMode) {
                 contactExporter.dismissBusyDialog()
-                pageStack.push(contactShareComponent,
-                               { contactModel: contactExporter.contactModel,
-                                 contacts: contacts })
+                pageStack.addPageToNextColumn(mainPage,
+                                              contactShareComponent,
+                                              {contactModel: contactExporter.contactModel,
+                                               contacts: contacts })
             }
         }
     }
 
=== modified file 'src/imports/ABContactViewPage.qml'
--- src/imports/ABContactViewPage.qml	2015-10-16 13:35:56 +0000
+++ src/imports/ABContactViewPage.qml	2015-10-16 13:35:56 +0000
@@ -35,7 +35,10 @@
             text: i18n.tr("Share")
             iconName: "share"
             onTriggered: {
-                pageStack.push(contactShareComponent, {contactModel: root.model, contacts: [root.contact]})
+                pageStack.addPageToCurrentColumn(root,
+                                                 contactShareComponent,
+                                                 {contactModel: root.model,
+                                                  contacts: [root.contact]})
             }
         },
         Action {
@@ -43,13 +46,15 @@
             text: i18n.tr("Edit")
             iconName: "edit"
             onTriggered: {
-                pageStack.push(Qt.resolvedUrl("ABContactEditorPage.qml"),
-                               { model: root.model, contact: root.contact})
+                pageStack.addPageToCurrentColumn(root,
+                                                 Qt.resolvedUrl("ABContactEditorPage.qml"),
+                                                 {model: root.model,
+                                                  contact: root.contact})
             }
         }
     ]
 
-    onContactRemoved: pageStack.pop()
+    onContactRemoved: pageStack.removePages(root)
 
     extensions: ContactDetailSyncTargetView {
         contact: root.contact
@@ -68,11 +73,11 @@
             var newDetail = Qt.createQmlObject(detailSourceTemplate, contact)
             if (newDetail) {
                 contact.addDetail(newDetail)
-                pageStack.push(Qt.resolvedUrl("ABContactEditorPage.qml"),
-                               { model: root.model,
-                                 contact: contact,
-                                 initialFocusSection: "phones",
-                                 newDetails: [newDetail]})
+                pageStack.addPageToCurrentColumn(root, Qt.resolvedUrl("ABContactEditorPage.qml"),
+                                                 { model: root.model,
+                                                   contact: contact,
+                                                   initialFocusSection: "phones",
+                                                   newDetails: [newDetail]})
                 root.addPhoneToContact = ""
             }
         }
 
=== modified file 'src/imports/MainWindow.qml'
--- src/imports/MainWindow.qml	2015-10-16 13:35:56 +0000
+++ src/imports/MainWindow.qml	2015-10-16 13:35:56 +0000
@@ -35,7 +35,6 @@
         } else {
             console.error("Contact preview requested but ContactListPage not loaded")
         }
-        mainStack.quitOnDepth = 1
     }
 
     function create(phoneNumber)
@@ -99,28 +98,19 @@
         }
     }
 
-    width: units.gu(40)
+    width: units.gu(90)
     height: units.gu(71)
     anchorToKeyboard: false
 
-    PageStack {
+    AdaptivePageLayout {
         id: mainStack
 
+        primaryPage: contactPage
         property var contactListPage: null
-        property int quitOnDepth: -1
 
         function resetStack()
         {
-            while(depth > 1) {
-                pop()
-            }
-        }
-
-        onDepthChanged: {
-            if (depth === quitOnDepth) {
-                quitOnDepth = -1
-                application.goBackToSourceApp()
-            }
+            mainStack.removePages(primaryPage);
         }
 
         onContactListPageChanged: {
@@ -134,11 +124,14 @@
         anchors.fill: parent
     }
 
+    ABContactListPage {
+        id: contactPage
+    }
+
     Component.onCompleted: {
         application.elapsed()
         i18n.domain = "address-book-app"
         i18n.bindtextdomain("address-book-app", i18nDirectory)
-        mainStack.push(Qt.resolvedUrl("ABContactListPage.qml"))
         mainWindow.applicationReady()
     }
 
@@ -184,7 +177,6 @@
     // If application was called from uri handler and lost the focus reset the app to normal state
     onAppActiveChanged: {
         if (!appActive && mainStack.contactListPage) {
-            mainStack.quitOnDepth = -1
             mainStack.contactListPage.returnToNormalState()
         }
     }
 
=== modified file 'src/imports/Settings/SettingsPage.qml'
--- src/imports/Settings/SettingsPage.qml	2015-10-16 13:35:56 +0000
+++ src/imports/Settings/SettingsPage.qml	2015-10-16 13:35:56 +0000
@@ -71,7 +71,7 @@
             ListItem.Standard {
                 text: i18n.tr("Import from SIM")
                 progression: true
-                onClicked: pageStack.push(simCardImportPageComponent)
+                onClicked: pageStack.addPageToCurrentColumn(root, simCardImportPageComponent)
                 enabled: (simList.sims.length > 0) && (simList.present.length > 0)
             }
         }
 
=== modified file 'src/imports/Ubuntu/AddressBook/ContactEditor/ContactEditorPage.qml'
--- src/imports/Ubuntu/AddressBook/ContactEditor/ContactEditorPage.qml	2015-10-16 13:35:56 +0000
+++ src/imports/Ubuntu/AddressBook/ContactEditor/ContactEditorPage.qml	2015-10-16 13:35:56 +0000
@@ -55,7 +55,7 @@
                 field.cancel()
             }
         }
-        pageStack.pop()
+        pageStack.removePages(contactEditor)
     }
 
     function save() {
@@ -93,7 +93,7 @@
                 contactEditor.contactSaved(contact)
             }
         }
-        pageStack.pop()
+        pageStack.removePages(contactEditor)
     }
 
     function makeMeVisible(item) {
@@ -473,8 +473,7 @@
             // WORKAROUND: SDK element crash if pop the page where the dialog was created
             Component.onDestruction: {
                 if (popPages) {
-                    contactEditor.pageStack.pop() // editor page
-                    contactEditor.pageStack.pop() // view page
+                    contactEditor.pageStack.removePages(contactEditor)
                 }
             }
         }
 
=== modified file 'src/imports/Ubuntu/AddressBook/ContactShare/ContactSharePage.qml'
--- src/imports/Ubuntu/AddressBook/ContactShare/ContactSharePage.qml	2015-10-16 13:35:56 +0000
+++ src/imports/Ubuntu/AddressBook/ContactShare/ContactSharePage.qml	2015-10-16 13:35:56 +0000
@@ -48,13 +48,13 @@
             if (exporter.activeTransfer) {
                 exporter.activeTransfer.state = ContentHub.ContentTransfer.Aborted
             }
-            pageStack.pop()
+            pageStack.removePages(root)
         }
     }
 
     ContactExporter {
         id: exporter
 
-        onDone: pageStack.pop()
+        onDone: pageStack.removePages(root)
     }
 }
 
=== modified file 'src/imports/Ubuntu/Contacts/ContactListView.qml'
--- src/imports/Ubuntu/Contacts/ContactListView.qml	2015-10-16 13:35:56 +0000
+++ src/imports/Ubuntu/Contacts/ContactListView.qml	2015-10-16 13:35:56 +0000
@@ -466,10 +466,10 @@
                     visible: (typeof(pageStack) !== "undefined") &&
                              ((simList.sims.length > 0) && (simList.present.length > 0))
                     onClicked: {
-                        pageStack.push(Qt.resolvedUrl("SIMCardImportPage.qml"),
-                                       {"objectName": "simCardImportPage",
-                                        "targetModel": view.listModel,
-                                        "sims": simList.sims})
+                        pageStack.addPageToNextColumn(pageStack.primaryPage, Qt.resolvedUrl("SIMCardImportPage.qml"),
+                                                      {"objectName": "simCardImportPage",
+                                                       "targetModel": view.listModel,
+                                                       "sims": simList.sims})
                     }
                 }
             }
 
=== modified file 'src/imports/Ubuntu/Contacts/ContactSimpleListView.qml'
--- src/imports/Ubuntu/Contacts/ContactSimpleListView.qml	2015-10-16 13:35:56 +0000
+++ src/imports/Ubuntu/Contacts/ContactSimpleListView.qml	2015-10-16 13:35:56 +0000
@@ -260,7 +260,8 @@
 
         flicking: contactListView.flicking
         width: parent.width
-        selected: contactListView.multiSelectionEnabled && contactListView.isSelected(contactDelegate)
+        selected: (contactListView.multiSelectionEnabled && contactListView.isSelected(contactDelegate))
+               || index === contactListView.currentIndex
         selectionMode: contactListView.isInSelectionMode
         defaultAvatarUrl: contactListView.defaultAvatarImageUrl
         isCurrentItem: ListView.isCurrentItem
 
=== modified file 'src/imports/Ubuntu/Contacts/ListItemWithActions.qml'
--- src/imports/Ubuntu/Contacts/ListItemWithActions.qml	2015-10-16 13:35:56 +0000
+++ src/imports/Ubuntu/Contacts/ListItemWithActions.qml	2015-10-16 13:35:56 +0000
@@ -164,7 +164,7 @@
     states: [
         State {
             name: "select"
-            when: selectionMode || selected
+            when: selectionMode
             PropertyChanges {
                 target: selectionIcon
                 source: Qt.resolvedUrl("ListItemWithActionsCheckBox.qml")
 
=== modified file 'src/imports/Ubuntu/Contacts/PageWithBottomEdge.qml'
--- src/imports/Ubuntu/Contacts/PageWithBottomEdge.qml	2015-10-16 13:35:56 +0000
+++ src/imports/Ubuntu/Contacts/PageWithBottomEdge.qml	2015-10-16 13:35:56 +0000
@@ -103,7 +103,7 @@
     {
         if (edgeLoader.status === Loader.Ready) {
             edgeLoader.item.active = true
-            page.pageStack.push(edgeLoader.item)
+            page.pageStack.addPageToCurrentColumn(page, edgeLoader.item)
             if (edgeLoader.item.flickable) {
                 edgeLoader.item.flickable.contentY = -page.header.height
                 edgeLoader.item.flickable.returnToBounds()
 
=== modified file 'src/imports/Ubuntu/Contacts/SIMCardImportPage.qml'
--- src/imports/Ubuntu/Contacts/SIMCardImportPage.qml	2015-10-16 13:35:56 +0000
+++ src/imports/Ubuntu/Contacts/SIMCardImportPage.qml	2015-10-16 13:35:56 +0000
@@ -100,7 +100,7 @@
         showBusyIndicator: false
 
         manager: "memory"
-        onSelectionCanceled: pageStack.pop()
+        onSelectionCanceled: pageStack.removePages(root)
     }
 
     Label {
@@ -167,7 +167,7 @@
             if ((error === ContactModel.ExportNoError) && targetModel) {
                 targetModel.importContacts(url)
              }
-            pageStack.pop()
+            pageStack.removePages(root)
         }
     }