Merge lp:~mzanetti/telegram-app/hashtag-completion into lp:telegram-app

[Michael Zanetti]

add support for #hashtag completion

[Michał Karnicki (karni)]

Awesome :)!

review: Approve

=== modified file 'telegram/app/qml/AccountSendMessage.qml'
--- telegram/app/qml/AccountSendMessage.qml	2016-02-20 23:22:45 +0000
+++ telegram/app/qml/AccountSendMessage.qml	2016-02-20 23:22:45 +0000
@@ -183,10 +183,12 @@
         }
         onDisplayTextChanged: {
             var lastAtPosition = displayText.lastIndexOf("@");
+            var lastHashPosition = displayText.lastIndexOf("#");
             var lastSpacePosition = displayText.lastIndexOf(" ");
             if (!privates.suggestionItem && lastAtPosition == lastSpacePosition + 1) {
                 privates.suggestionItem = username_sgs_component.createObject(send_msg)
                 privates.suggestionItem.y = -privates.suggestionItem.height
+                privates.suggestionItem.objectName = "username";
 
                 privates.suggestionItem.selected.connect(function() {
                     var uId = privates.suggestionItem.currentUserId()
@@ -200,7 +202,26 @@
 
                     privates.suggestionItem.destroy()
                 })
-            } else if (privates.suggestionItem && (lastSpacePosition > lastAtPosition || lastAtPosition == -1)) {
+            } else if (!privates.suggestionItem && lastHashPosition == lastSpacePosition + 1) {
+                privates.suggestionItem = tags_sgs_component.createObject(send_msg)
+                privates.suggestionItem.y = -privates.suggestionItem.height
+                privates.suggestionItem.objectName = "tag";
+
+                privates.suggestionItem.selected.connect(function() {
+                    var tag = privates.suggestionItem.currentTag()
+
+                    txt.selectWord()
+                    txt.remove(txt.selectionStart, txt.selectionEnd)
+                    txt.insert(txt.cursorPosition, tag + " ")
+                    txt.deselect()
+
+                    privates.suggestionItem.destroy()
+                })
+
+            } else if (privates.suggestionItem &&
+                       ((privates.suggestionItem.objectName === "username" && (lastSpacePosition > lastAtPosition || lastAtPosition == -1)) ||
+                       (privates.suggestionItem.objectName === "tag" && (lastSpacePosition > lastHashPosition || lastHashPosition == -1)))
+                       ) {
                 privates.suggestionItem.destroy();
             } else if (privates.suggestionItem) {
                 check_suggestion.restart();

=== modified file 'telegram/app/qml/TagSuggestionMenu.qml'
--- telegram/app/qml/TagSuggestionMenu.qml	2015-09-22 09:57:07 +0000
+++ telegram/app/qml/TagSuggestionMenu.qml	2016-02-20 23:22:45 +0000
@@ -4,14 +4,17 @@
 import QtGraphicalEffects 1.0
 
 Item {
-    width: 200
-    height: 200
+    id: root
+    width: parent.width
+    height: 3 * 32*Devices.density + back_frame.anchors.topMargin
     visible: fmodel.count != 0
     clip: true
 
     property Telegram telegram
     property alias keyword: fmodel.keyword
 
+    signal selected();
+
     TagFilterModel {
         id: fmodel
         userData: telegram.userData
@@ -35,10 +38,7 @@
             id: back_frame
             anchors.fill: parent
             anchors.topMargin: 8*Devices.density
-            anchors.leftMargin: 8*Devices.density
-            anchors.rightMargin: 8*Devices.density
             color: Cutegram.currentTheme.sendFrameColor
-            radius: 4*Devices.density
 
             Rectangle {
                 width: parent.width
@@ -81,6 +81,14 @@
                 text: tag
                 color: Cutegram.currentTheme.sendFrameFontColor
             }
+
+            MouseArea {
+                anchors.fill: parent
+                onClicked: {
+                    listv.currentIndex = index;
+                    root.selected();
+                }
+            }
         }
     }