fenix/Simple-Contacts
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Contacts.git synced 2025-02-03 09:17:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

collect and show all duplicate contact IMs

Browse Source
This commit is contained in:
tibbi 2019-09-15 20:29:36 +02:00
parent 671cb29a45
commit a52bed4228
1 changed files with 25 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,10 +17,7 @@ import com.simplemobiletools.contacts.pro.R
import com.simplemobiletools.contacts.pro.dialogs.CallConfirmationDialog import com.simplemobiletools.contacts.pro.dialogs.CallConfirmationDialog
import com.simplemobiletools.contacts.pro.extensions.* import com.simplemobiletools.contacts.pro.extensions.*
import com.simplemobiletools.contacts.pro.helpers.* import com.simplemobiletools.contacts.pro.helpers.*
import com.simplemobiletools.contacts.pro.models.Address import com.simplemobiletools.contacts.pro.models.*
import com.simplemobiletools.contacts.pro.models.Contact
import com.simplemobiletools.contacts.pro.models.ContactSource
import com.simplemobiletools.contacts.pro.models.PhoneNumber
import kotlinx.android.synthetic.main.activity_view_contact.* import kotlinx.android.synthetic.main.activity_view_contact.*
import kotlinx.android.synthetic.main.item_event.view.* import kotlinx.android.synthetic.main.item_event.view.*
import kotlinx.android.synthetic.main.item_view_address.view.* import kotlinx.android.synthetic.main.item_view_address.view.*
@ -209,11 +206,11 @@ class ViewContactActivity : ContactActivity() {
setupPhoneNumbers() setupPhoneNumbers()
setupEmails() setupEmails()
setupAddresses() setupAddresses()
setupIMs()
setupContactSources() setupContactSources()
} }
} }
setupIMs()
setupEvents() setupEvents()
setupNotes() setupNotes()
setupOrganization() setupOrganization()
@ -285,6 +282,7 @@ class ViewContactActivity : ContactActivity() {
} }
private fun setupPhoneNumbers() { private fun setupPhoneNumbers() {
contact_numbers_holder.removeAllViews()
if (showFields and SHOW_PHONE_NUMBERS_FIELD != 0) { if (showFields and SHOW_PHONE_NUMBERS_FIELD != 0) {
var phoneNumbers = contact!!.phoneNumbers.toMutableSet() as LinkedHashSet<PhoneNumber> var phoneNumbers = contact!!.phoneNumbers.toMutableSet() as LinkedHashSet<PhoneNumber>
duplicateContacts.forEach { duplicateContacts.forEach {
@ -300,8 +298,6 @@ class ViewContactActivity : ContactActivity() {
}.toMutableSet() as LinkedHashSet<PhoneNumber> }.toMutableSet() as LinkedHashSet<PhoneNumber>
phoneNumbers = phoneNumbers.sortedBy { it.type }.toMutableSet() as LinkedHashSet<PhoneNumber> phoneNumbers = phoneNumbers.sortedBy { it.type }.toMutableSet() as LinkedHashSet<PhoneNumber>
contact_numbers_holder.removeAllViews()
if (phoneNumbers.isNotEmpty()) { if (phoneNumbers.isNotEmpty()) {
phoneNumbers.forEach { phoneNumbers.forEach {
layoutInflater.inflate(R.layout.item_view_phone_number, contact_numbers_holder, false).apply { layoutInflater.inflate(R.layout.item_view_phone_number, contact_numbers_holder, false).apply {
@ -368,7 +364,6 @@ class ViewContactActivity : ContactActivity() {
} }
addresses = addresses.sortedBy { it.type }.toMutableSet() as LinkedHashSet<Address> addresses = addresses.sortedBy { it.type }.toMutableSet() as LinkedHashSet<Address>
if (addresses.isNotEmpty()) { if (addresses.isNotEmpty()) {
addresses.forEach { addresses.forEach {
layoutInflater.inflate(R.layout.item_view_address, contact_addresses_holder, false).apply { layoutInflater.inflate(R.layout.item_view_address, contact_addresses_holder, false).apply {
@ -397,8 +392,14 @@ class ViewContactActivity : ContactActivity() {
private fun setupIMs() { private fun setupIMs() {
contact_ims_holder.removeAllViews() contact_ims_holder.removeAllViews()
val IMs = contact!!.IMs if (showFields and SHOW_IMS_FIELD != 0) {
if (IMs.isNotEmpty() && showFields and SHOW_IMS_FIELD != 0) { var IMs = contact!!.IMs.toMutableSet() as LinkedHashSet<IM>
duplicateContacts.forEach {
IMs.addAll(it.IMs)
}
IMs = IMs.sortedBy { it.type }.toMutableSet() as LinkedHashSet<IM>
if (IMs.isNotEmpty()) {
IMs.forEach { IMs.forEach {
layoutInflater.inflate(R.layout.item_view_im, contact_ims_holder, false).apply { layoutInflater.inflate(R.layout.item_view_im, contact_ims_holder, false).apply {
val IM = it val IM = it
@ -414,6 +415,10 @@ class ViewContactActivity : ContactActivity() {
contact_ims_image.beGone() contact_ims_image.beGone()
contact_ims_holder.beGone() contact_ims_holder.beGone()
} }
} else {
contact_ims_image.beGone()
contact_ims_holder.beGone()
}
} }
private fun setupEvents() { private fun setupEvents() {