mirrors/linphone-android
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-android.git synced 2026-01-28 09:09:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added support to job title

Browse source
This commit is contained in:
Sylvain Berfini 2023-08-12 17:08:35 +02:00
parent 1901a8535a
commit 571fa8c885
4 changed files with 68 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/src/main/java/org/linphone/contacts/ContactLoader.kt
View file

@ -237,12 +237,15 @@ class ContactLoader : LoaderManager.LoaderCallbacks<Cursor> {
friend.organization = organization
}
/*val job: String? =
val job: String? =
cursor.getString(
cursor.getColumnIndexOrThrow(
ContactsContract.CommonDataKinds.Organization.TITLE
)
)*/
)
if (job != null) {
friend.jobTitle = job
}
}
}

13
app/src/main/java/org/linphone/ui/main/contacts/viewmodel/ContactViewModel.kt
View file

@ -38,12 +38,12 @@ class ContactViewModel : ViewModel() {
val company = MutableLiveData<String>()
val title = MutableLiveData<String>()
val showBackButton = MutableLiveData<Boolean>()
val showNumbersAndAddresses = MutableLiveData<Boolean>()
val showCompany = MutableLiveData<Boolean>()
val showDevicesTrust = MutableLiveData<Boolean>()
val contactFoundEvent = MutableLiveData<Event<Boolean>>()
@ -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<ContactNumberOrAddressModel>()

58
app/src/main/res/layout/contact_fragment.xml
View file

@ -65,8 +65,14 @@
<androidx.constraintlayout.widget.Group
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:constraint_referenced_ids="info_background, company_label, company"
android:visibility="@{viewModel.showCompany ? View.VISIBLE : View.GONE}" />
app:constraint_referenced_ids="company_label, company"
android:visibility="@{viewModel.company.length() > 0 ? View.VISIBLE : View.GONE}" />
<androidx.constraintlayout.widget.Group
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:constraint_referenced_ids="title_label, title"
android:visibility="@{viewModel.title.length() > 0 ? View.VISIBLE : View.GONE}" />
<androidx.constraintlayout.widget.Group
android:layout_width="wrap_content"
@ -247,10 +253,11 @@
android:layout_marginStart="17dp"
android:layout_marginEnd="17dp"
android:src="@drawable/shape_round_white_background"
android:visibility="@{viewModel.title.length() > 0 || viewModel.company.length() > 0 ? View.VISIBLE : View.GONE}"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/numbers_and_addresses"
app:layout_constraintBottom_toBottomOf="@id/company_label"/>
app:layout_constraintBottom_toBottomOf="@id/title_label"/>
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style_700"
@ -258,29 +265,58 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:paddingTop="16dp"
android:paddingBottom="16dp"
android:text="Company : "
android:paddingTop="8dp"
android:paddingBottom="8dp"
android:text="Company :"
android:textSize="14sp"
android:maxLines="1"
android:ellipsize="end"
app:layout_constraintStart_toStartOf="@id/info_background"
app:layout_constraintTop_toTopOf="@id/info_background"/>
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style"
android:id="@+id/company"
android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:paddingTop="16dp"
android:paddingBottom="16dp"
android:layout_marginStart="5dp"
android:paddingTop="8dp"
android:paddingBottom="8dp"
android:text="@{viewModel.company, default=`Belledonne Comm`}"
android:textSize="14sp"
android:maxLines="1"
android:ellipsize="end"
app:layout_constraintStart_toEndOf="@id/company_label"
app:layout_constraintEnd_toEndOf="@id/info_background"
app:layout_constraintTop_toTopOf="@id/info_background"/>
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style_700"
android:id="@+id/title_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:paddingTop="8dp"
android:paddingBottom="8dp"
android:text="Title :"
android:textSize="14sp"
app:layout_constraintStart_toStartOf="@id/info_background"
app:layout_constraintTop_toBottomOf="@id/company"/>
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style"
android:id="@+id/title"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="5dp"
android:paddingTop="8dp"
android:paddingBottom="8dp"
android:text="@{viewModel.title, default=`Android developer`}"
android:textSize="14sp"
android:maxLines="1"
android:ellipsize="end"
app:layout_constraintEnd_toEndOf="@id/info_background"
app:layout_constraintStart_toEndOf="@id/title_label"
app:layout_constraintTop_toBottomOf="@id/company"/>
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style_800"
android:onClick="@{() -> viewModel.toggleDevicesTrustVisibility()}"

8
settings.gradle
View file

@ -11,6 +11,14 @@ dependencyResolutionManagement {
google()
mavenCentral()
maven {
name "local linphone-sdk maven repository"
url file(LinphoneSdkBuildDir + '/maven_repository/')
content {
includeGroup "org.linphone"
}
}
maven {
name "linphone.org maven repository"
url "https://linphone.org/maven_repository"