Merge lp:~pat-mcgowan/messaging-app/fix-1278790 into lp:messaging-app

[Pat McGowan]

This adds support for showing the current character count and number of messages to be sent via SMS. It includes a new label on top of the text area showing number of characters / 160 (number of messages). It is shown once the message is over 1 line in length, per other systems.
A new settings option is added to enable the feature which is off by default.
Emojis are counted as two characters. I did not test with multibyte character sets but expect that QML TextArea does the correct thing.
See lp:1278790

This adds support for showing the current character count and number of messages to be sent via SMS. It includes a new label on top of the text area showing number of characters / 160 (number of messages). It is shown once the message is over 1 line in length, per other systems.
A new settings option is added to enable the feature which is off by default.
Emojis are counted as two characters. I did not test with multibyte character sets but expect that QML TextArea does the correct thing.
See lp:1278790

[Bill Filler (bfiller)]

few comments
1) drop the (1) suffix if the count is < 160
2) hide the count label if it's an MMS message (either MMS group chat or single recipient with an attachment) as the rules are different I suppose

[Tiago Salem Herrmann (tiagosh)]

Thanks for the patch.
I left some comments.

You can check if the conversation is mms with the following code in ComposeBar.qml:

// more than one participant and mms group chat enabled or only one participant and any attachment
property var isMms = ((messages.participants.length > 1 && telepathyHelper.mmsGroupChat) || (messages.participants.length == 1 && attachments.count > 0))

review: Needs Fixing

[lp:~pat-mcgowan/messaging-app/fix-1278790]

583. By Pat McGowan on 2016-08-04

Indicate when using MMS, show partial composition with italics, only show message count when more than 1

584. By Pat McGowan on 2016-08-04

cleanup

585. By Pat McGowan on 2016-08-04

MMS needs to be translated

[Pat McGowan (pat-mcgowan)]

Ready for another pass

[Pat McGowan (pat-mcgowan)]

Waiting for final design inputs

[lp:~pat-mcgowan/messaging-app/fix-1278790]

586. By Pat McGowan on 2016-08-12

Match UX design specs, don't show the 160 limit, move to lower right, always show the message count

587. By Pat McGowan on 2016-08-12

add a space per mockup

[Tiago Salem Herrmann (tiagosh)]

Just tested and it works fine.
Code looks good too.

review: Approve

=== modified file 'src/qml/ComposeBar.qml'
--- src/qml/ComposeBar.qml	2016-06-29 20:43:16 +0000
+++ src/qml/ComposeBar.qml	2016-08-12 18:33:08 +0000
@@ -39,6 +39,8 @@
     property alias audioRecordedDuration: audioRecordingBar.duration
     property alias recording: audioRecordingBar.recording
     property bool oskEnabled: true
+    property bool usingMMS: false
+
     onRecordingChanged: {
         if (recording) {
             manuallyRecorded = true
@@ -49,7 +51,9 @@
 
     // internal properties
     property int _activeAttachmentIndex: -1
-    property int _defaultHeight: textEntry.height + attachmentPanel.height + stickersPicker.height + units.gu(2)
+    property int _defaultHeight: charCount.height + textEntry.height + attachmentPanel.height + stickersPicker.height + units.gu(2)
+    property int messageCount: 0
+    property int smsLength: 160
 
     Component.onDestruction: {
         composeBar.reset()
@@ -323,6 +327,7 @@
             if (text !== "" && composeBar.audioAttached) {
                 attachments.clear()
             }
+            messageCount = (messageTextArea.length + smsLength - 1) / smsLength
         }
 
         focus: false
@@ -396,40 +401,74 @@
             visible: attachments.count > 0
         }
 
-        TextArea {
-            id: messageTextArea
-            objectName: "messageTextArea"
+        Item {
             anchors {
                 top: attachments.count == 0 ? textEntry.top : attachmentThumbnails.bottom
                 left: parent.left
                 right: parent.right
             }
-            // this value is to avoid letter being cut off
-            height: units.gu(4.3)
-            style: LocalTextAreaStyle {}
-            autoSize: true
-            maximumLineCount: attachments.count == 0 ? 8 : 4
-            placeholderText: {
-                if (telepathyHelper.ready) {
-                    var account = telepathyHelper.accountForId(presenceRequest.accountId)
-                    if (account && 
-                            (presenceRequest.type != PresenceRequest.PresenceTypeUnknown &&
-                             presenceRequest.type != PresenceRequest.PresenceTypeUnset) &&
-                             account.protocolInfo.serviceName !== "") {
-                        console.log(presenceRequest.accountId)
-                        console.log(presenceRequest.type)
-                        return account.protocolInfo.serviceName
-                    }
-                }
-                return i18n.tr("Write a message...")
-            }
-            focus: textEntry.focus
-            font.family: "Ubuntu"
-            font.pixelSize: FontUtils.sizeToPixels("medium")
-            color: Theme.palette.normal.backgroundText
+            TextArea {
+                id: messageTextArea
+                objectName: "messageTextArea"
+                anchors {
+                    top: parent.top
+                    left: parent.left
+                    right: parent.right
+                }
+                // this value is to avoid letter being cut off
+                height: units.gu(4.3)
+                style: LocalTextAreaStyle {}
+                autoSize: true
+                maximumLineCount: attachments.count == 0 ? 8 : 4
+                placeholderText: {
+                    if (telepathyHelper.ready) {
+                        var account = telepathyHelper.accountForId(presenceRequest.accountId)
+                        if (account &&
+                                (presenceRequest.type != PresenceRequest.PresenceTypeUnknown &&
+                                 presenceRequest.type != PresenceRequest.PresenceTypeUnset) &&
+                                account.protocolInfo.serviceName !== "") {
+                            console.log(presenceRequest.accountId)
+                            console.log(presenceRequest.type)
+                            return account.protocolInfo.serviceName
+                        }
+                    }
+                    return i18n.tr("Write a message...")
+                }
+                focus: textEntry.focus
+                font.family: "Ubuntu"
+                font.pixelSize: FontUtils.sizeToPixels("medium")
+                color: Theme.palette.normal.backgroundText
+            }
+
+            // show the counts if option is enabled, and more than one line
+            // If MMS indicate such on the label and don't show the count
+            // if word prediction is on italicize the count while its still composing
+            Label {
+                id: charCount
+                anchors {
+                    right: messageTextArea.right
+                    top: messageTextArea.bottom
+                    topMargin: visible ? units.gu(.5) : 0
+                    bottomMargin: visible ? units.gu(.5) : 0
+                }
+                height: visible ? units.gu(2) : 0
+                text: {
+                    if ((attachments.count > 0) || usingMMS) {
+                        i18n.tr("MMS")
+                    } else {
+                        messageTextArea.length + " (" + messageCount + ")"
+                    }
+                }
+                fontSize: "small"
+                font.italic: messageTextArea.inputMethodComposing && (attachments.count == 0) && !usingMMS
+                color: Theme.palette.normal.backgroundTertiaryText
+                visible: msgSettings.showCharacterCount && (messageTextArea.lineCount > 1)
+            }
+
         }
+
     }
-
+    
     AttachmentPanel {
         id: attachmentPanel
 

=== modified file 'src/qml/Messages.qml'
--- src/qml/Messages.qml	2016-07-28 16:04:52 +0000
+++ src/qml/Messages.qml	2016-08-12 18:33:08 +0000
@@ -1119,6 +1119,7 @@
         text: messages.text
         canSend: participants.length > 0 || multiRecipient.recipientCount > 0 || multiRecipient.searchString !== ""
         oskEnabled: messages.oskEnabled
+        usingMMS: (participantIds.length > 1 || multiRecipient.recipientCount > 1 ) && telepathyHelper.mmsGroupChat && messages.account.type == AccountEntry.PhoneAccount
 
         Component.onCompleted: {
             // if page is active, it means this is not a bottom edge page

=== modified file 'src/qml/SettingsPage.qml'
--- src/qml/SettingsPage.qml	2016-07-21 15:39:09 +0000
+++ src/qml/SettingsPage.qml	2016-08-12 18:33:08 +0000
@@ -23,13 +23,19 @@
 Page {
     id: settingsPage
     title: i18n.tr("Settings")
+
     property var setMethods: {
-        "mmsGroupChatEnabled": function(value) { telepathyHelper.mmsGroupChat = value }
+        "mmsGroupChatEnabled": function(value) { telepathyHelper.mmsGroupChat = value },
+        "characterCountEnabled": function(value) { msgSettings.showCharacterCount = value }
     }
     property var settingsModel: [
         { "name": "mmsGroupChatEnabled",
           "description": i18n.tr("Enable MMS group chat"),
           "property": telepathyHelper.mmsGroupChat
+        },
+        { "name": "characterCountEnabled",
+          "description": i18n.tr("Show character count"),
+          "property": msgSettings.showCharacterCount
         }
     ]
 
@@ -109,4 +115,3 @@
         }
     }
 }
-

=== modified file 'src/qml/messaging-app.qml'
--- src/qml/messaging-app.qml	2016-07-28 04:14:35 +0000
+++ src/qml/messaging-app.qml	2016-08-12 18:33:08 +0000
@@ -197,6 +197,12 @@
         property bool mainViewIgnoreFirstTimeDialog: false
     }
 
+    Settings {
+        id: msgSettings
+        category: "SMS"
+        property bool showCharacterCount: false
+    }
+
     StickerPacksModel {
         id: stickerPacksModel
     }