Merge lp:~phablet-team/messaging-app/fix_swipe_to_cancel into lp:messaging-app

[Gustavo Pichorim Boiko]

Fix the swipe to cancel audio recording.

Fix the swipe to cancel audio recording.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:490
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/938/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6352/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-vivid-i386-ci/447
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6363/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/messaging-app-ci/938/rebuild

review: Needs Fixing (continuous-integration)

[lp:~phablet-team/messaging-app/fix_swipe_to_cancel]

491. By Gustavo Pichorim Boiko on 2016-02-05

Fix a visual glitch of the "Swipe to cancel" label when cancelling a recording.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:491
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/940/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6358/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-vivid-i386-ci/449
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6369/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/messaging-app-ci/940/rebuild

review: Needs Fixing (continuous-integration)

[Tiago Salem Herrmann (tiagosh)]

Looks good.
Tested on the device and works well.

review: Approve

=== modified file 'src/qml/ComposeBar.qml'
--- src/qml/ComposeBar.qml	2016-02-05 00:56:08 +0000
+++ src/qml/ComposeBar.qml	2016-02-05 00:56:08 +0000
@@ -224,12 +224,12 @@
 
         anchors {
             left: parent.left
-            right: dragTarget.left
+            right: anchorPoint.left
             top: parent.top
             bottom: attachmentPanel.top
         }
 
-        buttonOpacity: 1 - dragTarget.dragAmount
+        buttonOpacity: recording ? 1 - dragTarget.dragAmount : 0
 
         onAudioRecorded:  {
             attachments.append(audio)
@@ -243,9 +243,18 @@
         property real normalX: leftSideActions.x + leftSideActions.width
         property real delta: recordingX - normalX
         property real dragAmount: 1 - (x - normalX) / (delta > 0 ? delta : 0.0001)
-        x: (composeBar.recording || composeBar.audioAttached) ? recordingX : normalX
+        x: recordingX
+        width: 0
+
+        function reset() {
+            x = Qt.binding(function(){return recordingX})
+        }
+    }
+
+    Item {
+        id: anchorPoint
+        x: (composeBar.recording || composeBar.audioAttached) ? dragTarget.x : dragTarget.normalX
         Behavior on x { UbuntuNumberAnimation { } }
-        width: 0
     }
 
     StyledItem {
@@ -257,7 +266,7 @@
         anchors {
             topMargin: units.gu(1)
             top: parent.top
-            left: dragTarget.right
+            left: anchorPoint.right
             leftMargin: units.gu(2)
             right: sendButton.left
             rightMargin: units.gu(2)
@@ -523,6 +532,7 @@
             if (dragTarget.dragAmount >= 0.5) {
                 composeBar.reset()
             }
+            dragTarget.reset()
         }
 
         // drag-to-cancel