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

[Renato Araujo Oliveira Filho]

Make bottom edge usable with a mouse.
Make it smarter when more than one column is available.

Compared with lp:~fboucault/address-book-app/converged_bottom_edge:
 Show a dark background while swiping the bottom edge page.
 Fixed bottom edge animation to avoid it to disappear on second interaction.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:507
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/969/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/272
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4755
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3838
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4752
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4752/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/24446

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:508
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/970/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/273
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4756
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3839
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4753
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4753/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/24447

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

review: Needs Fixing (continuous-integration)

[lp:~renatofilho/address-book-app/fix-bottom-edge]

509. By Renato Araujo Oliveira Filho on 2015-10-22

Fixed font size for new UITK label.

510. By Renato Araujo Oliveira Filho on 2015-10-22

Use pageStack API on PageWithBottomEdge.

511. By Renato Araujo Oliveira Filho on 2015-10-22

Make the header invisible on contact share page.

512. By Renato Araujo Oliveira Filho on 2015-10-22

Does not show empty state message if contact editor is open.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:512
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/971/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/274
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4767
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3845
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4764
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4764/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/24471

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

review: Approve (continuous-integration)

=== modified file 'src/imports/ABContactListPage.qml'
--- src/imports/ABContactListPage.qml	2015-10-22 12:56:07 +0000
+++ src/imports/ABContactListPage.qml	2015-10-22 12:56:08 +0000
@@ -427,7 +427,8 @@
                   !contactList.favouritesIsSelected &&
                   mainPage.isEmpty &&
                   (mainPage.newPhoneToAdd === "") &&
-                  !(contactList.filterTerm && contactList.filterTerm !== ""))
+                  !(contactList.filterTerm && contactList.filterTerm !== "")) &&
+                  bottomEdge.visible
 
         Behavior on visible {
             SequentialAnimation {
@@ -582,6 +583,7 @@
         flickable: contactList
         iconName: "contact-new"
         enabled: !contactList.isInSelectionMode
+        backGroundEffectEnabled: pageStack.columns === 1
 
         // FIXME: this is a workaround for the lack of fully asynchronous loading
         // of Pages in AdaptativePageLayout

=== modified file 'src/imports/BottomEdge.qml'
--- src/imports/BottomEdge.qml	2015-10-22 12:56:07 +0000
+++ src/imports/BottomEdge.qml	2015-10-22 12:56:08 +0000
@@ -20,12 +20,14 @@
 Item {
     id: bottomEdge
 
+    readonly property alias content: bottomEdgeLoader.item
     readonly property bool fullLoaded: bottomEdgeLoader.status == Loader.Ready
+
     property bool opened: false
     property Component contentComponent
-    property Item content: bottomEdgeLoader.item
     property string iconName
     property Item flickable
+    property alias backGroundEffectEnabled: darkBg.visible
 
     signal openBegin
     signal openEnd
@@ -40,6 +42,17 @@
         bottomEdge.state = "collapsed";
     }
 
+    Rectangle {
+        id: darkBg
+
+        anchors.fill: parent
+        color: "black"
+        opacity: bottomEdgeBody.y > 0 ? 0.8 - (bottomEdgeBody.y / bottomEdgeDragArea.drag.maximumY) : 0.8
+        Behavior on opacity {
+            NumberAnimation { duration: UbuntuAnimation.FastDuration }
+        }
+    }
+
     Item {
         id: bottomEdgeBody
         anchors {
@@ -121,13 +134,19 @@
     states: [
         State {
             name: "collapsed"
+            ParentChange {
+                target: bottomEdgeContent
+                parent: bottomEdgeBody
+                x: 0
+                y: 0
+            }
             PropertyChanges {
                 target: bottomEdgeBody
                 y: bottomEdgeDragArea.drag.maximumY
             }
             PropertyChanges {
                 target: bottomEdgeContent
-                visible: false
+                opacity: 0.0
             }
         },
         State {
@@ -139,9 +158,12 @@
                 y: 0
             }
             PropertyChanges {
+                target: bottomEdgeContent
+                opacity: 1.0
+            }
+            PropertyChanges {
                 target: bottomEdgeBody
-                y: bottomEdgeDragArea.drag.maximumY
-                opacity: 0.0
+                y: 0
             }
             PropertyChanges {
                 target: bottomEdgeShadows
@@ -154,7 +176,7 @@
             when: bottomEdgeDragArea.drag.active
             PropertyChanges {
                 target: bottomEdgeContent
-                visible: true
+                opacity: 1.0
             }
         }
     ]
@@ -164,16 +186,28 @@
             to: "collapsed"
             SequentialAnimation {
                 alwaysRunToEnd: true
-
-                SmoothedAnimation {
-                    target: bottomEdgeBody
-                    property: "y"
-                    duration: UbuntuAnimation.SlowDuration
+                ParallelAnimation {
+                    ParentAnimation {
+                        UbuntuNumberAnimation {
+                            properties: "x,y"
+                            duration: UbuntuAnimation.SlowDuration
+                            target: bottomEdgeContent
+                        }
+                    }
+                    UbuntuNumberAnimation {
+                        target: bottomEdgeBody
+                        property: "y"
+                        duration: UbuntuAnimation.SlowDuration
+                    }
+                }
+                PropertyAction {
+                    target: bottomEdgeContent
+                    property: "opacity"
                 }
                 ScriptAction {
                     script: {
-                        bottomEdgeLoader.active = false;
-                        bottomEdgeLoader.active = true;
+                        bottomEdgeLoader.active = false
+                        bottomEdgeLoader.active = true
                         bottomEdge.opened = false
                     }
                 }
@@ -182,6 +216,7 @@
         Transition {
             to: "expanded"
             SequentialAnimation {
+                alwaysRunToEnd: true
                 ParallelAnimation {
                     ScriptAction {
                         script: bottomEdge.openBegin()

=== modified file 'src/imports/Ubuntu/AddressBook/ContactShare/ContactSharePage.qml'
--- src/imports/Ubuntu/AddressBook/ContactShare/ContactSharePage.qml	2015-10-22 12:56:07 +0000
+++ src/imports/Ubuntu/AddressBook/ContactShare/ContactSharePage.qml	2015-10-22 12:56:08 +0000
@@ -31,6 +31,8 @@
     signal canceled()
     signal completed()
 
+    // invisible header
+    header: Item { height: 0 }
     ContentHub.ContentPeerPicker {
         visible: true
         anchors.fill: parent

=== modified file 'src/imports/Ubuntu/Contacts/ContactAvatar.qml'
--- src/imports/Ubuntu/Contacts/ContactAvatar.qml	2015-10-22 12:56:07 +0000
+++ src/imports/Ubuntu/Contacts/ContactAvatar.qml	2015-10-22 12:56:08 +0000
@@ -51,9 +51,9 @@
 
         anchors.centerIn: parent
         text: Contacts.contactInitialsFromString(contactDisplayName)
-        font.pointSize: 88
         color: UbuntuColors.lightAubergine
         visible: (img.status != Image.Ready)
+        fontSize: "large"
     }
 
     source: !img.visible ? img : null

=== modified file 'src/imports/Ubuntu/Contacts/PageWithBottomEdge.qml'
--- src/imports/Ubuntu/Contacts/PageWithBottomEdge.qml	2015-10-22 12:56:07 +0000
+++ src/imports/Ubuntu/Contacts/PageWithBottomEdge.qml	2015-10-22 12:56:08 +0000
@@ -103,7 +103,7 @@
     {
         if (edgeLoader.status === Loader.Ready) {
             edgeLoader.item.active = true
-            page.pageStack.addPageToCurrentColumn(page, edgeLoader.item)
+            page.pageStack.push(edgeLoader.item)
             if (edgeLoader.item.flickable) {
                 edgeLoader.item.flickable.contentY = -page.header.height
                 edgeLoader.item.flickable.returnToBounds()

=== modified file 'src/imports/Ubuntu/Contacts/SectionDelegate.qml'
--- src/imports/Ubuntu/Contacts/SectionDelegate.qml	2015-10-22 12:56:07 +0000
+++ src/imports/Ubuntu/Contacts/SectionDelegate.qml	2015-10-22 12:56:08 +0000
@@ -28,7 +28,6 @@
 
         anchors.fill: parent
         verticalAlignment: Text.AlignVCenter
-        font.pointSize: 76
         height: units.gu(3)
     }
     ThinDivider {