fix: mention highlight [WPB-3507] (#2164)

wireapp · Sep 4, 2023 · 4fb4f46 · 4fb4f46
1 parent b0a4956
commit 4fb4f46
Show file tree

Hide file tree

Showing 8 changed files with 69 additions and 32 deletions.
diff --git a/app/src/main/kotlin/com/wire/android/ui/home/conversations/mention/MemberItemToMention.kt b/app/src/main/kotlin/com/wire/android/ui/home/conversations/mention/MemberItemToMention.kt
@@ -41,7 +41,7 @@ fun MemberItemToMention(
     name: String,
     label: String,
     membership: Membership,
-    searchQuery: String = "",
+    searchQuery: String,
     clickable: Clickable,
     modifier: Modifier = Modifier
 ) {

diff --git a/app/src/main/kotlin/com/wire/android/ui/home/conversations/search/HighLightName.kt b/app/src/main/kotlin/com/wire/android/ui/home/conversations/search/HighLightName.kt
@@ -23,10 +23,11 @@ package com.wire.android.ui.home.conversations.search
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.SideEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
@@ -48,19 +49,22 @@ fun HighlightName(
     searchQuery: String,
     modifier: Modifier = Modifier
 ) {
+    val scope = rememberCoroutineScope()
     var highlightIndexes by remember {
         mutableStateOf(emptyList<MatchQueryResult>())
     }
 
-    LaunchedEffect(searchQuery) {
-        launch {
+    val queryWithoutSuffix = searchQuery.removeQueryPrefix()
+
+    SideEffect {
+        scope.launch {
             highlightIndexes = QueryMatchExtractor.extractQueryMatchIndexes(
-                matchText = searchQuery,
+                matchText = queryWithoutSuffix,
                 text = name
             )
         }
     }
-    if (searchQuery != String.EMPTY && highlightIndexes.isNotEmpty()) {
+    if (queryWithoutSuffix != String.EMPTY && highlightIndexes.isNotEmpty()) {
         Text(
             buildAnnotatedString {
                 withStyle(
@@ -75,12 +79,14 @@ fun HighlightName(
                 }
 
                 highlightIndexes
-                    .forEach { highLightIndexes ->
-                        addStyle(
-                            style = SpanStyle(background = MaterialTheme.wireColorScheme.highLight.copy(alpha = 0.5f)),
-                            start = highLightIndexes.startIndex,
-                            end = highLightIndexes.endIndex
-                        )
+                    .forEach { highLightIndex ->
+                        if (highLightIndex.endIndex <= this.length) {
+                            addStyle(
+                                style = SpanStyle(background = MaterialTheme.wireColorScheme.highLight.copy(alpha = 0.5f)),
+                                start = highLightIndex.startIndex,
+                                end = highLightIndex.endIndex
+                            )
+                        }
                     }
             },
             maxLines = 1,

diff --git a/app/src/main/kotlin/com/wire/android/ui/home/conversations/search/HighLightSubtTitle.kt b/app/src/main/kotlin/com/wire/android/ui/home/conversations/search/HighLightSubtTitle.kt
@@ -35,32 +35,34 @@ import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.text.withStyle
 import com.wire.android.ui.theme.wireColorScheme
 import com.wire.android.ui.theme.wireTypography
+import com.wire.android.util.EMPTY
 import com.wire.android.util.MatchQueryResult
 import com.wire.android.util.QueryMatchExtractor
 import kotlinx.coroutines.launch
 
-
 @Composable
 fun HighlightSubtitle(
     subTitle: String,
     searchQuery: String = "",
     suffix: String = "@"
 ) {
     val scope = rememberCoroutineScope()
-
     var highlightIndexes by remember {
         mutableStateOf(emptyList<MatchQueryResult>())
     }
 
+    val queryWithoutSuffix = searchQuery.removeQueryPrefix()
+
     SideEffect {
         scope.launch {
             highlightIndexes = QueryMatchExtractor.extractQueryMatchIndexes(
-                matchText = searchQuery.validateSearchQuery(),
+                matchText = queryWithoutSuffix,
                 text = subTitle
             )
         }
     }
-    if (highlightIndexes.isNotEmpty()) {
+
+    if (queryWithoutSuffix != String.EMPTY && highlightIndexes.isNotEmpty()) {
         Text(
             buildAnnotatedString {
                 withStyle(
@@ -76,14 +78,16 @@ fun HighlightSubtitle(
                 }
 
                 highlightIndexes
-                    .forEach { highLightIndexes ->
-                        addStyle(
-                            style = SpanStyle(
-                                background = MaterialTheme.wireColorScheme.highLight.copy(alpha = 0.5f),
-                            ),
-                            start = highLightIndexes.startIndex + suffix.length,
-                            end = highLightIndexes.endIndex + suffix.length
-                        )
+                    .forEach { highLightIndex ->
+                        if (highLightIndex.endIndex <= this.length) {
+                            addStyle(
+                                style = SpanStyle(
+                                    background = MaterialTheme.wireColorScheme.highLight.copy(alpha = 0.5f),
+                                ),
+                                start = highLightIndex.startIndex + suffix.length,
+                                end = highLightIndex.endIndex + suffix.length
+                            )
+                        }
                     }
             },
             maxLines = 1,
@@ -99,11 +103,3 @@ fun HighlightSubtitle(
         )
     }
 }
-
-private fun String.validateSearchQuery(): String {
-    if (startsWith("@")) {
-        return removePrefix("@")
-    } else {
-        return this
-    }
-}
diff --git a/app/src/main/kotlin/com/wire/android/ui/home/conversations/search/QueryExtension.kt b/app/src/main/kotlin/com/wire/android/ui/home/conversations/search/QueryExtension.kt
@@ -0,0 +1,26 @@
+/*
+ * Wire
+ * Copyright (C) 2023 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ */
+package com.wire.android.ui.home.conversations.search
+
+fun String.removeQueryPrefix(): String {
+    return if (startsWith("@")) {
+        removePrefix("@")
+    } else {
+        this
+    }
+}
diff --git a/app/src/main/kotlin/com/wire/android/ui/home/messagecomposer/DropDownMentionsSuggestions.kt b/app/src/main/kotlin/com/wire/android/ui/home/messagecomposer/DropDownMentionsSuggestions.kt
@@ -45,6 +45,7 @@ import com.wire.android.ui.home.newconversation.model.Contact
 
 @Composable
 fun DropDownMentionsSuggestions(
+    searchQuery: String,
     currentSelectedLineIndex: Int,
     cursorCoordinateY: Float,
     membersToMention: List<Contact>,
@@ -91,6 +92,7 @@ fun DropDownMentionsSuggestions(
                     clickable = Clickable(enabled = true) {
                         onMentionPicked(item)
                     },
+                    searchQuery = searchQuery,
                     modifier = Modifier.onSizeChanged {
                         itemHeights[index] = it.height
                     }

diff --git a/app/src/main/kotlin/com/wire/android/ui/home/messagecomposer/MessageComposer.kt b/app/src/main/kotlin/com/wire/android/ui/home/messagecomposer/MessageComposer.kt
@@ -387,6 +387,7 @@ private fun ActiveMessageComposer(
                             if (messageComposerViewState.value.mentionSearchResult.isNotEmpty()) {
                                 MembersMentionList(
                                     membersToMention = messageComposerViewState.value.mentionSearchResult,
+                                    searchQuery = messageComposition.value.messageText,
                                     onMentionPicked = { pickedMention ->
                                         messageCompositionHolder.addMention(pickedMention)
                                         onClearMentionSearchResult()
@@ -459,6 +460,7 @@ private fun ActiveMessageComposer(
                                             currentSelectedLineIndex = currentSelectedLineIndex,
                                             cursorCoordinateY = cursorCoordinateY,
                                             membersToMention = mentionSearchResult,
+                                            searchQuery = messageComposition.value.messageText,
                                             onMentionPicked = {
                                                 messageCompositionHolder.addMention(it)
                                                 onClearMentionSearchResult()

diff --git a/app/src/main/kotlin/com/wire/android/ui/home/messagecomposer/UiMention.kt b/app/src/main/kotlin/com/wire/android/ui/home/messagecomposer/UiMention.kt
@@ -48,6 +48,7 @@ data class UiMention(
 @Composable
 fun MembersMentionList(
     membersToMention: List<Contact>,
+    searchQuery: String,
     onMentionPicked: (Contact) -> Unit
 ) {
     Column(
@@ -68,6 +69,7 @@ fun MembersMentionList(
                             label = it.label,
                             membership = it.membership,
                             clickable = Clickable { onMentionPicked(it) },
+                            searchQuery = searchQuery,
                             modifier = Modifier
                         )
                         Divider(

diff --git a/app/src/main/kotlin/com/wire/android/util/QueryMatchExtractor.kt b/app/src/main/kotlin/com/wire/android/util/QueryMatchExtractor.kt
@@ -37,6 +37,9 @@ object QueryMatchExtractor {
         text: String
     ): List<MatchQueryResult> =
         withContext(Dispatchers.Default) {
+            if (matchText.isEmpty()) {
+                return@withContext listOf()
+            }
             val index = text.indexOf(matchText, startIndex = startIndex, ignoreCase = true)
 
             if (isIndexFound(index)) {