fenix
/
Simple-Contacts
mirror of https://github.com/SimpleMobileTools/Simple-Contacts.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

some code and style cleanup

This commit is contained in:
tibbi 2019-09-15 21:14:40 +02:00
parent 8afdf0430e
commit 6b26ec4199
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -329,6 +329,7 @@ class ViewContactActivity : ContactActivity() {
} }
} }
// a contact cannot have different emails per contact source. Such contacts are handled as separate ones, not duplicates of each other
private fun setupEmails() { private fun setupEmails() {
contact_emails_holder.removeAllViews() contact_emails_holder.removeAllViews()
val emails = contact!!.emails val emails = contact!!.emails
@ -493,7 +494,6 @@ class ViewContactActivity : ContactActivity() {
} }
websites = websites.sorted().toMutableSet() as LinkedHashSet<String> websites = websites.sorted().toMutableSet() as LinkedHashSet<String>
if (websites.isNotEmpty()) { if (websites.isNotEmpty()) {
websites.forEach { websites.forEach {
val url = it val url = it
@ -528,7 +528,6 @@ class ViewContactActivity : ContactActivity() {
} }
groups = groups.sortedBy { it.title }.toMutableSet() as LinkedHashSet<Group> groups = groups.sortedBy { it.title }.toMutableSet() as LinkedHashSet<Group>
if (groups.isNotEmpty()) { if (groups.isNotEmpty()) {
groups.forEach { groups.forEach {
layoutInflater.inflate(R.layout.item_view_group, contact_groups_holder, false).apply { layoutInflater.inflate(R.layout.item_view_group, contact_groups_holder, false).apply {
@ -551,6 +550,7 @@ class ViewContactActivity : ContactActivity() {
} }
private fun setupContactSources() { private fun setupContactSources() {
contact_sources_holder.removeAllViews()
if (showFields and SHOW_CONTACT_SOURCE_FIELD != 0) { if (showFields and SHOW_CONTACT_SOURCE_FIELD != 0) {
var sources = HashMap<Contact, String>() var sources = HashMap<Contact, String>()
sources[contact!!] = getPublicContactSourceSync(contact!!.source, contactSources) sources[contact!!] = getPublicContactSourceSync(contact!!.source, contactSources)
@ -562,7 +562,6 @@ class ViewContactActivity : ContactActivity() {
sources = sources.toList().sortedBy { (key, value) -> value.toLowerCase() }.toMap() as LinkedHashMap<Contact, String> sources = sources.toList().sortedBy { (key, value) -> value.toLowerCase() }.toMap() as LinkedHashMap<Contact, String>
} }
contact_sources_holder.removeAllViews()
for ((key, value) in sources) { for ((key, value) in sources) {
layoutInflater.inflate(R.layout.item_view_contact_source, contact_sources_holder, false).apply { layoutInflater.inflate(R.layout.item_view_contact_source, contact_sources_holder, false).apply {
contact_source.text = value contact_source.text = value