Merge lp:~mzanetti/telegram-app/reply into lp:telegram-app

[Michael Zanetti]

Add support for reply messages

[lp:~mzanetti/telegram-app/reply]

160. By Michael Zanetti on 2016-03-01

merge prereq

161. By Michael Zanetti on 2016-03-01

merge prereq

=== modified file 'telegram/app/qml/AccountMessageList.qml'
--- telegram/app/qml/AccountMessageList.qml	2016-03-01 11:30:54 +0000
+++ telegram/app/qml/AccountMessageList.qml	2016-03-01 11:30:54 +0000
@@ -248,6 +248,13 @@
                         onTriggered: Clipboard.push(item.message)
                     },
                     Action {
+                        iconName: "mail-reply"
+                        text: i18n.tr("Reply")
+                        onTriggered: {
+                            acc_msg_list.replyToRequest(message.id);
+                        }
+                    },
+                    Action {
                         iconName: "info"
                         text: i18n.tr("Sticker Pack info")
                         visible: message_item.isSticker && telegramObject.documentStickerId(message_item.media.document) !== 0

=== modified file 'telegram/app/qml/AccountSendMessage.qml'
--- telegram/app/qml/AccountSendMessage.qml	2016-02-29 10:22:26 +0000
+++ telegram/app/qml/AccountSendMessage.qml	2016-03-01 11:30:54 +0000
@@ -1,5 +1,6 @@
 import QtQuick 2.4
 import Ubuntu.Components 1.3
+import Ubuntu.Components 1.3 as UC
 import Ubuntu.Components.Popups 0.1
 import Ubuntu.Components.ListItems 1.0 as ListItem
 import Ubuntu.Connectivity 1.0
@@ -369,8 +370,8 @@
 //        if(privates.suggestionItem)
 //            privates.suggestionItem.destroy()
 
-        smsg.accepted(msg, 0);//messageReply.replyMessage? messageReply.replyMessage.id : 0)
-//        messageReply.discard()
+        smsg.accepted(msg, messageReply.replyMessage? messageReply.replyMessage.id : 0)
+        messageReply.discard()
         txt.text = ""
     }
 
@@ -403,25 +404,28 @@
         Rectangle {
             anchors.fill: parent
             color: smsg.color
-            opacity: 0.8
         }
 
         MessageReplyItem {
             id: messageReply
             telegram: telegramObject
+            maximumWidth: parent.width - units.gu(6)
 
             function discard() {
                 messageReply.replyMessage = messageReply.message
             }
         }
 
-        Button {
-            width: height
+        AbstractButton {
+            width: units.gu(4)
+            height: width
             anchors.right: parent.right
-            anchors.rightMargin: 4*Devices.density
+            anchors.rightMargin: units.gu(1)
             anchors.verticalCenter: parent.verticalCenter
-            //iconSource: "files/close.png"
-            text: i18n.tr("Close")
+            Icon {
+                anchors.fill: parent
+                name: "close"
+            }
             onClicked: messageReply.discard()
         }
     }

=== modified file 'telegram/app/qml/MessageReplyItem.qml'
--- telegram/app/qml/MessageReplyItem.qml	2015-10-01 15:18:23 +0000
+++ telegram/app/qml/MessageReplyItem.qml	2016-03-01 11:30:54 +0000
@@ -37,7 +37,7 @@
             id: reply_separator
             width: units.dp(2)
             height: parent.height
-            color: message.out ? Colors.dark_green : Colors.telegram_blue
+            color: !message || message.out ? UbuntuColors.green : UbuntuColors.blue
         }
 
         Column {
@@ -51,7 +51,6 @@
                 // font.family: AsemanApp.globalFont.family
                 fontSize: "small"
                 font.weight: Font.Normal
-                // opacity: 0.8
                 color: message.out ? Colors.dark_green : Colors.telegram_blue
 //                    if(!replyMessage && (!message || message.out))
 //                        return Cutegram.currentTheme.messageOutgoingNameColor
@@ -172,7 +171,9 @@
                         return ""
 
                     var replyMsg = replyMessage? replyMessage : telegram.message(message.replyToMsgId)
-                    return emojis.textToEmojiText(replyMsg.message,16,true)
+                    // We use emojis in the font for now, no need to replace them
+                    //return emojis.textToEmojiText(replyMsg.message,16,true)
+                    return replyMsg.message
                 }
 
                 property real htmlWidth: Cutegram.htmlWidth(text)

=== modified file 'telegram/app/qml/components/DialogsListItem.qml'
--- telegram/app/qml/components/DialogsListItem.qml	2015-10-30 09:57:14 +0000
+++ telegram/app/qml/components/DialogsListItem.qml	2016-03-01 11:30:54 +0000
@@ -187,7 +187,9 @@
                 // TRANSLATORS: Indicates in a subtitle of a dialog list item that someone is typing.
                 return i18n.tr("typing...")
             } else {
-                return emojis.bodyTextToEmojiText(message.message, 16, true);
+                // We use emojis in our font currently, so no need to replace them here for now
+                //return emojis.bodyTextToEmojiText(message.message, 16, true);
+                return message.message
             }
         }
     }