diff --git a/app/src/main/java/org/linphone/contacts/ContactLoader.kt b/app/src/main/java/org/linphone/contacts/ContactLoader.kt index c3c1fce8c..5c6f3fff3 100644 --- a/app/src/main/java/org/linphone/contacts/ContactLoader.kt +++ b/app/src/main/java/org/linphone/contacts/ContactLoader.kt @@ -237,12 +237,15 @@ class ContactLoader : LoaderManager.LoaderCallbacks { friend.organization = organization } - /*val job: String? = + val job: String? = cursor.getString( cursor.getColumnIndexOrThrow( ContactsContract.CommonDataKinds.Organization.TITLE ) - )*/ + ) + if (job != null) { + friend.jobTitle = job + } } } diff --git a/app/src/main/java/org/linphone/ui/main/contacts/viewmodel/ContactViewModel.kt b/app/src/main/java/org/linphone/ui/main/contacts/viewmodel/ContactViewModel.kt index 5c3bb8346..0e25225d0 100644 --- a/app/src/main/java/org/linphone/ui/main/contacts/viewmodel/ContactViewModel.kt +++ b/app/src/main/java/org/linphone/ui/main/contacts/viewmodel/ContactViewModel.kt @@ -38,12 +38,12 @@ class ContactViewModel : ViewModel() { val company = MutableLiveData() + val title = MutableLiveData() + val showBackButton = MutableLiveData() val showNumbersAndAddresses = MutableLiveData() - val showCompany = MutableLiveData() - val showDevicesTrust = MutableLiveData() val contactFoundEvent = MutableLiveData>() @@ -74,8 +74,7 @@ class ContactViewModel : ViewModel() { init { showNumbersAndAddresses.value = true - showDevicesTrust.value = true - showCompany.value = false + showDevicesTrust.value = false // TODO FIXME: set it to true when it will work for real } fun findContactByRefKey(refKey: String) { @@ -84,10 +83,14 @@ class ContactViewModel : ViewModel() { val friend = coreContext.contactsManager.findContactById(refKey) if (friend != null) { contact.postValue(ContactAvatarModel(friend)) + val organization = friend.organization if (!organization.isNullOrEmpty()) { company.postValue(organization) - showCompany.postValue(true) + } + val jobTitle = friend.jobTitle + if (!jobTitle.isNullOrEmpty()) { + title.postValue(jobTitle) } val addressesAndNumbers = arrayListOf() diff --git a/app/src/main/res/layout/contact_fragment.xml b/app/src/main/res/layout/contact_fragment.xml index 893a61df2..353751d44 100644 --- a/app/src/main/res/layout/contact_fragment.xml +++ b/app/src/main/res/layout/contact_fragment.xml @@ -65,8 +65,14 @@ + app:constraint_referenced_ids="company_label, company" + android:visibility="@{viewModel.company.length() > 0 ? View.VISIBLE : View.GONE}" /> + + + app:layout_constraintBottom_toBottomOf="@id/title_label"/> + + + +