From 846fdc75007d8bd7a8e28db1eb552f1fca51eea5 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Sun, 25 Oct 2020 23:24:41 +0100
Subject: [PATCH] updating commons to 5.31.8

---
 app/build.gradle                                      |  2 +-
 .../contacts/pro/adapters/ContactsAdapter.kt          |  1 -
 .../contacts/pro/adapters/GroupsAdapter.kt            |  3 ---
 .../contacts/pro/fragments/MyViewPagerFragment.kt     | 11 ++---------
 build.gradle                                          |  2 +-
 5 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index fc63c510..19495511 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -57,7 +57,7 @@ android {
 }
 
 dependencies {
-    implementation 'com.simplemobiletools:commons:5.30.11'
+    implementation 'com.simplemobiletools:commons:5.31.8'
     implementation 'joda-time:joda-time:2.10.1'
     implementation 'com.googlecode.ez-vcard:ez-vcard:0.10.5'
     implementation 'com.github.tibbi:IndicatorFastScroll:08f512858a'
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 aee2c3ca..dae16557 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
@@ -39,7 +39,6 @@ class ContactsAdapter(activity: SimpleActivity, var contactItems: ArrayList<Cont
     private var config = activity.config
     private var textToHighlight = highlightText
 
-    var adjustedPrimaryColor = activity.getAdjustedPrimaryColor()
     var startNameWithSurname = config.startNameWithSurname
     var showContactThumbnails = config.showContactThumbnails
     var showPhoneNumbers = config.showPhoneNumbers
diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/GroupsAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/GroupsAdapter.kt
index 8b6db687..3519514f 100644
--- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/GroupsAdapter.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/GroupsAdapter.kt
@@ -7,7 +7,6 @@ import android.view.ViewGroup
 import com.simplemobiletools.commons.adapters.MyRecyclerViewAdapter
 import com.simplemobiletools.commons.dialogs.ConfirmationDialog
 import com.simplemobiletools.commons.extensions.beVisibleIf
-import com.simplemobiletools.commons.extensions.getAdjustedPrimaryColor
 import com.simplemobiletools.commons.extensions.getTextSize
 import com.simplemobiletools.commons.extensions.highlightTextPart
 import com.simplemobiletools.commons.helpers.SimpleContactsHelper
@@ -30,8 +29,6 @@ class GroupsAdapter(activity: SimpleActivity, var groups: ArrayList<Group>, val
                     fastScroller: FastScroller, itemClick: (Any) -> Unit) : MyRecyclerViewAdapter(activity, recyclerView, fastScroller, itemClick) {
 
     private var textToHighlight = ""
-
-    var adjustedPrimaryColor = activity.getAdjustedPrimaryColor()
     var showContactThumbnails = activity.config.showContactThumbnails
     var fontSize = activity.getTextSize()
 
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 2beb8e5d..e526708b 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
@@ -92,14 +92,6 @@ abstract class MyViewPagerFragment(context: Context, attributeSet: AttributeSet)
         fragment_fastscroller?.updateBubblePrimaryColor()
         letter_fastscroller_thumb?.thumbColor = config.primaryColor.getColorStateList()
         letter_fastscroller_thumb?.textColor = config.primaryColor.getContrastColor()
-
-        (fragment_list.adapter as? ContactsAdapter)?.apply {
-            adjustedPrimaryColor = context.getAdjustedPrimaryColor()
-        }
-
-        (fragment_list.adapter as? GroupsAdapter)?.apply {
-            adjustedPrimaryColor = context.getAdjustedPrimaryColor()
-        }
     }
 
     fun startNameWithSurnameChanged(startNameWithSurname: Boolean) {
@@ -298,7 +290,8 @@ abstract class MyViewPagerFragment(context: Context, attributeSet: AttributeSet)
                 getProperText(it.getNameToDisplay(), shouldNormalize).contains(text, true) ||
                         getProperText(it.nickname, shouldNormalize).contains(text, true) ||
                         it.phoneNumbers.any {
-                            text.normalizePhoneNumber().isNotEmpty() && (it.normalizedNumber ?: it.value).contains(text.normalizePhoneNumber(), true)
+                            text.normalizePhoneNumber().isNotEmpty() && (it.normalizedNumber
+                                ?: it.value).contains(text.normalizePhoneNumber(), true)
                         } ||
                         it.emails.any { it.value.contains(text, true) } ||
                         it.addresses.any { getProperText(it.value, shouldNormalize).contains(text, true) } ||
diff --git a/build.gradle b/build.gradle
index 89be50a1..9e841957 100644
--- a/build.gradle
+++ b/build.gradle
@@ -9,7 +9,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.1'
+        classpath 'com.android.tools.build:gradle:4.0.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong