show websites at contact details

This commit is contained in:
tibbi
2019-09-15 21:03:39 +02:00
parent 70d03f35b9
commit 4113aa681d

View File

@ -19,10 +19,10 @@ import com.simplemobiletools.contacts.pro.extensions.*
import com.simplemobiletools.contacts.pro.helpers.* import com.simplemobiletools.contacts.pro.helpers.*
import com.simplemobiletools.contacts.pro.models.* import com.simplemobiletools.contacts.pro.models.*
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_view_address.view.* import kotlinx.android.synthetic.main.item_view_address.view.*
import kotlinx.android.synthetic.main.item_view_contact_source.view.* import kotlinx.android.synthetic.main.item_view_contact_source.view.*
import kotlinx.android.synthetic.main.item_view_email.view.* import kotlinx.android.synthetic.main.item_view_email.view.*
import kotlinx.android.synthetic.main.item_view_event.view.*
import kotlinx.android.synthetic.main.item_view_group.view.* import kotlinx.android.synthetic.main.item_view_group.view.*
import kotlinx.android.synthetic.main.item_view_im.view.* import kotlinx.android.synthetic.main.item_view_im.view.*
import kotlinx.android.synthetic.main.item_view_phone_number.view.* import kotlinx.android.synthetic.main.item_view_phone_number.view.*
@ -208,13 +208,13 @@ class ViewContactActivity : ContactActivity() {
setupAddresses() setupAddresses()
setupIMs() setupIMs()
setupEvents() setupEvents()
setupNotes()
setupOrganization()
setupWebsites()
setupContactSources() setupContactSources()
} }
} }
setupNotes()
setupOrganization()
setupWebsites()
setupGroups() setupGroups()
} }
@ -487,8 +487,15 @@ class ViewContactActivity : ContactActivity() {
private fun setupWebsites() { private fun setupWebsites() {
contact_websites_holder.removeAllViews() contact_websites_holder.removeAllViews()
val websites = contact!!.websites if (showFields and SHOW_WEBSITES_FIELD != 0) {
if (websites.isNotEmpty() && showFields and SHOW_WEBSITES_FIELD != 0) { var websites = contact!!.websites.toMutableSet() as LinkedHashSet<String>
duplicateContacts.forEach {
websites.addAll(it.websites)
}
websites = websites.sorted().toMutableSet() as LinkedHashSet<String>
if (websites.isNotEmpty()) {
websites.forEach { websites.forEach {
val url = it val url = it
layoutInflater.inflate(R.layout.item_website, contact_websites_holder, false).apply { layoutInflater.inflate(R.layout.item_website, contact_websites_holder, false).apply {
@ -507,6 +514,10 @@ class ViewContactActivity : ContactActivity() {
contact_websites_image.beGone() contact_websites_image.beGone()
contact_websites_holder.beGone() contact_websites_holder.beGone()
} }
} else {
contact_websites_image.beGone()
contact_websites_holder.beGone()
}
} }
private fun setupGroups() { private fun setupGroups() {