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

properly show all available contact addresses

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

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

@ -17,6 +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.Contact import com.simplemobiletools.contacts.pro.models.Contact
import com.simplemobiletools.contacts.pro.models.ContactSource import com.simplemobiletools.contacts.pro.models.ContactSource
import com.simplemobiletools.contacts.pro.models.PhoneNumber import com.simplemobiletools.contacts.pro.models.PhoneNumber
@ -206,12 +207,12 @@ class ViewContactActivity : ContactActivity() {
contactSources = it contactSources = it
getDuplicateContacts { getDuplicateContacts {
setupPhoneNumbers() setupPhoneNumbers()
setupEmails()
setupAddresses()
setupContactSources() setupContactSources()
} }
} }
setupEmails()
setupAddresses()
setupIMs() setupIMs()
setupEvents() setupEvents()
setupNotes() setupNotes()
@ -360,8 +361,15 @@ class ViewContactActivity : ContactActivity() {
private fun setupAddresses() { private fun setupAddresses() {
contact_addresses_holder.removeAllViews() contact_addresses_holder.removeAllViews()
val addresses = contact!!.addresses if (showFields and SHOW_ADDRESSES_FIELD != 0) {
if (addresses.isNotEmpty() && showFields and SHOW_ADDRESSES_FIELD != 0) { var addresses = contact!!.addresses.toMutableSet() as LinkedHashSet<Address>
duplicateContacts.forEach {
addresses.addAll(it.addresses)
}
addresses = addresses.sortedBy { it.type }.toMutableSet() as LinkedHashSet<Address>
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 {
val address = it val address = it
@ -381,6 +389,10 @@ class ViewContactActivity : ContactActivity() {
contact_addresses_image.beGone() contact_addresses_image.beGone()
contact_addresses_holder.beGone() contact_addresses_holder.beGone()
} }
} else {
contact_addresses_image.beGone()
contact_addresses_holder.beGone()
}
} }
private fun setupIMs() { private fun setupIMs() {