diff --git a/app/src/main/java/org/linphone/utils/DataBindingUtils.kt b/app/src/main/java/org/linphone/utils/DataBindingUtils.kt index 0f32a97af..69bd280ed 100644 --- a/app/src/main/java/org/linphone/utils/DataBindingUtils.kt +++ b/app/src/main/java/org/linphone/utils/DataBindingUtils.kt @@ -34,6 +34,7 @@ import androidx.appcompat.content.res.AppCompatResources import androidx.constraintlayout.widget.ConstraintLayout import androidx.constraintlayout.widget.Guideline import androidx.databinding.* +import coil.dispose import coil.load import coil.request.CachePolicy import coil.request.videoFrameMillis @@ -344,6 +345,8 @@ private suspend fun loadContactPictureWithCoil( textColor: Int = 0, defaultAvatar: String? = null ) { + imageView.dispose() + val context = imageView.context if (contact == null) { if (defaultAvatar != null) { @@ -351,7 +354,7 @@ private suspend fun loadContactPictureWithCoil( transformations(CircleCropTransformation()) } } else { - imageView.load(R.drawable.icon_single_contact_avatar) + imageView.load(R.drawable.icon_single_contact_avatar_alt) } } else if (contact.showGroupChatAvatar) { imageView.load(AppCompatResources.getDrawable(context, R.drawable.icon_multiple_contacts_avatar)) @@ -363,7 +366,7 @@ private suspend fun loadContactPictureWithCoil( transformations(CircleCropTransformation()) error( if (displayName.isEmpty() || AppUtils.getInitials(displayName) == "+") { - AppCompatResources.getDrawable(context, R.drawable.icon_single_contact_avatar) + AppCompatResources.getDrawable(context, R.drawable.icon_single_contact_avatar_alt) } else { coroutineScope { withContext(Dispatchers.IO) { diff --git a/app/src/main/res/drawable-xhdpi/voip_single_contact_avatar_alt_2.png b/app/src/main/res/drawable-xhdpi/voip_single_contact_avatar_alt_2.png new file mode 100644 index 000000000..2b4065f80 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/voip_single_contact_avatar_alt_2.png differ diff --git a/app/src/main/res/drawable/icon_single_contact_avatar_alt.xml b/app/src/main/res/drawable/icon_single_contact_avatar_alt.xml new file mode 100644 index 000000000..eb5b93688 --- /dev/null +++ b/app/src/main/res/drawable/icon_single_contact_avatar_alt.xml @@ -0,0 +1,7 @@ + + + + + + diff --git a/app/src/main/res/layout/conference_scheduling_summary_fragment.xml b/app/src/main/res/layout/conference_scheduling_summary_fragment.xml index 4b1d1e080..3a62d3abf 100644 --- a/app/src/main/res/layout/conference_scheduling_summary_fragment.xml +++ b/app/src/main/res/layout/conference_scheduling_summary_fragment.xml @@ -234,13 +234,14 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_margin="5dp" - android:orientation="vertical"> + android:orientation="vertical" + android:visibility="@{viewModel.description.length() == 0 ? View.GONE : View.VISIBLE}"> + android:text="@string/conference_schedule_description_hint"/>