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

[Gustavo Pichorim Boiko]

Show an overlay icon and a background image depending on the protocol used.

Show an overlay icon and a background image depending on the protocol used.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:495
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/853/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/5766/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/messaging-app-vivid-i386-ci/362/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5779/console

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

review: Needs Fixing (continuous-integration)

[Gustavo Pichorim Boiko (boiko)]

Looks good!

review: Approve

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

496. By Gustavo Pichorim Boiko on 2015-12-16

Merge parent

=== modified file 'src/qml/MainPage.qml'
--- src/qml/MainPage.qml	2015-10-30 13:21:59 +0000
+++ src/qml/MainPage.qml	2015-12-16 19:35:20 +0000
@@ -218,6 +218,7 @@
                     }
                     properties["participantIds"] = participantIds
                     properties["participants"] = model.participants
+                    properties["presenceRequest"] = threadDelegate.presenceItem
                     if (displayedEvent != null) {
                         properties["scrollToEventId"] = displayedEvent.eventId
                     }

=== modified file 'src/qml/MessageDelegateFactory.qml'
--- src/qml/MessageDelegateFactory.qml	2015-09-14 13:51:27 +0000
+++ src/qml/MessageDelegateFactory.qml	2015-12-16 19:35:20 +0000
@@ -35,6 +35,7 @@
     signal resendMessage()
     signal copyMessage()
     signal showMessageDetails()
+    color: "transparent"
 
     width: messageList.width
     leftSideAction: Action {

=== modified file 'src/qml/Messages.qml'
--- src/qml/Messages.qml	2015-12-16 19:35:19 +0000
+++ src/qml/Messages.qml	2015-12-16 19:35:20 +0000
@@ -59,6 +59,7 @@
     property string firstParticipantId: participantIds.length > 0 ? participantIds[0] : ""
     property variant firstParticipant: participants.length > 0 ? participants[0] : null
     property var threads: []
+    property QtObject presenceRequest: presenceItem
     property var accountsModel: getAccountsModel()
     function getAccountsModel() {
         var accounts = []
@@ -428,7 +429,7 @@
     }
 
     PresenceRequest {
-        id: presenceRequest
+        id: presenceItem
         accountId: {
             // if this is a regular sms chat, try requesting the presence on
             // a multimedia account
@@ -953,6 +954,33 @@
         objectName: "messageList"
         visible: !isSearching
 
+        Rectangle {
+            color: Theme.palette.normal.background
+            anchors.fill: parent
+            Image {
+                width: units.gu(20)
+                fillMode: Image.PreserveAspectFit
+                anchors.centerIn: parent
+                visible: source !== ""
+                source: {
+                    var accountId = ""
+
+                    if (messages.account) {
+                        accountId = messages.account.accountId
+                    }
+
+                    if (presenceRequest.type != PresenceRequest.PresenceTypeUnknown
+                            && presenceRequest.type != PresenceRequest.PresenceTypeUnset) {
+                        accountId = presenceRequest.accountId
+                    }
+
+                    return telepathyHelper.accountForId(accountId).protocolInfo.backgroundImage
+                }
+                z: 1
+            }
+            z: -1
+        }
+
         // because of the header
         clip: true
         anchors {

=== modified file 'src/qml/ThreadDelegate.qml'
--- src/qml/ThreadDelegate.qml	2015-10-23 20:41:36 +0000
+++ src/qml/ThreadDelegate.qml	2015-12-16 19:35:20 +0000
@@ -38,6 +38,7 @@
     property var displayedEventTextAttachments: displayedEvent ? displayedEvent.textMessageAttachments : eventTextAttachments
     property var displayedEventTimestamp: displayedEvent ? displayedEvent.timestamp : eventTimestamp
     property var displayedEventTextMessage: displayedEvent ? displayedEvent.textMessage : eventTextMessage
+    property QtObject presenceItem: delegateHelper.presenceItem
     property string groupChatLabel: {
         var firstRecipient
         if (unknownContact) {
@@ -172,16 +173,36 @@
         fontSize: "small"
     }
 
+    Image {
+        id: protocolIcon
+        anchors {
+            top: time.bottom
+            topMargin: units.gu(1)
+            right: parent.right
+        }
+        height: units.gu(2)
+        width: units.gu(2)
+        visible: source !== ""
+        source: {
+            if (delegateHelper.presenceType != PresenceRequest.PresenceTypeUnknown
+                    && delegateHelper.presenceType != PresenceRequest.PresenceTypeUnset) {
+                return telepathyHelper.accountForId(delegateHelper.presenceAccountId).protocolInfo.icon
+            }
+            return ""
+        }
+    }
+
     UbuntuShape {
         id: unreadCountIndicator
         height: units.gu(2)
         width: height
         anchors {
-            top: time.bottom
-            topMargin: units.gu(1)
-            right: parent.right
-            rightMargin: units.gu(2)
+            top: avatar.top
+            topMargin: units.gu(-0.5)
+            left: avatar.left
+            leftMargin: units.gu(-0.5)
         }
+        z: 1
         visible: unreadCount > 0
         color: "#38b44a"
         Label {
@@ -232,6 +253,9 @@
         property alias contexts: phoneDetail.contexts
         property bool isUnknown: contactId === ""
         property string phoneNumberSubTypeLabel: ""
+        property alias presenceAccountId: presenceRequest.accountId
+        property alias presenceType: presenceRequest.type
+        property alias presenceItem: presenceRequest
         property string latestFilter: ""
         property var searchHistoryFilter
         property var searchHistoryFilterString: 'import Ubuntu.History 0.1; 
@@ -310,6 +334,35 @@
             }
         }
 
+        // FIXME: there is another instance of PresenceRequest in Messages.qml,
+        // we have to reuse the same instance when possible
+        PresenceRequest {
+            id: presenceRequest
+            accountId: {
+                // if this is a regular sms chat, try requesting the presence on
+                // a multimedia account
+                if (!telepathyHelper.ready) {
+                    return ""
+                }
+                var account = telepathyHelper.accountForId(model.accountId)
+                if (!account) {
+                    return ""
+                }
+                if (account.type == AccountEntry.PhoneAccount) {
+                    for (var i in telepathyHelper.accounts) {
+                        var tmpAccount = telepathyHelper.accounts[i]
+                        if (tmpAccount.type == AccountEntry.MultimediaAccount) {
+                            return tmpAccount.accountId
+                        }
+                    }
+                    return ""
+                }
+                return account.accountId
+            }
+            // we just request presence on 1-1 chats
+            identifier: !groupChat ? participant.identifier : ""
+        }
+
         function updateSubTypeLabel() {
             var subLabel = "";
             if (participant && participant.phoneNumber) {