Merge lp:~tiagosh/messaging-app/checkmarks into lp:messaging-app

[Tiago Salem Herrmann]

Add delivery status indication on bubbles.

Add delivery status indication on bubbles.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:483
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/836/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/5659/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/messaging-app-vivid-i386-ci/345/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5673/console

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

review: Needs Fixing (continuous-integration)

=== added file 'src/qml/DeliveryStatus.qml'
--- src/qml/DeliveryStatus.qml	1970-01-01 00:00:00 +0000
+++ src/qml/DeliveryStatus.qml	2015-12-09 00:45:26 +0000
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This file is part of messaging-app.
+ *
+ * messaging-app is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * messaging-app is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+import QtQuick 2.2
+import Ubuntu.History 0.1
+
+Image {
+    property int status: -1
+    property bool enabled: true
+    height: enabled ? units.gu(1) : 0
+    fillMode: Image.PreserveAspectFit
+    source: {
+        if (!enabled) {
+            return ""
+        }
+        if (status == HistoryThreadModel.MessageStatusDelivered) {
+            return Qt.resolvedUrl("./assets/check_single_white.png")
+        } else if (status == HistoryThreadModel.MessageStatusRead) {
+            return Qt.resolvedUrl("./assets/check_double_white.png")
+        }
+        return ""
+    }
+}

=== modified file 'src/qml/MMS/MMSAudio.qml'
--- src/qml/MMS/MMSAudio.qml	2015-12-09 00:45:25 +0000
+++ src/qml/MMS/MMSAudio.qml	2015-12-09 00:45:26 +0000
@@ -124,7 +124,7 @@
         function formatValue(v) { return DateUtils.formattedTime(v/1000) }
         anchors {
             left: playButton.right
-            right: parent.right
+            right: deliveryStatus.left
             leftMargin: units.gu(1)
             rightMargin: units.gu(2)
             verticalCenter: shape.verticalCenter
@@ -155,4 +155,15 @@
             }
         }
     }
+
+    DeliveryStatus {
+       id: deliveryStatus
+       status: textMessageStatus
+       enabled: showDeliveryStatus
+       anchors {
+           right: parent.right
+           rightMargin: units.gu(0.5)
+           verticalCenter: slider.verticalCenter
+       }
+    }
 }

=== modified file 'src/qml/MMS/MMSBase.qml'
--- src/qml/MMS/MMSBase.qml	2015-12-09 00:45:25 +0000
+++ src/qml/MMS/MMSBase.qml	2015-12-09 00:45:26 +0000
@@ -24,4 +24,5 @@
     property string previewer
     property bool lastItem: false
     property bool swipeLocked: false
+    property bool showDeliveryStatus: true
 }

=== modified file 'src/qml/MMS/MMSContact.qml'
--- src/qml/MMS/MMSContact.qml	2015-11-19 13:37:36 +0000
+++ src/qml/MMS/MMSContact.qml	2015-12-09 00:45:26 +0000
@@ -20,6 +20,7 @@
 import Ubuntu.Components 1.3
 import Ubuntu.Contacts 0.1
 import Ubuntu.History 0.1
+import ".."
 
 MMSBase {
     id: vcardDelegate
@@ -132,4 +133,16 @@
 
         vCardUrl: attachment ? Qt.resolvedUrl(attachment.filePath) : ""
     }
+
+    DeliveryStatus {
+       id: deliveryStatus
+       status: textMessageStatus
+       enabled: showDeliveryStatus
+       anchors {
+           right: parent.right
+           rightMargin: units.gu(0.5)
+           bottom: parent.bottom
+           bottomMargin: units.gu(0.5)
+       }
+    }
 }

=== modified file 'src/qml/MMS/MMSImage.qml'
--- src/qml/MMS/MMSImage.qml	2015-12-09 00:45:25 +0000
+++ src/qml/MMS/MMSImage.qml	2015-12-09 00:45:26 +0000
@@ -18,6 +18,7 @@
 
 import QtQuick 2.2
 import Ubuntu.Components 1.3
+import ".."
 
 MMSBase {
     id: imageDelegate
@@ -84,4 +85,16 @@
             }
         }
     }
+
+    DeliveryStatus {
+       id: deliveryStatus
+       status: textMessageStatus
+       enabled: showDeliveryStatus
+       anchors {
+           right: parent.right
+           rightMargin: units.gu(0.5)
+           bottom: parent.bottom
+           bottomMargin: units.gu(0.5)
+       }
+    }
 }

=== modified file 'src/qml/MMS/MMSVideo.qml'
--- src/qml/MMS/MMSVideo.qml	2015-12-09 00:45:25 +0000
+++ src/qml/MMS/MMSVideo.qml	2015-12-09 00:45:26 +0000
@@ -19,6 +19,7 @@
 import QtQuick 2.2
 import Ubuntu.Components 1.3
 import Ubuntu.Thumbnailer 0.1
+import ".."
 
 MMSBase {
     id: videoDelegate
@@ -95,4 +96,17 @@
             }
         }
     }
+
+    DeliveryStatus {
+       id: deliveryStatus
+       status: textMessageStatus
+       enabled: showDeliveryStatus
+       anchors {
+           right: parent.right
+           rightMargin: units.gu(0.5)
+           bottom: parent.bottom
+           bottomMargin: units.gu(0.5)
+       }
+    }
+
 }

=== modified file 'src/qml/MMSMessageBubble.qml'
--- src/qml/MMSMessageBubble.qml	2014-08-27 16:05:37 +0000
+++ src/qml/MMSMessageBubble.qml	2015-12-09 00:45:26 +0000
@@ -25,6 +25,7 @@
     messageStatus: messageData.textMessageStatus
     messageIncoming: incoming
     accountName: accountLabel
+    showDeliveryStatus: true
 
     states: [
         State {

=== modified file 'src/qml/MessageBubble.qml'
--- src/qml/MessageBubble.qml	2015-10-22 15:31:05 +0000
+++ src/qml/MessageBubble.qml	2015-12-09 00:45:26 +0000
@@ -34,10 +34,15 @@
     property var messageTimeStamp
     property int maxDelegateWidth: units.gu(27)
     property string accountName
+    // FIXME for now we just display the delivery status if it's greater than Accepted
+    property bool showDeliveryStatus: false
+    property bool deliveryStatusAvailable: showDeliveryStatus && (statusDelivered || statusRead)
 
     readonly property bool error: (messageStatus === HistoryThreadModel.MessageStatusPermanentlyFailed)
     readonly property bool sending: (messageStatus === HistoryThreadModel.MessageStatusUnknown ||
                                      messageStatus === HistoryThreadModel.MessageStatusTemporarilyFailed) && !messageIncoming
+    readonly property bool statusDelivered: (messageStatus === HistoryThreadModel.MessageStatusDelivered)
+    readonly property bool statusRead: (messageStatus === HistoryThreadModel.MessageStatusRead)
 
     // XXXX: should be hoisted
     function getCountryCode() {
@@ -85,7 +90,7 @@
     radius: units.gu(1)
     height: senderName.height + senderName.anchors.topMargin + textLabel.height + textTimestamp.height + units.gu(1)
     width:  Math.min(units.gu(27),
-                     Math.max(textLabel.contentWidth, textTimestamp.contentWidth, senderName.contentWidth))
+                     Math.max(textLabel.contentWidth, textTimestamp.contentWidth + deliveryStatus.width, senderName.contentWidth))
             + units.gu(3)
     anchors{
         leftMargin:  units.gu(1)
@@ -157,6 +162,17 @@
         }
     }
 
+    DeliveryStatus {
+        id: deliveryStatus
+        status: messageStatus
+        enabled: deliveryStatusAvailable
+        anchors {
+            right: parent.right
+            rightMargin: units.gu(0.5)
+            verticalCenter: textTimestamp.verticalCenter
+        }
+    }
+
     ColoredImage {
         id: bubbleArrow
 

=== modified file 'src/qml/SMSDelegate.qml'
--- src/qml/SMSDelegate.qml	2015-10-23 20:41:36 +0000
+++ src/qml/SMSDelegate.qml	2015-12-09 00:45:26 +0000
@@ -73,5 +73,6 @@
         messageTimeStamp: root.messageData.timestamp
         accountName: root.accountLabel
         messageStatus: root.messageData.textMessageStatus
+        showDeliveryStatus: true
     }
 }

=== added file 'src/qml/assets/check_double_white.png'
Binary files src/qml/assets/check_double_white.png	1970-01-01 00:00:00 +0000 and src/qml/assets/check_double_white.png	2015-12-09 00:45:26 +0000 differ
=== added file 'src/qml/assets/check_single_white.png'
Binary files src/qml/assets/check_single_white.png	1970-01-01 00:00:00 +0000 and src/qml/assets/check_single_white.png	2015-12-09 00:45:26 +0000 differ