fixes FossifyOrg#139

Honk2 · Jul 21, 2024 · 02097bc · 02097bc
1 parent aa627e6
commit 02097bc
Showing 1 changed file with 13 additions and 1 deletion.
diff --git a/app/src/main/kotlin/org/fossify/phone/adapters/ContactsAdapter.kt b/app/src/main/kotlin/org/fossify/phone/adapters/ContactsAdapter.kt
@@ -369,7 +369,19 @@ class ContactsAdapter(
                     if (name.contains(textToHighlight, true)) {
                         name.highlightTextPart(textToHighlight, properPrimaryColor)
                     } else {
-                        name.highlightTextFromNumbers(textToHighlight.replace('1', ' '), properPrimaryColor)
+                        var spacedTextToHighlight = textToHighlight
+                        val strippedName = PhoneNumberUtils.convertKeypadLettersToDigits(name.filterNot { it.isWhitespace() })
+                        val startIndex = strippedName.indexOf(textToHighlight)
+
+                        if ( strippedName.contains(textToHighlight)) {
+                            for (i in 0..spacedTextToHighlight.length) {
+                                if (name[startIndex+i].isWhitespace()) {
+                                    spacedTextToHighlight = spacedTextToHighlight.replaceRange(i, i, " ")
+                                }
+                            }
+                        }
+
+                        name.highlightTextFromNumbers(spacedTextToHighlight, properPrimaryColor)
                     }
                 }
             }