fenix/Simple-Contacts
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Contacts.git synced 2025-06-05 21:59:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

updating commons and target SDK to 31

Browse Source
This commit is contained in:
tibbi
2022-04-10 21:40:19 +02:00
parent 3ddde965eb
commit 4dcd1e901d
15 changed files with 85 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/build.gradle
View File

@ -10,12 +10,12 @@ if (keystorePropertiesFile.exists()) {
} }
android { android {
compileSdkVersion 30 compileSdkVersion 31
defaultConfig { defaultConfig {
applicationId "com.simplemobiletools.contacts.pro" applicationId "com.simplemobiletools.contacts.pro"
minSdkVersion 21 minSdkVersion 21
targetSdkVersion 30 targetSdkVersion 31
versionCode 92 versionCode 92
versionName "6.18.0" versionName "6.18.0"
setProperty("archivesBaseName", "contacts") setProperty("archivesBaseName", "contacts")
@ -63,7 +63,7 @@ android {
} }
dependencies { dependencies {
implementation 'com.github.SimpleMobileTools:Simple-Commons:99ed70cdbf' implementation 'com.github.SimpleMobileTools:Simple-Commons:b264da6cff'
implementation 'com.googlecode.ez-vcard:ez-vcard:0.11.3' implementation 'com.googlecode.ez-vcard:ez-vcard:0.11.3'
implementation 'com.github.tibbi:IndicatorFastScroll:4524cd0b61' implementation 'com.github.tibbi:IndicatorFastScroll:4524cd0b61'
implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0' implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'

26
app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/EditContactActivity.kt
View File

@ -204,7 +204,7 @@ class EditContactActivity : ContactActivity() {
updateContactPhoto(contact!!.photoUri, contact_photo, contact_photo_bottom_shadow, contact!!.photo) updateContactPhoto(contact!!.photoUri, contact_photo, contact_photo_bottom_shadow, contact!!.photo)
} }
val textColor = config.textColor val textColor = getProperTextColor()
arrayOf( arrayOf(
contact_name_image, contact_numbers_image, contact_emails_image, contact_addresses_image, contact_ims_image, contact_events_image, contact_name_image, contact_numbers_image, contact_emails_image, contact_addresses_image, contact_ims_image, contact_events_image,
contact_notes_image, contact_ringtone_image, contact_organization_image, contact_websites_image, contact_groups_image, contact_source_image contact_notes_image, contact_ringtone_image, contact_organization_image, contact_websites_image, contact_groups_image, contact_source_image
@ -212,12 +212,12 @@ class EditContactActivity : ContactActivity() {
it.applyColorFilter(textColor) it.applyColorFilter(textColor)
} }
val adjustedPrimaryColor = getAdjustedPrimaryColor() val properPrimaryColor = getProperPrimaryColor()
arrayOf( arrayOf(
contact_numbers_add_new, contact_emails_add_new, contact_addresses_add_new, contact_ims_add_new, contact_events_add_new, contact_numbers_add_new, contact_emails_add_new, contact_addresses_add_new, contact_ims_add_new, contact_events_add_new,
contact_websites_add_new, contact_groups_add_new contact_websites_add_new, contact_groups_add_new
).forEach { ).forEach {
it.applyColorFilter(adjustedPrimaryColor) it.applyColorFilter(properPrimaryColor)
} }
arrayOf( arrayOf(
@ -250,8 +250,8 @@ class EditContactActivity : ContactActivity() {
} }
updateTextColors(contact_scrollview) updateTextColors(contact_scrollview)
numberViewToColor?.setTextColor(adjustedPrimaryColor) numberViewToColor?.setTextColor(properPrimaryColor)
emailViewToColor?.setTextColor(adjustedPrimaryColor) emailViewToColor?.setTextColor(properPrimaryColor)
wasActivityInitialized = true wasActivityInitialized = true
contact_toolbar.menu.apply { contact_toolbar.menu.apply {
@ -602,8 +602,8 @@ class EditContactActivity : ContactActivity() {
contact_event_remove.apply { contact_event_remove.apply {
beVisible() beVisible()
applyColorFilter(getAdjustedPrimaryColor()) applyColorFilter(getProperPrimaryColor())
background.applyColorFilter(config.textColor) background.applyColorFilter(getProperTextColor())
setOnClickListener { setOnClickListener {
resetContactEvent(contactEvent, this) resetContactEvent(contactEvent, this)
} }
@ -625,7 +625,7 @@ class EditContactActivity : ContactActivity() {
(groupHolder as ViewGroup).apply { (groupHolder as ViewGroup).apply {
contact_group.apply { contact_group.apply {
text = group.title text = group.title
setTextColor(config.textColor) setTextColor(getProperTextColor())
tag = group.id tag = group.id
alpha = 1f alpha = 1f
} }
@ -636,8 +636,8 @@ class EditContactActivity : ContactActivity() {
contact_group_remove.apply { contact_group_remove.apply {
beVisible() beVisible()
applyColorFilter(getAdjustedPrimaryColor()) applyColorFilter(getProperPrimaryColor())
background.applyColorFilter(config.textColor) background.applyColorFilter(getProperTextColor())
setOnClickListener { setOnClickListener {
removeGroup(group.id!!) removeGroup(group.id!!)
} }
@ -650,7 +650,7 @@ class EditContactActivity : ContactActivity() {
contact_group.apply { contact_group.apply {
alpha = 0.5f alpha = 0.5f
text = getString(R.string.no_groups) text = getString(R.string.no_groups)
setTextColor(config.textColor) setTextColor(getProperTextColor())
} }
contact_groups_holder.addView(this) contact_groups_holder.addView(this)
@ -790,8 +790,8 @@ class EditContactActivity : ContactActivity() {
} }
eventHolder.contact_event_remove.apply { eventHolder.contact_event_remove.apply {
applyColorFilter(getAdjustedPrimaryColor()) applyColorFilter(getProperPrimaryColor())
background.applyColorFilter(config.textColor) background.applyColorFilter(getProperTextColor())
setOnClickListener { setOnClickListener {
resetContactEvent(eventField, this@apply) resetContactEvent(eventField, this@apply)
} }

6
app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/GroupContactsActivity.kt
View File

@ -65,10 +65,10 @@ class GroupContactsActivity : SimpleActivity(), RemoveFromGroupListener, Refresh
fabClicked() fabClicked()
} }
val adjustedPrimaryColor = getAdjustedPrimaryColor() val properPrimaryColor = getProperPrimaryColor()
group_contacts_fastscroller?.updateColors(adjustedPrimaryColor) group_contacts_fastscroller?.updateColors(properPrimaryColor)
group_contacts_placeholder_2.underlineText() group_contacts_placeholder_2.underlineText()
group_contacts_placeholder_2.setTextColor(adjustedPrimaryColor) group_contacts_placeholder_2.setTextColor(properPrimaryColor)
} }
override fun onResume() { override fun onResume() {

19
app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/InsertOrEditContactActivity.kt
View File

@ -25,7 +25,10 @@ import com.simplemobiletools.contacts.pro.dialogs.FilterContactSourcesDialog
import com.simplemobiletools.contacts.pro.extensions.config import com.simplemobiletools.contacts.pro.extensions.config
import com.simplemobiletools.contacts.pro.extensions.getContactPublicUri import com.simplemobiletools.contacts.pro.extensions.getContactPublicUri
import com.simplemobiletools.contacts.pro.fragments.MyViewPagerFragment import com.simplemobiletools.contacts.pro.fragments.MyViewPagerFragment
import com.simplemobiletools.contacts.pro.helpers.* import com.simplemobiletools.contacts.pro.helpers.ADD_NEW_CONTACT_NUMBER
import com.simplemobiletools.contacts.pro.helpers.ContactsHelper
import com.simplemobiletools.contacts.pro.helpers.KEY_EMAIL
import com.simplemobiletools.contacts.pro.helpers.KEY_NAME
import com.simplemobiletools.contacts.pro.interfaces.RefreshContactsListener import com.simplemobiletools.contacts.pro.interfaces.RefreshContactsListener
import com.simplemobiletools.contacts.pro.models.Contact import com.simplemobiletools.contacts.pro.models.Contact
import kotlinx.android.synthetic.main.activity_insert_edit_contact.* import kotlinx.android.synthetic.main.activity_insert_edit_contact.*
@ -134,7 +137,7 @@ class InsertOrEditContactActivity : SimpleActivity(), RefreshContactsListener {
insert_or_edit_tabs_holder.onTabSelectionChanged( insert_or_edit_tabs_holder.onTabSelectionChanged(
tabUnselectedAction = { tabUnselectedAction = {
it.icon?.applyColorFilter(config.textColor) it.icon?.applyColorFilter(getProperTextColor())
}, },
tabSelectedAction = { tabSelectedAction = {
if (isSearchOpen) { if (isSearchOpen) {
@ -142,7 +145,7 @@ class InsertOrEditContactActivity : SimpleActivity(), RefreshContactsListener {
searchMenuItem?.collapseActionView() searchMenuItem?.collapseActionView()
} }
viewpager.currentItem = it.position viewpager.currentItem = it.position
it.icon?.applyColorFilter(getAdjustedPrimaryColor()) it.icon?.applyColorFilter(getProperPrimaryColor())
} }
) )
@ -159,9 +162,9 @@ class InsertOrEditContactActivity : SimpleActivity(), RefreshContactsListener {
insert_or_edit_tabs_holder.beVisibleIf(skippedTabs == 0) insert_or_edit_tabs_holder.beVisibleIf(skippedTabs == 0)
select_contact_label?.setTextColor(getAdjustedPrimaryColor()) select_contact_label?.setTextColor(getProperPrimaryColor())
new_contact_tmb?.setImageDrawable(resources.getColoredDrawableWithColor(R.drawable.ic_add_person_vector, config.textColor)) new_contact_tmb?.setImageDrawable(resources.getColoredDrawableWithColor(R.drawable.ic_add_person_vector, getProperTextColor()))
new_contact_name.setTextColor(config.textColor) new_contact_name.setTextColor(getProperTextColor())
new_contact_holder?.setOnClickListener { new_contact_holder?.setOnClickListener {
createNewContact() createNewContact()
} }
@ -218,8 +221,8 @@ class InsertOrEditContactActivity : SimpleActivity(), RefreshContactsListener {
private fun setupTabColors() { private fun setupTabColors() {
insert_or_edit_tabs_holder.apply { insert_or_edit_tabs_holder.apply {
background = ColorDrawable(config.backgroundColor) background = ColorDrawable(getProperBackgroundColor())
setSelectedTabIndicatorColor(getAdjustedPrimaryColor()) setSelectedTabIndicatorColor(getProperPrimaryColor())
} }
} }

33
app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/MainActivity.kt
View File

@ -35,7 +35,10 @@ import com.simplemobiletools.contacts.pro.extensions.config
import com.simplemobiletools.contacts.pro.extensions.getTempFile import com.simplemobiletools.contacts.pro.extensions.getTempFile
import com.simplemobiletools.contacts.pro.extensions.handleGenericContactClick import com.simplemobiletools.contacts.pro.extensions.handleGenericContactClick
import com.simplemobiletools.contacts.pro.fragments.MyViewPagerFragment import com.simplemobiletools.contacts.pro.fragments.MyViewPagerFragment
import com.simplemobiletools.contacts.pro.helpers.* import com.simplemobiletools.contacts.pro.helpers.ALL_TABS_MASK
import com.simplemobiletools.contacts.pro.helpers.ContactsHelper
import com.simplemobiletools.contacts.pro.helpers.VcfExporter
import com.simplemobiletools.contacts.pro.helpers.tabsList
import com.simplemobiletools.contacts.pro.interfaces.RefreshContactsListener import com.simplemobiletools.contacts.pro.interfaces.RefreshContactsListener
import com.simplemobiletools.contacts.pro.models.Contact import com.simplemobiletools.contacts.pro.models.Contact
import kotlinx.android.synthetic.main.activity_main.* import kotlinx.android.synthetic.main.activity_main.*
@ -110,11 +113,11 @@ class MainActivity : SimpleActivity(), RefreshContactsListener {
} }
} }
val adjustedPrimaryColor = getAdjustedPrimaryColor() val properPrimaryColor = getProperPrimaryColor()
main_tabs_holder.background = ColorDrawable(config.backgroundColor) main_tabs_holder.background = ColorDrawable(getProperBackgroundColor())
main_tabs_holder.setSelectedTabIndicatorColor(adjustedPrimaryColor) main_tabs_holder.setSelectedTabIndicatorColor(properPrimaryColor)
getAllFragments().forEach { getAllFragments().forEach {
it?.setupColors(config.textColor, adjustedPrimaryColor) it?.setupColors(getProperTextColor(), properPrimaryColor)
} }
updateTabColors() updateTabColors()
@ -140,10 +143,10 @@ class MainActivity : SimpleActivity(), RefreshContactsListener {
} }
} }
val dialpadIcon = resources.getColoredDrawableWithColor(R.drawable.ic_dialpad_vector, adjustedPrimaryColor.getContrastColor()) val dialpadIcon = resources.getColoredDrawableWithColor(R.drawable.ic_dialpad_vector, properPrimaryColor.getContrastColor())
main_dialpad_button.apply { main_dialpad_button.apply {
setImageDrawable(dialpadIcon) setImageDrawable(dialpadIcon)
background.applyColorFilter(adjustedPrimaryColor) background.applyColorFilter(properPrimaryColor)
beVisibleIf(config.showDialpadButton) beVisibleIf(config.showDialpadButton)
} }
@ -257,9 +260,9 @@ class MainActivity : SimpleActivity(), RefreshContactsListener {
private fun updateTabColors() { private fun updateTabColors() {
getInactiveTabIndexes(viewpager.currentItem).forEach { getInactiveTabIndexes(viewpager.currentItem).forEach {
main_tabs_holder.getTabAt(it)?.icon?.applyColorFilter(config.textColor) main_tabs_holder.getTabAt(it)?.icon?.applyColorFilter(getProperTextColor())
} }
main_tabs_holder.getTabAt(viewpager.currentItem)?.icon?.applyColorFilter(getAdjustedPrimaryColor()) main_tabs_holder.getTabAt(viewpager.currentItem)?.icon?.applyColorFilter(getProperPrimaryColor())
} }
private fun getSearchString(): Int { private fun getSearchString(): Int {
@ -322,13 +325,13 @@ class MainActivity : SimpleActivity(), RefreshContactsListener {
private fun setupTabColors() { private fun setupTabColors() {
val lastUsedPage = getDefaultTab() val lastUsedPage = getDefaultTab()
main_tabs_holder.apply { main_tabs_holder.apply {
background = ColorDrawable(config.backgroundColor) background = ColorDrawable(getProperBackgroundColor())
setSelectedTabIndicatorColor(getAdjustedPrimaryColor()) setSelectedTabIndicatorColor(getProperPrimaryColor())
getTabAt(lastUsedPage)?.select() getTabAt(lastUsedPage)?.select()
getTabAt(lastUsedPage)?.icon?.applyColorFilter(getAdjustedPrimaryColor()) getTabAt(lastUsedPage)?.icon?.applyColorFilter(getProperPrimaryColor())
getInactiveTabIndexes(lastUsedPage).forEach { getInactiveTabIndexes(lastUsedPage).forEach {
getTabAt(it)?.icon?.applyColorFilter(config.textColor) getTabAt(it)?.icon?.applyColorFilter(getProperTextColor())
} }
} }
} }
@ -362,7 +365,7 @@ class MainActivity : SimpleActivity(), RefreshContactsListener {
main_tabs_holder.onTabSelectionChanged( main_tabs_holder.onTabSelectionChanged(
tabUnselectedAction = { tabUnselectedAction = {
it.icon?.applyColorFilter(config.textColor) it.icon?.applyColorFilter(getProperTextColor())
}, },
tabSelectedAction = { tabSelectedAction = {
if (isSearchOpen) { if (isSearchOpen) {
@ -370,7 +373,7 @@ class MainActivity : SimpleActivity(), RefreshContactsListener {
searchMenuItem?.collapseActionView() searchMenuItem?.collapseActionView()
} }
viewpager.currentItem = it.position viewpager.currentItem = it.position
it.icon?.applyColorFilter(getAdjustedPrimaryColor()) it.icon?.applyColorFilter(getProperPrimaryColor())
} }
) )

4
app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/SettingsActivity.kt
View File

@ -44,7 +44,7 @@ class SettingsActivity : SimpleActivity() {
invalidateOptionsMenu() invalidateOptionsMenu()
arrayOf(settings_color_customization_label, settings_general_settings_label, settings_main_screen_label, settings_list_view_label).forEach { arrayOf(settings_color_customization_label, settings_general_settings_label, settings_main_screen_label, settings_list_view_label).forEach {
it.setTextColor(getAdjustedPrimaryColor()) it.setTextColor(getProperPrimaryColor())
} }
arrayOf( arrayOf(
@ -53,7 +53,7 @@ class SettingsActivity : SimpleActivity() {
settings_main_screen_holder, settings_main_screen_holder,
settings_list_view_holder settings_list_view_holder
).forEach { ).forEach {
it.background.applyColorFilter(baseConfig.backgroundColor.getContrastColor()) it.background.applyColorFilter(getProperBackgroundColor().getContrastColor())
} }
} }

4
app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/SimpleActivity.kt
View File

@ -6,9 +6,9 @@ import android.graphics.drawable.Drawable
import android.net.Uri import android.net.Uri
import com.simplemobiletools.commons.activities.BaseSimpleActivity import com.simplemobiletools.commons.activities.BaseSimpleActivity
import com.simplemobiletools.commons.extensions.getColoredDrawableWithColor import com.simplemobiletools.commons.extensions.getColoredDrawableWithColor
import com.simplemobiletools.commons.extensions.getProperTextColor
import com.simplemobiletools.commons.helpers.KEY_PHONE import com.simplemobiletools.commons.helpers.KEY_PHONE
import com.simplemobiletools.contacts.pro.R import com.simplemobiletools.contacts.pro.R
import com.simplemobiletools.contacts.pro.extensions.config
import com.simplemobiletools.contacts.pro.helpers.KEY_MAILTO import com.simplemobiletools.contacts.pro.helpers.KEY_MAILTO
import com.simplemobiletools.contacts.pro.helpers.LOCATION_CONTACTS_TAB import com.simplemobiletools.contacts.pro.helpers.LOCATION_CONTACTS_TAB
import com.simplemobiletools.contacts.pro.helpers.LOCATION_FAVORITES_TAB import com.simplemobiletools.contacts.pro.helpers.LOCATION_FAVORITES_TAB
@ -70,7 +70,7 @@ open class SimpleActivity : BaseSimpleActivity() {
else -> R.drawable.ic_people_vector else -> R.drawable.ic_people_vector
} }
return resources.getColoredDrawableWithColor(drawableId, config.textColor) return resources.getColoredDrawableWithColor(drawableId, getProperTextColor())
} }
protected fun getTabContentDescription(position: Int): String { protected fun getTabContentDescription(position: Int): String {

2
app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/ViewContactActivity.kt
View File

@ -216,7 +216,7 @@ class ViewContactActivity : ContactActivity() {
} }
} }
val textColor = config.textColor val textColor = getProperTextColor()
arrayOf( arrayOf(
contact_name_image, contact_numbers_image, contact_emails_image, contact_addresses_image, contact_events_image, contact_source_image, 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_notes_image, contact_ringtone_image, contact_organization_image, contact_websites_image, contact_groups_image

7
app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/ContactsAdapter.kt
View File

@ -36,7 +36,6 @@ import com.simplemobiletools.contacts.pro.helpers.*
import com.simplemobiletools.contacts.pro.interfaces.RefreshContactsListener import com.simplemobiletools.contacts.pro.interfaces.RefreshContactsListener
import com.simplemobiletools.contacts.pro.interfaces.RemoveFromGroupListener import com.simplemobiletools.contacts.pro.interfaces.RemoveFromGroupListener
import com.simplemobiletools.contacts.pro.models.Contact import com.simplemobiletools.contacts.pro.models.Contact
import java.util.*
class ContactsAdapter( class ContactsAdapter(
activity: SimpleActivity, var contactItems: ArrayList<Contact>, private val refreshListener: RefreshContactsListener?, activity: SimpleActivity, var contactItems: ArrayList<Contact>, private val refreshListener: RefreshContactsListener?,
@ -342,9 +341,9 @@ class ContactsAdapter(
val fullName = contact.getNameToDisplay() val fullName = contact.getNameToDisplay()
findViewById<TextView>(R.id.item_contact_name).text = if (textToHighlight.isEmpty()) fullName else { findViewById<TextView>(R.id.item_contact_name).text = if (textToHighlight.isEmpty()) fullName else {
if (fullName.contains(textToHighlight, true)) { if (fullName.contains(textToHighlight, true)) {
fullName.highlightTextPart(textToHighlight, adjustedPrimaryColor) fullName.highlightTextPart(textToHighlight, properPrimaryColor)
} else { } else {
fullName.highlightTextFromNumbers(textToHighlight, adjustedPrimaryColor) fullName.highlightTextFromNumbers(textToHighlight, properPrimaryColor)
} }
} }
@ -362,7 +361,7 @@ class ContactsAdapter(
val numberText = phoneNumberToUse?.value ?: "" val numberText = phoneNumberToUse?.value ?: ""
findViewById<TextView>(R.id.item_contact_number).apply { findViewById<TextView>(R.id.item_contact_number).apply {
text = if (textToHighlight.isEmpty()) numberText else numberText.highlightTextPart(textToHighlight, adjustedPrimaryColor, false, true) text = if (textToHighlight.isEmpty()) numberText else numberText.highlightTextPart(textToHighlight, properPrimaryColor, false, true)
setTextColor(textColor) setTextColor(textColor)
setTextSize(TypedValue.COMPLEX_UNIT_PX, fontSize) setTextSize(TypedValue.COMPLEX_UNIT_PX, fontSize)
} }

16
app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/FilterContactSourcesAdapter.kt
View File

@ -3,17 +3,21 @@ package com.simplemobiletools.contacts.pro.adapters
import android.view.View import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.RecyclerView
import com.simplemobiletools.commons.extensions.getAdjustedPrimaryColor import com.simplemobiletools.commons.extensions.getProperBackgroundColor
import com.simplemobiletools.commons.extensions.getProperPrimaryColor
import com.simplemobiletools.commons.extensions.getProperTextColor
import com.simplemobiletools.contacts.pro.R import com.simplemobiletools.contacts.pro.R
import com.simplemobiletools.contacts.pro.activities.SimpleActivity import com.simplemobiletools.contacts.pro.activities.SimpleActivity
import com.simplemobiletools.contacts.pro.extensions.config
import com.simplemobiletools.contacts.pro.helpers.SMT_PRIVATE import com.simplemobiletools.contacts.pro.helpers.SMT_PRIVATE
import com.simplemobiletools.contacts.pro.models.ContactSource import com.simplemobiletools.contacts.pro.models.ContactSource
import kotlinx.android.synthetic.main.item_filter_contact_source.view.* import kotlinx.android.synthetic.main.item_filter_contact_source.view.*
import java.util.*
class FilterContactSourcesAdapter(val activity: SimpleActivity, private val contactSources: List<ContactSource>, private val displayContactSources: ArrayList<String>) : class FilterContactSourcesAdapter(
RecyclerView.Adapter<FilterContactSourcesAdapter.ViewHolder>() { val activity: SimpleActivity,
private val contactSources: List<ContactSource>,
private val displayContactSources: ArrayList<String>
) :
RecyclerView.Adapter<FilterContactSourcesAdapter.ViewHolder>() {
private val selectedKeys = HashSet<Int>() private val selectedKeys = HashSet<Int>()
init { init {
@ -57,7 +61,7 @@ class FilterContactSourcesAdapter(val activity: SimpleActivity, private val cont
val isSelected = selectedKeys.contains(contactSource.hashCode()) val isSelected = selectedKeys.contains(contactSource.hashCode())
itemView.apply { itemView.apply {
filter_contact_source_checkbox.isChecked = isSelected filter_contact_source_checkbox.isChecked = isSelected
filter_contact_source_checkbox.setColors(activity.config.textColor, activity.getAdjustedPrimaryColor(), activity.config.backgroundColor) filter_contact_source_checkbox.setColors(activity.getProperTextColor(), activity.getProperPrimaryColor(), activity.getProperBackgroundColor())
filter_contact_source_checkbox.text = contactSource.publicName filter_contact_source_checkbox.text = contactSource.publicName
filter_contact_source_holder.setOnClickListener { viewClicked(!isSelected, contactSource) } filter_contact_source_holder.setOnClickListener { viewClicked(!isSelected, contactSource) }
} }

2
app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/GroupsAdapter.kt
View File

@ -158,7 +158,7 @@ class GroupsAdapter(
val groupTitle = if (textToHighlight.isEmpty()) { val groupTitle = if (textToHighlight.isEmpty()) {
titleWithCnt titleWithCnt
} else { } else {
titleWithCnt.highlightTextPart(textToHighlight, adjustedPrimaryColor) titleWithCnt.highlightTextPart(textToHighlight, properPrimaryColor)
} }
group_name.apply { group_name.apply {

7
app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/SelectContactsAdapter.kt
View File

@ -18,7 +18,6 @@ import com.simplemobiletools.contacts.pro.activities.SimpleActivity
import com.simplemobiletools.contacts.pro.extensions.config import com.simplemobiletools.contacts.pro.extensions.config
import com.simplemobiletools.contacts.pro.models.Contact import com.simplemobiletools.contacts.pro.models.Contact
import kotlinx.android.synthetic.main.item_add_favorite_with_number.view.* import kotlinx.android.synthetic.main.item_add_favorite_with_number.view.*
import java.util.*
class SelectContactsAdapter( class SelectContactsAdapter(
val activity: SimpleActivity, var contacts: ArrayList<Contact>, private val selectedContacts: ArrayList<Contact>, private val allowPickMultiple: Boolean, val activity: SimpleActivity, var contacts: ArrayList<Contact>, private val selectedContacts: ArrayList<Contact>, private val allowPickMultiple: Boolean,
@ -28,7 +27,7 @@ class SelectContactsAdapter(
private val itemViews = SparseArray<View>() private val itemViews = SparseArray<View>()
private val selectedPositions = HashSet<Int>() private val selectedPositions = HashSet<Int>()
private val config = activity.config private val config = activity.config
private val adjustedPrimaryColor = activity.getAdjustedPrimaryColor() private val adjustedPrimaryColor = activity.getProperPrimaryColor()
private val fontSize = activity.getTextSize() private val fontSize = activity.getTextSize()
private val showContactThumbnails = config.showContactThumbnails private val showContactThumbnails = config.showContactThumbnails
@ -101,8 +100,8 @@ class SelectContactsAdapter(
fun bindView(contact: Contact): View { fun bindView(contact: Contact): View {
itemView.apply { itemView.apply {
contact_checkbox.beVisibleIf(allowPickMultiple) contact_checkbox.beVisibleIf(allowPickMultiple)
contact_checkbox.setColors(config.textColor, context.getAdjustedPrimaryColor(), config.backgroundColor) contact_checkbox.setColors(context.getProperTextColor(), context.getProperPrimaryColor(), context.getProperBackgroundColor())
val textColor = config.textColor val textColor = context.getProperTextColor()
val fullName = contact.getNameToDisplay() val fullName = contact.getNameToDisplay()
contact_name.text = if (textToHighlight.isEmpty()) fullName else { contact_name.text = if (textToHighlight.isEmpty()) fullName else {

6
app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/ViewPagerAdapter.kt
View File

@ -3,13 +3,13 @@ package com.simplemobiletools.contacts.pro.adapters
import android.view.View import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
import androidx.viewpager.widget.PagerAdapter import androidx.viewpager.widget.PagerAdapter
import com.simplemobiletools.commons.extensions.getAdjustedPrimaryColor import com.simplemobiletools.commons.extensions.getProperPrimaryColor
import com.simplemobiletools.commons.extensions.getProperTextColor
import com.simplemobiletools.commons.helpers.TAB_CONTACTS import com.simplemobiletools.commons.helpers.TAB_CONTACTS
import com.simplemobiletools.commons.helpers.TAB_FAVORITES import com.simplemobiletools.commons.helpers.TAB_FAVORITES
import com.simplemobiletools.commons.helpers.TAB_GROUPS import com.simplemobiletools.commons.helpers.TAB_GROUPS
import com.simplemobiletools.contacts.pro.R import com.simplemobiletools.contacts.pro.R
import com.simplemobiletools.contacts.pro.activities.SimpleActivity import com.simplemobiletools.contacts.pro.activities.SimpleActivity
import com.simplemobiletools.contacts.pro.extensions.config
import com.simplemobiletools.contacts.pro.fragments.MyViewPagerFragment import com.simplemobiletools.contacts.pro.fragments.MyViewPagerFragment
class ViewPagerAdapter(val activity: SimpleActivity, val currTabsList: ArrayList<Int>, val showTabs: Int) : PagerAdapter() { class ViewPagerAdapter(val activity: SimpleActivity, val currTabsList: ArrayList<Int>, val showTabs: Int) : PagerAdapter() {
@ -21,7 +21,7 @@ class ViewPagerAdapter(val activity: SimpleActivity, val currTabsList: ArrayList
(view as MyViewPagerFragment).apply { (view as MyViewPagerFragment).apply {
setupFragment(activity) setupFragment(activity)
setupColors(activity.config.textColor, activity.getAdjustedPrimaryColor()) setupColors(activity.getProperTextColor(), activity.getProperPrimaryColor())
} }
return view return view

6
app/src/main/kotlin/com/simplemobiletools/contacts/pro/dialogs/SelectContactsDialog.kt
View File

@ -7,12 +7,10 @@ import com.simplemobiletools.commons.helpers.ensureBackgroundThread
import com.simplemobiletools.contacts.pro.R import com.simplemobiletools.contacts.pro.R
import com.simplemobiletools.contacts.pro.activities.SimpleActivity import com.simplemobiletools.contacts.pro.activities.SimpleActivity
import com.simplemobiletools.contacts.pro.adapters.SelectContactsAdapter import com.simplemobiletools.contacts.pro.adapters.SelectContactsAdapter
import com.simplemobiletools.contacts.pro.extensions.config
import com.simplemobiletools.contacts.pro.extensions.getVisibleContactSources import com.simplemobiletools.contacts.pro.extensions.getVisibleContactSources
import com.simplemobiletools.contacts.pro.models.Contact import com.simplemobiletools.contacts.pro.models.Contact
import kotlinx.android.synthetic.main.layout_select_contact.view.* import kotlinx.android.synthetic.main.layout_select_contact.view.*
import java.util.* import java.util.*
import kotlin.collections.ArrayList
class SelectContactsDialog( class SelectContactsDialog(
val activity: SimpleActivity, initialContacts: ArrayList<Contact>, val allowSelectMultiple: Boolean, val showOnlyContactsWithNumber: Boolean, val activity: SimpleActivity, initialContacts: ArrayList<Contact>, val allowSelectMultiple: Boolean, val showOnlyContactsWithNumber: Boolean,
@ -79,9 +77,9 @@ class SelectContactsDialog(
} }
private fun setupFastscroller(allContacts: ArrayList<Contact>) { private fun setupFastscroller(allContacts: ArrayList<Contact>) {
val adjustedPrimaryColor = activity.getAdjustedPrimaryColor() val adjustedPrimaryColor = activity.getProperPrimaryColor()
view.apply { view.apply {
letter_fastscroller?.textColor = context.config.textColor.getColorStateList() letter_fastscroller?.textColor = context.getProperTextColor().getColorStateList()
letter_fastscroller?.pressedTextColor = adjustedPrimaryColor letter_fastscroller?.pressedTextColor = adjustedPrimaryColor
letter_fastscroller_thumb?.fontSize = context.getTextSize() letter_fastscroller_thumb?.fontSize = context.getTextSize()
letter_fastscroller_thumb?.textColor = adjustedPrimaryColor.getContrastColor() letter_fastscroller_thumb?.textColor = adjustedPrimaryColor.getContrastColor()

19
app/src/main/kotlin/com/simplemobiletools/contacts/pro/dialogs/SelectGroupsDialog.kt
View File

@ -2,7 +2,9 @@ package com.simplemobiletools.contacts.pro.dialogs
import android.view.ViewGroup import android.view.ViewGroup
import androidx.appcompat.app.AlertDialog import androidx.appcompat.app.AlertDialog
import com.simplemobiletools.commons.extensions.getAdjustedPrimaryColor import com.simplemobiletools.commons.extensions.getProperBackgroundColor
import com.simplemobiletools.commons.extensions.getProperPrimaryColor
import com.simplemobiletools.commons.extensions.getProperTextColor
import com.simplemobiletools.commons.extensions.setupDialogStuff import com.simplemobiletools.commons.extensions.setupDialogStuff
import com.simplemobiletools.commons.views.MyAppCompatCheckbox import com.simplemobiletools.commons.views.MyAppCompatCheckbox
import com.simplemobiletools.contacts.pro.R import com.simplemobiletools.contacts.pro.R
@ -13,7 +15,6 @@ import com.simplemobiletools.contacts.pro.models.Group
import kotlinx.android.synthetic.main.dialog_select_groups.view.* import kotlinx.android.synthetic.main.dialog_select_groups.view.*
import kotlinx.android.synthetic.main.item_checkbox.view.* import kotlinx.android.synthetic.main.item_checkbox.view.*
import kotlinx.android.synthetic.main.item_textview.view.* import kotlinx.android.synthetic.main.item_textview.view.*
import java.util.*
class SelectGroupsDialog(val activity: SimpleActivity, val selectedGroups: ArrayList<Group>, val callback: (newGroups: ArrayList<Group>) -> Unit) { class SelectGroupsDialog(val activity: SimpleActivity, val selectedGroups: ArrayList<Group>, val callback: (newGroups: ArrayList<Group>) -> Unit) {
private val view = activity.layoutInflater.inflate(R.layout.dialog_select_groups, null) as ViewGroup private val view = activity.layoutInflater.inflate(R.layout.dialog_select_groups, null) as ViewGroup
@ -39,11 +40,11 @@ class SelectGroupsDialog(val activity: SimpleActivity, val selectedGroups: Array
addCreateNewGroupButton() addCreateNewGroupButton()
dialog = AlertDialog.Builder(activity) dialog = AlertDialog.Builder(activity)
.setPositiveButton(R.string.ok) { dialog, which -> dialogConfirmed() } .setPositiveButton(R.string.ok) { dialog, which -> dialogConfirmed() }
.setNegativeButton(R.string.cancel, null) .setNegativeButton(R.string.cancel, null)
.create().apply { .create().apply {
activity.setupDialogStuff(view, this) activity.setupDialogStuff(view, this)
} }
} }
private fun addGroupCheckbox(group: Group) { private fun addGroupCheckbox(group: Group) {
@ -57,7 +58,7 @@ class SelectGroupsDialog(val activity: SimpleActivity, val selectedGroups: Array
isChecked = selectedGroups.contains(group) isChecked = selectedGroups.contains(group)
text = group.title text = group.title
tag = group.id tag = group.id
setColors(config.textColor, activity.getAdjustedPrimaryColor(), config.backgroundColor) setColors(activity.getProperTextColor(), activity.getProperPrimaryColor(), activity.getProperBackgroundColor())
} }
view.dialog_groups_holder.addView(this) view.dialog_groups_holder.addView(this)
} }
@ -68,7 +69,7 @@ class SelectGroupsDialog(val activity: SimpleActivity, val selectedGroups: Array
activity.layoutInflater.inflate(R.layout.item_textview, null, false).item_textview.apply { activity.layoutInflater.inflate(R.layout.item_textview, null, false).item_textview.apply {
text = newGroup.title text = newGroup.title
tag = newGroup.id tag = newGroup.id
setTextColor(config.textColor) setTextColor(activity.getProperTextColor())
view.dialog_groups_holder.addView(this) view.dialog_groups_holder.addView(this)
setOnClickListener { setOnClickListener {
CreateNewGroupDialog(activity) { CreateNewGroupDialog(activity) {