From 662f1333c242a6037e34d5942179120fb0c49fe5 Mon Sep 17 00:00:00 2001
From: Danil Nikolaev <lischenkodev@gmail.com>
Date: Sun, 21 Feb 2021 01:38:08 +0300
Subject: [PATCH] Mentions matching

---
 .idea/gradle.xml                              |  1 +
 .../meloda/fast/adapter/MessagesAdapter.kt    |  2 +-
 .../com/meloda/fast/api/model/VKMessage.kt    |  5 ++-
 .../java/com/meloda/fast/api/util/VKUtil.kt   | 42 ++++++++++++++++++-
 .../fast/fragment/FragmentConversations.kt    |  2 +-
 app/src/main/res/layout/item_conversation.xml |  2 +-
 .../main/res/menu/activity_main_bottom.xml    |  2 +-
 app/src/main/res/values/strings.xml           |  2 +-
 8 files changed, 50 insertions(+), 8 deletions(-)

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 18de3ac5..23a89bbb 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="GradleMigrationSettings" migrationVersion="1" />
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
diff --git a/app/src/main/java/com/meloda/fast/adapter/MessagesAdapter.kt b/app/src/main/java/com/meloda/fast/adapter/MessagesAdapter.kt
index fd531910..3c57e2f9 100644
--- a/app/src/main/java/com/meloda/fast/adapter/MessagesAdapter.kt
+++ b/app/src/main/java/com/meloda/fast/adapter/MessagesAdapter.kt
@@ -392,7 +392,7 @@ class MessagesAdapter(
                     if (message.isOutbox()) R.attr.messageOutTextColor else R.attr.messageInTextColor
                 )
             )
-            text.text = VKUtil.matchMentions(message.text)
+            text.text = message.text
         }
 
         fun prepareDate(message: VKMessage, date: TextView) {
diff --git a/app/src/main/java/com/meloda/fast/api/model/VKMessage.kt b/app/src/main/java/com/meloda/fast/api/model/VKMessage.kt
index b0b3fa38..dbb8dba2 100644
--- a/app/src/main/java/com/meloda/fast/api/model/VKMessage.kt
+++ b/app/src/main/java/com/meloda/fast/api/model/VKMessage.kt
@@ -2,6 +2,7 @@ package com.meloda.fast.api.model
 
 import android.util.ArrayMap
 import androidx.room.*
+import com.meloda.fast.api.util.VKUtil
 import com.meloda.fast.database.dao.converters.ArrayListToByteArrayConverter
 import com.meloda.fast.database.dao.converters.ForwardedConverter
 import org.json.JSONObject
@@ -125,7 +126,9 @@ open class VKMessage() : VKModel() {
         fromId = o.optInt("from_id", -1)
         editTime = o.optInt("edit_time", -1)
         isOut = o.optInt("out") == 1
-        text = o.optString("text")
+
+        text = VKUtil.prepareMessageText(o.optString("text"))
+
         randomId = o.optInt("random_id", -1)
         conversationMessageId = o.optInt("conversation_message_id", -1)
         isImportant = o.optBoolean("important")
diff --git a/app/src/main/java/com/meloda/fast/api/util/VKUtil.kt b/app/src/main/java/com/meloda/fast/api/util/VKUtil.kt
index 059e3603..637c2a0b 100644
--- a/app/src/main/java/com/meloda/fast/api/util/VKUtil.kt
+++ b/app/src/main/java/com/meloda/fast/api/util/VKUtil.kt
@@ -80,8 +80,46 @@ object VKUtil {
         return values
     }
 
-    fun matchMentions(text: String): String {
-        return text
+    fun prepareMessageText(message: String): String {
+        if (message.isEmpty()) return message
+
+        var newText = message
+
+        val mentions = hashMapOf<String, String>()
+
+        var startFrom = 0
+
+        while (true) {
+            val leftBracketIndex = newText.indexOf('[', startFrom)
+            val verticalLineIndex = newText.indexOf('|', startFrom)
+            val rightBracketIndex = newText.indexOf(']', startFrom)
+
+            if (leftBracketIndex == -1 ||
+                verticalLineIndex == -1 ||
+                rightBracketIndex == -1
+            ) {
+                break
+            }
+
+            val id = newText.substring(leftBracketIndex + 1, verticalLineIndex)
+
+            if (!id.matches(Regex("^id(\\d+)\$")) || rightBracketIndex - verticalLineIndex < 2) {
+                break
+            }
+
+            val text = newText.substring(verticalLineIndex + 1, rightBracketIndex)
+
+            val str = "[$id|$text]"
+
+            mentions[str] = text
+            startFrom = rightBracketIndex + 1
+        }
+
+        mentions.forEach {
+            newText = newText.replace(it.key, it.value)
+        }
+
+        return newText
     }
 
 //    fun removeTime(date: Date): Long {
diff --git a/app/src/main/java/com/meloda/fast/fragment/FragmentConversations.kt b/app/src/main/java/com/meloda/fast/fragment/FragmentConversations.kt
index f5defdbd..c8aa066d 100644
--- a/app/src/main/java/com/meloda/fast/fragment/FragmentConversations.kt
+++ b/app/src/main/java/com/meloda/fast/fragment/FragmentConversations.kt
@@ -74,7 +74,7 @@ class FragmentConversations : BaseFragment(), ConversationsView {
 
     private fun prepareToolbar() {
         initToolbar(R.id.toolbar)
-        toolbar.title = getString(R.string.navigation_conversations)
+        toolbar.title = getString(R.string.navigation_chats)
         setProfileAvatar()
 
         TaskManager.addOnEventListener(object : TaskManager.OnEventListener {
diff --git a/app/src/main/res/layout/item_conversation.xml b/app/src/main/res/layout/item_conversation.xml
index c53d99bc..ffcccacb 100644
--- a/app/src/main/res/layout/item_conversation.xml
+++ b/app/src/main/res/layout/item_conversation.xml
@@ -122,7 +122,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="4dp"
-                    android:layout_marginEnd="12dp"
+                    android:layout_marginEnd="16dp"
                     android:baselineAligned="false"
                     android:gravity="center_vertical"
                     android:singleLine="true"
diff --git a/app/src/main/res/menu/activity_main_bottom.xml b/app/src/main/res/menu/activity_main_bottom.xml
index 4e42f714..b05319e7 100644
--- a/app/src/main/res/menu/activity_main_bottom.xml
+++ b/app/src/main/res/menu/activity_main_bottom.xml
@@ -9,7 +9,7 @@
     <item
         android:id="@+id/navigationConversations"
         android:icon="@drawable/ic_message_outline"
-        android:title="@string/navigation_conversations" />
+        android:title="@string/navigation_chats" />
 
     <item
         android:id="@+id/navigationImportant"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c3a8cd36..5fd9e02b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -38,7 +38,7 @@
     <string name="activity_login">Login</string>
 
     <string name="navigation_search">Search</string>
-    <string name="navigation_conversations">Conversations</string>
+    <string name="navigation_chats">Chats</string>
     <string name="navigation_friends">Friends</string>
     <string name="navigation_important">Important</string>
     <string name="navigation_settings">Settings</string>