Merge lp:~rpadovani/telegram-app/improveTextAreaDialogPage into lp:telegram-app/app-dev

[Riccardo Padovani]

Improved textfield in dialog page

Improved textfield in dialog page:
- Added button to send messages
- Substitued textfield with a textarea, as on Android
- Added a white rectangle as background

[Michał Karnicki (karni)]

Some in-line comments.

review: Needs Fixing

[Nekhelesh Ramananthan (nik90)]

When trying to run this MP, I get the following error,
telegram.qml:88 Type DialogPage unavailable
ui/DialogPage.qml:86 Cannot assign to non-existent property "background"

You need to change, 33 + background: "white" to color: "white.

review: Needs Fixing

[Michał Karnicki (karni)]

This will fix:
- bottom rect background
- closing the keyboard on each msg send
- the send button onClicked

=== modified file 'ui/DialogPage.qml'
--- ui/DialogPage.qml 2014-10-04 22:01:05 +0000
+++ ui/DialogPage.qml 2014-10-06 09:44:15 +0000
@@ -83,7 +83,7 @@
             }
             height: message.height + units.gu(2)

- background: "white"
+ color: "white"

             // Add button for emoji here

@@ -116,11 +116,13 @@
                 }

                 fillMode: Image.Pad
+ focus: false

                 enabled: message.text
                 source: enabled ? "../images/ic_send.png" : "../images/ic_send_disabled.png"

                 MouseArea {
+ anchors.fill: parent
                     onClicked: {
                         sendMessage(message.text);
                         list.positionViewAtBeginning();

[Michał Karnicki (karni)]

sorry for the nasty indentation, but I guess you'll figure what needs to be changed :)

[lp:~rpadovani/telegram-app/improveTextAreaDialogPage]

95. By Riccardo Padovani on 2014-10-06

Fixed errors

[Michał Karnicki (karni)]

Well done!

review: Approve

[lp:~rpadovani/telegram-app/improveTextAreaDialogPage]

96. By Riccardo Padovani on 2014-10-06

Merged from upstream

=== added file 'images/ic_send.png'
Binary files images/ic_send.png	1970-01-01 00:00:00 +0000 and images/ic_send.png	2014-10-06 10:50:48 +0000 differ
=== added file 'images/ic_send_disabled.png'
Binary files images/ic_send_disabled.png	1970-01-01 00:00:00 +0000 and images/ic_send_disabled.png	2014-10-06 10:50:48 +0000 differ
=== modified file 'ui/DialogPage.qml'
--- ui/DialogPage.qml	2014-10-06 10:18:43 +0000
+++ ui/DialogPage.qml	2014-10-06 10:50:48 +0000
@@ -89,22 +89,59 @@
             }
         }
 
-        TextField {
-            id: message
+        Rectangle {
+            id: bottomRectangle
             anchors {
                 left: parent.left
+                right: parent.right
                 bottom: parent.bottom
-                right: parent.right
-
-                margins: units.gu(1)
-            }
-            enabled: isConnected
-            placeholderText: i18n.tr("Type message")
-            inputMethodHints: Qt.ImhNone
-
-            onAccepted: {
-                sendMessage(message.text);
-                list.positionViewAtBeginning();
+            }
+            height: message.height + units.gu(2)
+
+            color: "white"
+
+            // Add button for emoji here
+
+            TextArea {
+                id: message
+                anchors {
+                    left: parent.left
+                    right: sendButton.left
+                    bottom: parent.bottom
+
+                    margins: units.gu(1)
+                }
+                enabled: isConnected
+                placeholderText: i18n.tr("Type message")
+                inputMethodHints: Qt.ImhNone
+
+                autoSize: true
+                maximumLineCount: 4
+            }
+
+            Image {
+                id: sendButton
+                anchors {
+                    right: parent.right
+                    top: parent.top
+                    bottom: parent.bottom
+
+                    margins: units.gu(1.5)
+                }
+
+                fillMode: Image.Pad
+                focus: false
+
+                enabled: message.text
+                source: enabled ? "../images/ic_send.png" : "../images/ic_send_disabled.png"
+
+                MouseArea {
+                    anchors.fill: parent
+                    onClicked: {
+                        sendMessage(message.text);
+                        list.positionViewAtBeginning();
+                    }
+                }
             }
         }
 
@@ -132,7 +169,7 @@
             anchors {
                 top: parent.top
                 left: parent.left
-                bottom: message.top
+                bottom: bottomRectangle.top
                 right: parent.right
             }
             header: Item {