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, 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