fenix/Simple-Contacts
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Contacts.git synced 2025-04-25 14:58:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix a glitch with misaligned Company icon if just the job position is filled

Browse Source
This commit is contained in:
tibbi 2018-10-28 12:00:04 +01:00
parent c4ac5a238b
commit 208366b613
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -354,12 +354,16 @@ class ViewContactActivity : ContactActivity() {
private fun setupOrganization() { private fun setupOrganization() {
val organization = contact!!.organization val organization = contact!!.organization
if (!organization.isEmpty() && showFields and SHOW_ORGANIZATION_FIELD != 0) { if (organization.isNotEmpty() && showFields and SHOW_ORGANIZATION_FIELD != 0) {
contact_organization_company.text = organization.company contact_organization_company.text = organization.company
contact_organization_job_position.text = organization.jobPosition contact_organization_job_position.text = organization.jobPosition
contact_organization_image.beGoneIf(organization.isEmpty()) contact_organization_image.beGoneIf(organization.isEmpty())
contact_organization_company.beGoneIf(organization.company.isEmpty()) contact_organization_company.beGoneIf(organization.company.isEmpty())
contact_organization_job_position.beGoneIf(organization.jobPosition.isEmpty()) contact_organization_job_position.beGoneIf(organization.jobPosition.isEmpty())
if (organization.company.isEmpty() && organization.jobPosition.isNotEmpty()) {
(contact_organization_image.layoutParams as RelativeLayout.LayoutParams).addRule(RelativeLayout.ALIGN_TOP, contact_organization_job_position.id)
}
} else { } else {
contact_organization_image.beGone() contact_organization_image.beGone()
contact_organization_company.beGone() contact_organization_company.beGone()

2
app/src/main/kotlin/com/simplemobiletools/contacts/helpers/ContactsHelper.kt
View File

@ -1313,7 +1313,7 @@ class ContactsHelper(val activity: Activity) {
} }
// organization // organization
if (!contact.organization.isEmpty()) { if (contact.organization.isNotEmpty()) {
ContentProviderOperation.newInsert(ContactsContract.Data.CONTENT_URI).apply { ContentProviderOperation.newInsert(ContactsContract.Data.CONTENT_URI).apply {
withValueBackReference(ContactsContract.Data.RAW_CONTACT_ID, 0) withValueBackReference(ContactsContract.Data.RAW_CONTACT_ID, 0)
withValue(ContactsContract.Data.MIMETYPE, CommonDataKinds.Organization.CONTENT_ITEM_TYPE) withValue(ContactsContract.Data.MIMETYPE, CommonDataKinds.Organization.CONTENT_ITEM_TYPE)

2
app/src/main/kotlin/com/simplemobiletools/contacts/helpers/VcfExporter.kt
View File

@ -122,7 +122,7 @@ class VcfExporter {
card.addNote(contact.notes) card.addNote(contact.notes)
} }
if (!contact.organization.isEmpty()) { if (contact.organization.isNotEmpty()) {
val organization = Organization() val organization = Organization()
organization.values.add(contact.organization.company) organization.values.add(contact.organization.company)
card.organization = organization card.organization = organization