From 02097bccbd953877cde529b4e45a67873f65b355 Mon Sep 17 00:00:00 2001
From: Honk2 <shaigan@web.de>
Date: Sun, 21 Jul 2024 22:29:41 +0200
Subject: [PATCH] fixes #139

---
 .../org/fossify/phone/adapters/ContactsAdapter.kt  | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 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
index d05fe94c..f5920b80 100644
--- 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)
                     }
                 }
             }