Merge lp:~tiagosh/messaging-app/update-bubbles into lp:messaging-app

[Tiago Salem Herrmann]

Update conversation bubbles

Update conversation bubbles

--Checklist--
Are there any related MPs required for this MP to build/function as expected? Please list.
No

Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes)
Yes

Did you perform an exploratory manual test run of your code change and any related functionality on device or emulator?
Yes

Did you successfully run all tests found in your component's Test Plan (https://wiki.ubuntu.com/Process/Merges/TestPlan/messaging-app) on device or emulator?
Yes

If you changed the UI, was the change specified/approved by design?
N/A

If you changed the packaging (debian), did you add a core-dev as a reviewer to this MP?
N/A

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:125
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/260/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/1652
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/1396
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-amd64-ci/54
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-armhf-ci/54
        deb: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-armhf-ci/54/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-i386-ci/54
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/1925
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2677
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2677/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/9418
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/1159
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1563
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1563/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[Gustavo Pichorim Boiko (boiko)]

Did you perform an exploratory manual test run of the code change and any related functionality on device or emulator?
Yes

Did CI run pass? If not, please explain why.
No, but not related to this MR

Have you checked that submitter has accurately filled out the submitter checklist and has taken no shortcut?
Yes

Code looks good and works as expected!

review: Approve

=== modified file 'src/qml/MessageDelegate.qml'
--- src/qml/MessageDelegate.qml	2014-06-25 05:12:46 +0000
+++ src/qml/MessageDelegate.qml	2014-07-07 19:13:36 +0000
@@ -30,7 +30,7 @@
 Item {
     id: messageDelegate
     property bool incoming: false
-    property string textColor: incoming ? "#333333" : "#752571"
+    property string textColor: incoming ? "#333333" : "white"
     property bool selectionMode: false
     property bool unread: false
     property alias confirmRemoval: internalDelegate.confirmRemoval
@@ -355,7 +355,7 @@
                     wrapMode: Text.WrapAtWordBoundaryOrAnywhere
                     fontSize: "medium"
                     color: textColor
-                    opacity: incoming ? 1 : 0.9
+                    //opacity: incoming ? 1 : 0.9
                     text: textMessage !== "" ? parseText(textMessage) : parseText(mmsText)
                     onLinkActivated:  Qt.openUrlExternally(link)
                     function parseText(text) {
 
=== removed file 'src/qml/assets/[e-mail]'
 Binary files src/qml/assets/[e-mail]	2014-06-06 20:38:55 +0000 and src/qml/assets/[e-mail]	1970-01-01 00:00:00 +0000 differ
=== removed file 'src/qml/assets/[e-mail]'
--- src/qml/assets/[e-mail]	2013-08-12 17:51:12 +0000
+++ src/qml/assets/[e-mail]	1970-01-01 00:00:00 +0000
@@ -1,5 +0,0 @@
-border.left: 50
-border.top: 38
-border.bottom: 67
-border.right: 36
-source: [e-mail]
 
=== added file 'src/qml/assets/[e-mail]'
 Binary files src/qml/assets/[e-mail]	1970-01-01 00:00:00 +0000 and src/qml/assets/[e-mail]	2014-07-07 19:13:36 +0000 differ
=== added file 'src/qml/assets/[e-mail]'
--- src/qml/assets/[e-mail]	1970-01-01 00:00:00 +0000
+++ src/qml/assets/[e-mail]	2014-07-07 19:13:36 +0000
@@ -0,0 +1,5 @@
+border.left: 63
+border.top: 46
+border.bottom: 88
+border.right: 44
+source: [e-mail]
 
=== removed file 'src/qml/assets/[e-mail]'
 Binary files src/qml/assets/[e-mail]	2014-06-06 20:38:55 +0000 and src/qml/assets/[e-mail]	1970-01-01 00:00:00 +0000 differ
=== removed file 'src/qml/assets/[e-mail]'
--- src/qml/assets/[e-mail]	2013-08-12 17:51:12 +0000
+++ src/qml/assets/[e-mail]	1970-01-01 00:00:00 +0000
@@ -1,5 +0,0 @@
-border.left: 36
-border.top: 38
-border.bottom: 67
-border.right: 50
-source: [e-mail]
 
=== added file 'src/qml/assets/[e-mail]'
 Binary files src/qml/assets/[e-mail]	1970-01-01 00:00:00 +0000 and src/qml/assets/[e-mail]	2014-07-07 19:13:36 +0000 differ
=== added file 'src/qml/assets/[e-mail]'
--- src/qml/assets/[e-mail]	1970-01-01 00:00:00 +0000
+++ src/qml/assets/[e-mail]	2014-07-07 19:13:36 +0000
@@ -0,0 +1,5 @@
+border.left: 36
+border.top: 38
+border.bottom: 80
+border.right: 50
+source: [e-mail]