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

[Tiago Salem Herrmann]

- enable the send button when any text is entered in the recipient input field.
- scroll view to the bottom when sending messages.

- enable the send button when any text is entered in the recipient input field.
- scroll view to the bottom when sending messages.

--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?
Yes

If you changed UI labels, did you update the pot file?
It will be done later.

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

[lp:~tiagosh/messaging-app/multiple_fixes]

218. By Tiago Salem Herrmann on 2014-09-08

force focus when bottomPanel is clicked

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:217
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/446/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/4614
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3415
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-i386-ci/240
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/4391
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5866
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5866/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/12889
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/2818
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3717
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3717/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[lp:~tiagosh/messaging-app/multiple_fixes]

219. By Tiago Salem Herrmann on 2014-09-08

fix typo

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:218
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/447/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/4619
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3419
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-i386-ci/241
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/4398
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5871
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5871/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/12897
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/2822
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3721
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3721/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:219
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/448/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/4623
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3423
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-i386-ci/242
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/4406
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5875
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5875/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/12906
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/2825
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3725
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3725/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[lp:~tiagosh/messaging-app/multiple_fixes]

220. By Tiago Salem Herrmann on 2014-09-10

Change placeholder text
add recipient when user type a comma

221. By Tiago Salem Herrmann on 2014-09-10

change screen title to Messages instead of Chats

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:221
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/457/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/4703
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3466
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-i386-ci/251
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/4474
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5955
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5955/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/13031
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/2868
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3771
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3771/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[lp:~tiagosh/messaging-app/multiple_fixes]

222. By Tiago Salem Herrmann on 2014-09-11

invoke attachment removal popup also on onHoldAndPress

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:222
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/460/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/4745
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3484
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-i386-ci/254
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/4514
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5997
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5997/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/2884
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3789
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3789/artifact/work/output/*zip*/output.zip

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

review: Approve (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.
Yes

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/MainPage.qml'
--- src/qml/MainPage.qml	2014-09-04 03:08:20 +0000
+++ src/qml/MainPage.qml	2014-09-11 17:40:51 +0000
@@ -34,7 +34,7 @@
     }
 
     state: selectionMode ? "select" : searching ? "search" : "default"
-    title: selectionMode ? " " : i18n.tr("Chats")
+    title: selectionMode ? " " : i18n.tr("Messages")
 
     bottomEdgeEnabled: !selectionMode && !searching
     bottomEdgeTitle: i18n.tr("Create new")

=== modified file 'src/qml/Messages.qml'
--- src/qml/Messages.qml	2014-09-04 18:25:47 +0000
+++ src/qml/Messages.qml	2014-09-11 17:40:51 +0000
@@ -50,6 +50,7 @@
     property QtObject contactWatcher: contactWatcherInternal
     property string lastFilter: ""
     property string text: ""
+    property bool pendingMessage: false
 
     onContactWatcherChanged: {
         if (!contactWatcher) {
@@ -534,6 +535,12 @@
            sortField: "timestamp"
            sortOrder: HistorySort.DescendingOrder
         }
+        onCountChanged: {
+            if (pendingMessage) {
+                pendingMessage = false
+                messageList.positionViewAtBeginning()
+            }
+        }
     }
 
     MessagesListView {
@@ -558,6 +565,12 @@
         height: selectionMode ? 0 : textEntry.height + units.gu(2)
         visible: !selectionMode
         clip: true
+        MouseArea {
+            anchors.fill: parent
+            onClicked: {
+                messageTextArea.forceActiveFocus()
+            }
+        }
 
         Behavior on height {
             UbuntuNumberAnimation { }
@@ -644,9 +657,11 @@
                             anchors.fill: parent
                             onClicked: {
                                 mouse.accept = true
+                                Qt.inputMethod.hide()
                                 activeAttachmentIndex = index
                                 PopupUtils.open(attachmentPopover, parent)
                             }
+                            onPressAndHold: clicked(mouse)
                         }
                     }
                 }
@@ -697,9 +712,11 @@
                             anchors.fill: parent
                             onClicked: {
                                 mouse.accept = true
+                                Qt.inputMethod.hide()
                                 activeAttachmentIndex = index
                                 PopupUtils.open(attachmentPopover, parent)
                             }
+                            onPressAndHold: clicked(mouse)
                         }
                     }
                 }
@@ -724,9 +741,11 @@
                             anchors.fill: parent
                             onClicked: {
                                 mouse.accept = true
+                                Qt.inputMethod.hide()
                                 activeAttachmentIndex = index
                                 PopupUtils.open(attachmentPopover, parent)
                             }
+                            onPressAndHold: clicked(mouse)
                         }
                     }
                 }
@@ -819,7 +838,7 @@
             font.pixelSize: FontUtils.sizeToPixels("small")
             activeFocusOnPress: false
             enabled: {
-               if (participants.length > 0 || multiRecipient.recipientCount > 0) {
+               if (participants.length > 0 || multiRecipient.recipientCount > 0 || multiRecipient.searchString !== "") {
                     if (textEntry.text != "" || textEntry.inputMethodComposing || attachments.count > 0) {
                         return true
                     }
@@ -846,6 +865,8 @@
                 if (textEntry.text == "" && attachments.count == 0) {
                     return
                 }
+                // refresh the recipient list
+                multiRecipient.focus = false
                 // dont change the participants list
                 if (participants.length == 0) {
                     participants = multiRecipient.recipients
@@ -868,12 +889,14 @@
                         attachment.push(item.filePath)
                         newAttachments.push(attachment)
                     }
+                    pendingMessage = true
                     chatManager.sendMMS(participants, textEntry.text, newAttachments, messages.account.accountId)
                     textEntry.text = ""
                     attachments.clear()
                     return
                 }
 
+                pendingMessage = true
                 chatManager.sendMessage(participants, textEntry.text, messages.account.accountId)
                 textEntry.text = ""
             }

=== modified file 'src/qml/MultiRecipientInput.qml'
--- src/qml/MultiRecipientInput.qml	2014-08-11 22:59:14 +0000
+++ src/qml/MultiRecipientInput.qml	2014-09-11 17:40:51 +0000
@@ -142,7 +142,7 @@
                     width: units.gu(20)
                     hasClearButton: false
                     clip: false
-                    placeholderText: multiRecipientWidget.recipientCount  <= 0 ? i18n.tr("Add contacts...") :""
+                    placeholderText: multiRecipientWidget.recipientCount  <= 0 ? i18n.tr("To:") :""
                     font.family: "Ubuntu"
                     font.weight: Font.Light
                     color: "#752571"
@@ -154,7 +154,14 @@
                             text = ""
                         }
                     }
-                    onTextChanged: searchString = text
+                    onTextChanged: {
+                        if (text.substring(text.length -1, text.length) == ",") {
+                            addRecipient(text.substring(0, text.length - 1))
+                            text = ""
+                            return
+                        }
+                        searchString = text
+                    }
                     Keys.onReturnPressed: {
                         if (text == "")
                             return