From ddc713212b50052fc772ed2dfe091639b4531672 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Thu, 26 Jan 2023 15:19:37 +0100
Subject: [PATCH] properly color the IMs image at View details screen

---
 .../pro/activities/ViewContactActivity.kt        |  4 ++--
 .../contacts/pro/dialogs/CustomLabelDialog.kt    |  1 -
 .../contacts/pro/models/Contact.kt               | 16 ----------------
 app/src/main/res/layout/item_group.xml           |  2 +-
 4 files changed, 3 insertions(+), 20 deletions(-)

diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/ViewContactActivity.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/ViewContactActivity.kt
index 42508097..44c9fbed 100644
--- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/ViewContactActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/ViewContactActivity.kt
@@ -229,8 +229,8 @@ class ViewContactActivity : ContactActivity() {
 
         val textColor = getProperTextColor()
         arrayOf(
-            contact_name_image, contact_numbers_image, contact_emails_image, contact_addresses_image, contact_events_image, contact_source_image,
-            contact_notes_image, contact_ringtone_image, contact_organization_image, contact_websites_image, contact_groups_image
+            contact_name_image, contact_numbers_image, contact_emails_image, contact_addresses_image, contact_ims_image, contact_events_image,
+            contact_source_image, contact_notes_image, contact_ringtone_image, contact_organization_image, contact_websites_image, contact_groups_image
         ).forEach {
             it.applyColorFilter(textColor)
         }
diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/dialogs/CustomLabelDialog.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/dialogs/CustomLabelDialog.kt
index 927a6831..036dcd72 100644
--- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/dialogs/CustomLabelDialog.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/dialogs/CustomLabelDialog.kt
@@ -8,7 +8,6 @@ import kotlinx.android.synthetic.main.dialog_custom_label.view.*
 
 class CustomLabelDialog(val activity: BaseSimpleActivity, val callback: (label: String) -> Unit) {
     init {
-
         val view = activity.layoutInflater.inflate(R.layout.dialog_custom_label, null)
 
         activity.getAlertDialogBuilder()
diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/models/Contact.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/models/Contact.kt
index b6d4b3ef..1873f642 100644
--- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/models/Contact.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/models/Contact.kt
@@ -1,8 +1,6 @@
 package com.simplemobiletools.contacts.pro.models
 
 import android.graphics.Bitmap
-import android.telephony.PhoneNumberUtils
-import com.simplemobiletools.commons.extensions.normalizePhoneNumber
 import com.simplemobiletools.commons.extensions.normalizeString
 import com.simplemobiletools.commons.helpers.*
 import com.simplemobiletools.commons.models.PhoneNumber
@@ -176,20 +174,6 @@ data class Contact(
     fun isABusinessContact() =
         prefix.isEmpty() && firstName.isEmpty() && middleName.isEmpty() && surname.isEmpty() && suffix.isEmpty() && organization.isNotEmpty()
 
-    fun doesContainPhoneNumber(text: String, convertLetters: Boolean): Boolean {
-        return if (text.isNotEmpty()) {
-            val normalizedText = if (convertLetters) text.normalizePhoneNumber() else text
-            phoneNumbers.any {
-                PhoneNumberUtils.compare(it.normalizedNumber, normalizedText) ||
-                    it.value.contains(text) ||
-                    it.normalizedNumber.contains(normalizedText) ||
-                    it.value.normalizePhoneNumber().contains(normalizedText)
-            }
-        } else {
-            false
-        }
-    }
-
     fun isPrivate() = source == SMT_PRIVATE
 
     fun getSignatureKey() = if (photoUri.isNotEmpty()) photoUri else hashCode()
diff --git a/app/src/main/res/layout/item_group.xml b/app/src/main/res/layout/item_group.xml
index b57021ff..a0e98a90 100644
--- a/app/src/main/res/layout/item_group.xml
+++ b/app/src/main/res/layout/item_group.xml
@@ -14,7 +14,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:minHeight="@dimen/min_row_height"
-        android:paddingStart="@dimen/tiny_margin"
+        android:paddingStart="@dimen/normal_margin"
         android:paddingTop="@dimen/medium_margin"
         android:paddingEnd="@dimen/activity_margin"
         android:paddingBottom="@dimen/medium_margin">