Merge lp:~radonapps/messaging-app/fix_swipe-demo_text_position into lp:messaging-app

[Daniyaal Rasheed]

Makes text in the swipe demo use relative positioning instead of absolute.

I've deleted the absolute height specification inside of the RowLayout so that the height of the message is entirely dependent on the height of the dragMessage. The "Got it" button is anchored to the bottom of the message because if it was anchored to the top, then it would jump around whenever the number of lines in the text increased or decreased. Then I changed the bottomMargin of the "Got it" button to be units.gu(21) instead of 19 because the message row layout used to have a height of 3 and the button was anchored to its top instead of bottom.

[Tiago Salem Herrmann (tiagosh)]

Hi,
Could you please merge trunk back into your branch?

We need it to be up-to-date in order to land it.

Thanks.

=== modified file 'src/qml/SwipeItemDemo.qml'
--- src/qml/SwipeItemDemo.qml	2015-09-14 13:51:27 +0000
+++ src/qml/SwipeItemDemo.qml	2016-01-20 04:22:23 +0000
@@ -69,9 +69,9 @@
                 objectName: "gotItButton"
 
                 anchors {
-                    bottom: dragTitle.top
+                    bottom: dragTitle.bottom
                     horizontalCenter: parent.horizontalCenter
-                    bottomMargin: units.gu(19)
+                    bottomMargin: units.gu(21)
                 }
                 width: units.gu(17)
                 strokeColor: UbuntuColors.green
@@ -94,7 +94,6 @@
                     bottom: listItem.top
                     margins: units.gu(1)
                 }
-                height: units.gu(3)
                 spacing: units.gu(2)
 
                 Image {