diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/ViewContactActivity.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/ViewContactActivity.kt index 6c92f793..aeee4c3b 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/ViewContactActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/ViewContactActivity.kt @@ -19,6 +19,7 @@ import com.simplemobiletools.contacts.pro.helpers.* 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_contact_source.view.* import kotlinx.android.synthetic.main.item_view_email.view.* import kotlinx.android.synthetic.main.item_view_group.view.* import kotlinx.android.synthetic.main.item_view_im.view.* @@ -200,7 +201,7 @@ class ViewContactActivity : ContactActivity() { setupOrganization() setupWebsites() setupGroups() - setupContactSource() + setupContactSource(contact!!.source) } private fun editContact() { @@ -468,17 +469,21 @@ class ViewContactActivity : ContactActivity() { } } - private fun setupContactSource() { + private fun setupContactSource(source: String) { if (showFields and SHOW_CONTACT_SOURCE_FIELD != 0) { - getPublicContactSource(contact!!.source) { - contact_source.text = it - contact_source.copyOnLongClick(it) + layoutInflater.inflate(R.layout.item_view_contact_source, contact_sources_holder, false).apply { + getPublicContactSource(source) { + contact_source.text = it + contact_source.copyOnLongClick(it) + contact_sources_holder.addView(this) + } } + contact_source_image.beVisible() - contact_source.beVisible() + contact_sources_holder.beVisible() } else { contact_source_image.beGone() - contact_source.beGone() + contact_sources_holder.beGone() } } diff --git a/app/src/main/res/layout/activity_view_contact.xml b/app/src/main/res/layout/activity_view_contact.xml index dc0ac540..8c482eaa 100644 --- a/app/src/main/res/layout/activity_view_contact.xml +++ b/app/src/main/res/layout/activity_view_contact.xml @@ -389,28 +389,20 @@ android:id="@+id/contact_source_image" android:layout_width="@dimen/contact_icons_size" android:layout_height="@dimen/contact_icons_size" - android:layout_alignTop="@+id/contact_source" + android:layout_alignTop="@+id/contact_sources_holder" android:paddingTop="@dimen/medium_margin" android:paddingEnd="@dimen/small_margin" android:paddingBottom="@dimen/small_margin" android:src="@drawable/ic_account_box_vector"/> - + android:orientation="vertical" + android:paddingStart="@dimen/small_margin"/> diff --git a/app/src/main/res/layout/item_view_contact_source.xml b/app/src/main/res/layout/item_view_contact_source.xml new file mode 100644 index 00000000..cfa4fda6 --- /dev/null +++ b/app/src/main/res/layout/item_view_contact_source.xml @@ -0,0 +1,15 @@ + +