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

Proposed by Tiago Salem Herrmann
Status: Merged
Approved by: Gustavo Pichorim Boiko
Approved revision: 125
Merged at revision: 133
Proposed branch: lp:~tiagosh/messaging-app/update-bubbles
Merge into: lp:messaging-app
Diff against target: 69 lines (+12/-12)
5 files modified
src/qml/MessageDelegate.qml (+2/-2)
src/qml/assets/conversation_incoming@18.sci (+0/-5)
src/qml/assets/conversation_incoming@27.sci (+5/-0)
src/qml/assets/conversation_outgoing@18.sci (+0/-5)
src/qml/assets/conversation_outgoing@27.sci (+5/-0)
To merge this branch: bzr merge lp:~tiagosh/messaging-app/update-bubbles
Reviewer Review Type Date Requested Status
Gustavo Pichorim Boiko (community) Approve
PS Jenkins bot continuous-integration Needs Fixing
Review via email: mp+225882@code.launchpad.net

Commit message

Update conversation bubbles

Description of the change

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

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Gustavo Pichorim Boiko (boiko) wrote :

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/qml/MessageDelegate.qml'
2--- src/qml/MessageDelegate.qml 2014-06-25 05:12:46 +0000
3+++ src/qml/MessageDelegate.qml 2014-07-07 19:13:36 +0000
4@@ -30,7 +30,7 @@
5 Item {
6 id: messageDelegate
7 property bool incoming: false
8- property string textColor: incoming ? "#333333" : "#752571"
9+ property string textColor: incoming ? "#333333" : "white"
10 property bool selectionMode: false
11 property bool unread: false
12 property alias confirmRemoval: internalDelegate.confirmRemoval
13@@ -355,7 +355,7 @@
14 wrapMode: Text.WrapAtWordBoundaryOrAnywhere
15 fontSize: "medium"
16 color: textColor
17- opacity: incoming ? 1 : 0.9
18+ //opacity: incoming ? 1 : 0.9
19 text: textMessage !== "" ? parseText(textMessage) : parseText(mmsText)
20 onLinkActivated: Qt.openUrlExternally(link)
21 function parseText(text) {
22
23=== removed file 'src/qml/assets/conversation_incoming@18.png'
24Binary files src/qml/assets/conversation_incoming@18.png 2014-06-06 20:38:55 +0000 and src/qml/assets/conversation_incoming@18.png 1970-01-01 00:00:00 +0000 differ
25=== removed file 'src/qml/assets/conversation_incoming@18.sci'
26--- src/qml/assets/conversation_incoming@18.sci 2013-08-12 17:51:12 +0000
27+++ src/qml/assets/conversation_incoming@18.sci 1970-01-01 00:00:00 +0000
28@@ -1,5 +0,0 @@
29-border.left: 50
30-border.top: 38
31-border.bottom: 67
32-border.right: 36
33-source: conversation_incoming@18.png
34
35=== added file 'src/qml/assets/conversation_incoming@27.png'
36Binary files src/qml/assets/conversation_incoming@27.png 1970-01-01 00:00:00 +0000 and src/qml/assets/conversation_incoming@27.png 2014-07-07 19:13:36 +0000 differ
37=== added file 'src/qml/assets/conversation_incoming@27.sci'
38--- src/qml/assets/conversation_incoming@27.sci 1970-01-01 00:00:00 +0000
39+++ src/qml/assets/conversation_incoming@27.sci 2014-07-07 19:13:36 +0000
40@@ -0,0 +1,5 @@
41+border.left: 63
42+border.top: 46
43+border.bottom: 88
44+border.right: 44
45+source: conversation_incoming@27.png
46
47=== removed file 'src/qml/assets/conversation_outgoing@18.png'
48Binary files src/qml/assets/conversation_outgoing@18.png 2014-06-06 20:38:55 +0000 and src/qml/assets/conversation_outgoing@18.png 1970-01-01 00:00:00 +0000 differ
49=== removed file 'src/qml/assets/conversation_outgoing@18.sci'
50--- src/qml/assets/conversation_outgoing@18.sci 2013-08-12 17:51:12 +0000
51+++ src/qml/assets/conversation_outgoing@18.sci 1970-01-01 00:00:00 +0000
52@@ -1,5 +0,0 @@
53-border.left: 36
54-border.top: 38
55-border.bottom: 67
56-border.right: 50
57-source: conversation_outgoing@18.png
58
59=== added file 'src/qml/assets/conversation_outgoing@27.png'
60Binary files src/qml/assets/conversation_outgoing@27.png 1970-01-01 00:00:00 +0000 and src/qml/assets/conversation_outgoing@27.png 2014-07-07 19:13:36 +0000 differ
61=== added file 'src/qml/assets/conversation_outgoing@27.sci'
62--- src/qml/assets/conversation_outgoing@27.sci 1970-01-01 00:00:00 +0000
63+++ src/qml/assets/conversation_outgoing@27.sci 2014-07-07 19:13:36 +0000
64@@ -0,0 +1,5 @@
65+border.left: 36
66+border.top: 38
67+border.bottom: 80
68+border.right: 50
69+source: conversation_outgoing@27.png

Subscribers

People subscribed via source and target branches