Merge pull request #57 from RocketChat/develop

merge

app/src/main/java/chat/rocket/android/helper/MessageParser.kt

@@ -143,23 +143,19 @@ class MessageParser @Inject constructor(
 
         override fun visit(document: Document) {
             val text = builder.text()
-            val mentionsList = mentions.toMutableList().also {
-                it.add("@all")
-                it.add("@here")
-            }.distinct()
 
-            mentionsList.forEach {
+            var offset = 0
+            mentions.forEach {
                 val mentionMe = it == currentUser || it == "@all" || it == "@here"
-                var offset = text.indexOf(string = it, startIndex = 0, ignoreCase = false)
+                offset = text.indexOf(string = it, startIndex = offset, ignoreCase = false)
                 while (offset > -1) {
                     val textColor = if (mentionMe) myselfTextColor else othersTextColor
                     val backgroundColor = if (mentionMe) myselfBackgroundColor else othersBackgroundColor
                     val usernameSpan = MentionSpan(backgroundColor, textColor, radius, padding,
                         mentionMe)
-                    // Add 1 to end offset to include the @.
                     val end = offset + it.length
                     builder.setSpan(usernameSpan, offset, end, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
-                    offset = text.indexOf(string = "@$it", startIndex = end, ignoreCase = false)
+                    offset = text.indexOf(string = it, startIndex = end, ignoreCase = false)
                 }
             }
         }

app/src/main/res/values-ru-rRU/strings.xml

@@ -130,10 +130,8 @@
     <string name="msg_delete_description">Вы уверены, что хотите удалить это сообщение?</string>
     <string name="msg_channel_name">Название канала</string>
     <string name="msg_search">Поиск</string>
-    <!-- TODO - Add proper translation -->
-    <string name="msg_view_more">view more</string>
-    <!-- TODO - Add proper translation -->
-    <string name="msg_view_less">view less</string>
+    <string name="msg_view_more">больше</string>
+    <string name="msg_view_less">меньше</string>
 
     <!-- Create channel messages -->
     <string name="msg_private_channel">Приватный</string>

build.gradle

@@ -10,7 +10,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.0-rc03'
+        classpath 'com.android.tools.build:gradle:3.2.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}"
         classpath "org.jetbrains.dokka:dokka-gradle-plugin:${versions.dokka}"
         classpath 'com.google.gms:google-services:4.0.2'