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

[Renato Araujo Oliveira Filho]

Fixed page header.

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

576. By Renato Araujo Oliveira Filho on 2016-04-21

Fixed page header.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:576
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/1127/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/430
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6856
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/5189
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6867
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6867/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/28105

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

review: Needs Fixing (continuous-integration)

[Bill Filler (bfiller)]

Phone number is still obscured by header

review: Needs Fixing

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

577. By Renato Araujo Oliveira Filho on 2016-04-26

Use fixed header for Setting page.

[Renato Araujo Oliveira Filho (renatofilho)]

@bfiller, sorry I discovery that SDK header still buggy in some situations. After a discussion with SDK guys we agree in use fixed headers for now.

Silo is up-to-date now.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:577
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/1128/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/431
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6877
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/5205
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6888
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6888/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/28128

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

review: Approve (continuous-integration)

=== modified file 'src/imports/Settings/SettingsPage.qml'
--- src/imports/Settings/SettingsPage.qml	2016-03-09 19:23:46 +0000
+++ src/imports/Settings/SettingsPage.qml	2016-04-26 00:49:02 +0000
@@ -27,7 +27,12 @@
 
     property var contactListModel
 
-    title: i18n.tr("Settings")
+    header: PageHeader {
+        id: pageHeader
+
+        title: i18n.tr("Settings")
+        flickable: null
+    }
 
     ContactsUI.SIMList {
         id: simList
@@ -37,11 +42,15 @@
         id: myself
     }
 
-    flickable: null
     Flickable {
         id: numberFlickable
         contentHeight: childrenRect.height
-        anchors.fill: parent
+        anchors {
+            top: pageHeader.bottom
+            left: parent.left
+            right: parent.right
+            bottom: parent.bottom
+        }
         clip: true
 
         Column {

=== modified file 'src/imports/Ubuntu/Contacts/SIMCardImportPage.qml'
--- src/imports/Ubuntu/Contacts/SIMCardImportPage.qml	2016-02-04 14:15:10 +0000
+++ src/imports/Ubuntu/Contacts/SIMCardImportPage.qml	2016-04-26 00:49:02 +0000
@@ -33,7 +33,50 @@
 
     signal importCompleted()
 
-    title: i18n.dtr("address-book-app", "SIM contacts")
+    header: PageHeader {
+        id: pageHeader
+
+        title: i18n.dtr("address-book-app", "SIM contacts")
+        flickable: contactList.view
+        trailingActionBar {
+            actions: [
+                Action {
+                    text: (contactList.selectedItems.count === contactList.count) ?
+                              i18n.dtr("address-book-app", "Unselect All") :
+                              i18n.dtr("address-book-app", "Select All")
+                    iconName: "select"
+                    onTriggered: {
+                        if (contactList.selectedItems.count === contactList.count) {
+                            contactList.clearSelection()
+                        } else {
+                            contactList.selectAll()
+                        }
+                    }
+                    visible: (contactList.count > 0)
+                },
+                Action {
+                    text: i18n.dtr("address-book-app", "Import")
+                    objectName: "confirmImport"
+
+                    iconName: "tick"
+                    enabled: (contactList.selectedItems.count > 0)
+                    onTriggered: {
+                        root.state = "importing"
+                        var contacts = []
+                        var items = contactList.selectedItems
+
+                        for (var i=0, iMax=items.count; i < iMax; i++) {
+                            contacts.push(items.get(i).model.contact)
+                        }
+
+                        contactList.listModel.exportContacts(root.exportFile,
+                                                             [],
+                                                             contacts)
+                    }
+                }
+            ]
+        }
+    }
 
     function lockedSIMCount()
     {
@@ -197,42 +240,7 @@
         }
     }
 
-    head.actions: [
-        Action {
-            text: (contactList.selectedItems.count === contactList.count) ?
-                      i18n.dtr("address-book-app", "Unselect All") :
-                      i18n.dtr("address-book-app", "Select All")
-            iconName: "select"
-            onTriggered: {
-                if (contactList.selectedItems.count === contactList.count) {
-                    contactList.clearSelection()
-                } else {
-                    contactList.selectAll()
-                }
-            }
-            visible: (contactList.count > 0)
-        },
-        Action {
-            text: i18n.dtr("address-book-app", "Import")
-            objectName: "confirmImport"
-
-            iconName: "tick"
-            enabled: (contactList.selectedItems.count > 0)
-            onTriggered: {
-                root.state = "importing"
-                var contacts = []
-                var items = contactList.selectedItems
-
-                for (var i=0, iMax=items.count; i < iMax; i++) {
-                    contacts.push(items.get(i).model.contact)
-                }
-
-                contactList.listModel.exportContacts(root.exportFile,
-                                                     [],
-                                                     contacts)
-            }
-        }
-    ]
+
 
     states: [
         State {