From b7fb0b979cfce1fc862b8803fb06cc4be66631e1 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Sun, 6 Jan 2019 11:16:54 +0100
Subject: [PATCH] improve name highlighting from the dialpad

---
 .../contacts/pro/adapters/ContactsAdapter.kt  | 28 ++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/ContactsAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/ContactsAdapter.kt
index 87ab6341..4b3de60a 100644
--- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/ContactsAdapter.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/ContactsAdapter.kt
@@ -1,6 +1,10 @@
 package com.simplemobiletools.contacts.pro.adapters
 
 import android.graphics.drawable.Drawable
+import android.telephony.PhoneNumberUtils
+import android.text.Spannable
+import android.text.SpannableString
+import android.text.style.ForegroundColorSpan
 import android.view.Menu
 import android.view.View
 import android.view.ViewGroup
@@ -255,7 +259,14 @@ class ContactsAdapter(activity: SimpleActivity, var contactItems: ArrayList<Cont
         view.apply {
             contact_frame?.isSelected = selectedKeys.contains(contact.id)
             val fullName = contact.getNameToDisplay()
-            contact_name.text = if (textToHighlight.isEmpty()) fullName else fullName.highlightTextPart(textToHighlight, adjustedPrimaryColor)
+            contact_name.text = if (textToHighlight.isEmpty()) fullName else {
+                if (fullName.contains(textToHighlight, true)) {
+                    fullName.highlightTextPart(textToHighlight, adjustedPrimaryColor)
+                } else {
+                    highlightTextFromNumbers(fullName, textToHighlight)
+                }
+            }
+
             contact_name.setTextColor(textColor)
             contact_name.setPadding(if (showContactThumbnails) smallPadding else bigPadding, smallPadding, smallPadding, 0)
 
@@ -300,4 +311,19 @@ class ContactsAdapter(activity: SimpleActivity, var contactItems: ArrayList<Cont
             }
         }
     }
+
+    private fun highlightTextFromNumbers(name: String, textToHighlight: String): SpannableString {
+        val spannableString = SpannableString(name)
+        val digits = PhoneNumberUtils.convertKeypadLettersToDigits(name)
+        if (digits.contains(textToHighlight)) {
+            val startIndex = digits.indexOf(textToHighlight, 0, true)
+            val endIndex = Math.min(startIndex + textToHighlight.length, name.length)
+            try {
+                spannableString.setSpan(ForegroundColorSpan(adjustedPrimaryColor), startIndex, endIndex, Spannable.SPAN_EXCLUSIVE_INCLUSIVE)
+            } catch (ignored: IndexOutOfBoundsException) {
+            }
+        }
+
+        return spannableString
+    }
 }