@@ -442,40 +442,6 @@ class ViewContactActivity : ContactActivity() {
442442 }
443443 }
444444
445- private fun setupNotes () {
446- val notes = contact!! .notes
447- if (notes.isNotEmpty() && showFields and SHOW_NOTES_FIELD != 0 ) {
448- contact_notes.text = notes
449- contact_notes_image.beVisible()
450- contact_notes.beVisible()
451- contact_notes.copyOnLongClick(notes)
452- } else {
453- contact_notes_image.beGone()
454- contact_notes.beGone()
455- }
456- }
457-
458- private fun setupOrganization () {
459- val organization = contact!! .organization
460- if (organization.isNotEmpty() && showFields and SHOW_ORGANIZATION_FIELD != 0 ) {
461- contact_organization_company.text = organization.company
462- contact_organization_job_position.text = organization.jobPosition
463- contact_organization_image.beGoneIf(organization.isEmpty())
464- contact_organization_company.beGoneIf(organization.company.isEmpty())
465- contact_organization_job_position.beGoneIf(organization.jobPosition.isEmpty())
466- contact_organization_company.copyOnLongClick(contact_organization_company.value)
467- contact_organization_job_position.copyOnLongClick(contact_organization_job_position.value)
468-
469- if (organization.company.isEmpty() && organization.jobPosition.isNotEmpty()) {
470- (contact_organization_image.layoutParams as RelativeLayout .LayoutParams ).addRule(RelativeLayout .ALIGN_TOP , contact_organization_job_position.id)
471- }
472- } else {
473- contact_organization_image.beGone()
474- contact_organization_company.beGone()
475- contact_organization_job_position.beGone()
476- }
477- }
478-
479445 private fun setupWebsites () {
480446 var websites = contact!! .websites.toMutableSet() as LinkedHashSet <String >
481447 duplicateContacts.forEach {
@@ -567,6 +533,40 @@ class ViewContactActivity : ContactActivity() {
567533 }
568534 }
569535
536+ private fun setupNotes () {
537+ val notes = contact!! .notes
538+ if (notes.isNotEmpty() && showFields and SHOW_NOTES_FIELD != 0 ) {
539+ contact_notes.text = notes
540+ contact_notes_image.beVisible()
541+ contact_notes.beVisible()
542+ contact_notes.copyOnLongClick(notes)
543+ } else {
544+ contact_notes_image.beGone()
545+ contact_notes.beGone()
546+ }
547+ }
548+
549+ private fun setupOrganization () {
550+ val organization = contact!! .organization
551+ if (organization.isNotEmpty() && showFields and SHOW_ORGANIZATION_FIELD != 0 ) {
552+ contact_organization_company.text = organization.company
553+ contact_organization_job_position.text = organization.jobPosition
554+ contact_organization_image.beGoneIf(organization.isEmpty())
555+ contact_organization_company.beGoneIf(organization.company.isEmpty())
556+ contact_organization_job_position.beGoneIf(organization.jobPosition.isEmpty())
557+ contact_organization_company.copyOnLongClick(contact_organization_company.value)
558+ contact_organization_job_position.copyOnLongClick(contact_organization_job_position.value)
559+
560+ if (organization.company.isEmpty() && organization.jobPosition.isNotEmpty()) {
561+ (contact_organization_image.layoutParams as RelativeLayout .LayoutParams ).addRule(RelativeLayout .ALIGN_TOP , contact_organization_job_position.id)
562+ }
563+ } else {
564+ contact_organization_image.beGone()
565+ contact_organization_company.beGone()
566+ contact_organization_job_position.beGone()
567+ }
568+ }
569+
570570 private fun getDuplicateContacts (callback : () -> Unit ) {
571571 ContactsHelper (this ).getDuplicatesOfContact(contact!! , false ) { contacts ->
572572 ensureBackgroundThread {
0 commit comments