From 433cfef22106b05164349bf29d193f88bf35ca84 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Sat, 7 Dec 2019 10:43:29 +0100
Subject: [PATCH] moving some shared helper functions at the Constants.kt

---
 .../pro/activities/SelectContactActivity.kt   |  3 +--
 .../contacts/pro/adapters/ContactsAdapter.kt  | 21 +-----------------
 .../pro/adapters/SelectContactsAdapter.kt     | 22 ++-----------------
 .../pro/fragments/MyViewPagerFragment.kt      |  4 +---
 .../contacts/pro/helpers/Constants.kt         | 22 +++++++++++++++++++
 5 files changed, 27 insertions(+), 45 deletions(-)

diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/SelectContactActivity.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/SelectContactActivity.kt
index 0122f50b..69db856b 100644
--- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/SelectContactActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/SelectContactActivity.kt
@@ -21,6 +21,7 @@ import com.simplemobiletools.contacts.pro.extensions.config
 import com.simplemobiletools.contacts.pro.extensions.getContactPublicUri
 import com.simplemobiletools.contacts.pro.extensions.getVisibleContactSources
 import com.simplemobiletools.contacts.pro.helpers.ContactsHelper
+import com.simplemobiletools.contacts.pro.helpers.getProperText
 import com.simplemobiletools.contacts.pro.models.Contact
 import kotlinx.android.synthetic.main.activity_select_contact.*
 
@@ -156,8 +157,6 @@ class SelectContactActivity : SimpleActivity() {
         (select_contact_list.adapter as? SelectContactsAdapter)?.updateItems(contactsIgnoringSearch)
     }
 
-    private fun getProperText(text: String, shouldNormalize: Boolean) = if (shouldNormalize) text.normalizeString() else text
-
     private fun showSortingDialog() {
         ChangeSortingDialog(this) {
             initContacts()
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 13cc99dd..e9380fc1 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,10 +1,6 @@
 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
@@ -285,7 +281,7 @@ class ContactsAdapter(activity: SimpleActivity, var contactItems: ArrayList<Cont
                 if (fullName.contains(textToHighlight, true)) {
                     fullName.highlightTextPart(textToHighlight, adjustedPrimaryColor)
                 } else {
-                    highlightTextFromNumbers(fullName, textToHighlight)
+                    highlightTextFromNumbers(fullName, textToHighlight, adjustedPrimaryColor)
                 }
             }
 
@@ -348,19 +344,4 @@ 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
-    }
 }
diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/SelectContactsAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/SelectContactsAdapter.kt
index 35ba0a5f..2da0c8fd 100644
--- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/SelectContactsAdapter.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/SelectContactsAdapter.kt
@@ -1,10 +1,6 @@
 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.util.SparseArray
 import android.view.View
 import android.view.ViewGroup
@@ -24,6 +20,7 @@ import com.simplemobiletools.contacts.pro.R
 import com.simplemobiletools.contacts.pro.activities.SimpleActivity
 import com.simplemobiletools.contacts.pro.extensions.config
 import com.simplemobiletools.contacts.pro.helpers.Config
+import com.simplemobiletools.contacts.pro.helpers.highlightTextFromNumbers
 import com.simplemobiletools.contacts.pro.models.Contact
 import kotlinx.android.synthetic.main.item_add_favorite_with_number.view.*
 import java.util.*
@@ -120,7 +117,7 @@ class SelectContactsAdapter(val activity: SimpleActivity, var contacts: ArrayLis
                     if (fullName.contains(textToHighlight, true)) {
                         fullName.highlightTextPart(textToHighlight, adjustedPrimaryColor)
                     } else {
-                        highlightTextFromNumbers(fullName, textToHighlight)
+                        highlightTextFromNumbers(fullName, textToHighlight, adjustedPrimaryColor)
                     }
                 }
 
@@ -173,19 +170,4 @@ class SelectContactsAdapter(val activity: SimpleActivity, var contacts: ArrayLis
             toggleItemSelection(select, adapterPosition)
         }
     }
-
-    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
-    }
 }
diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/fragments/MyViewPagerFragment.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/fragments/MyViewPagerFragment.kt
index 198c4983..85395447 100644
--- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/fragments/MyViewPagerFragment.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/fragments/MyViewPagerFragment.kt
@@ -264,7 +264,7 @@ abstract class MyViewPagerFragment(context: Context, attributeSet: AttributeSet)
             }
 
             if (filtered.isEmpty() && this@MyViewPagerFragment is FavoritesFragment) {
-                fragment_placeholder.text = activity?.getString(R.string.no_items_found)
+                fragment_placeholder.text = activity?.getString(R.string.no_contacts_found)
             }
 
             fragment_placeholder.beVisibleIf(filtered.isEmpty())
@@ -283,8 +283,6 @@ abstract class MyViewPagerFragment(context: Context, attributeSet: AttributeSet)
         }
     }
 
-    private fun getProperText(text: String, shouldNormalize: Boolean) = if (shouldNormalize) text.normalizeString() else text
-
     fun onSearchOpened() {
         contactsIgnoringSearch = (fragment_list?.adapter as? ContactsAdapter)?.contactItems ?: ArrayList()
         groupsIgnoringSearch = (fragment_list?.adapter as? GroupsAdapter)?.groups ?: ArrayList()
diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/Constants.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/Constants.kt
index 1a122b0f..376e4ac3 100644
--- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/Constants.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/Constants.kt
@@ -1,6 +1,11 @@
 package com.simplemobiletools.contacts.pro.helpers
 
 import android.provider.ContactsContract.CommonDataKinds
+import android.telephony.PhoneNumberUtils
+import android.text.Spannable
+import android.text.SpannableString
+import android.text.style.ForegroundColorSpan
+import com.simplemobiletools.commons.extensions.normalizeString
 import com.simplemobiletools.contacts.pro.models.LocalContact
 
 // shared prefs
@@ -109,3 +114,20 @@ const val SIGNAL_PACKAGE = "org.thoughtcrime.securesms"
 const val WHATSAPP_PACKAGE = "com.whatsapp"
 
 fun getEmptyLocalContact() = LocalContact(0, "", "", "", "", "", "", null, ArrayList(), ArrayList(), ArrayList(), 0, ArrayList(), "", ArrayList(), "", "", ArrayList(), ArrayList())
+
+fun getProperText(text: String, shouldNormalize: Boolean) = if (shouldNormalize) text.normalizeString() else text
+
+fun highlightTextFromNumbers(name: String, textToHighlight: String, adjustedPrimaryColor: Int): 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
+}