From a6b3b33587f9124fa717250b83fc79f247861933 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Thu, 27 Oct 2022 16:35:13 +0200 Subject: [PATCH] Hide scheduled meeting description if empty in summary + fix description textfield title in summary + fixed issue with avatars --- .../java/org/linphone/utils/DataBindingUtils.kt | 7 +++++-- .../voip_single_contact_avatar_alt_2.png | Bin 0 -> 11743 bytes .../drawable/icon_single_contact_avatar_alt.xml | 7 +++++++ .../conference_scheduling_summary_fragment.xml | 5 +++-- 4 files changed, 15 insertions(+), 4 deletions(-) create mode 100644 app/src/main/res/drawable-xhdpi/voip_single_contact_avatar_alt_2.png create mode 100644 app/src/main/res/drawable/icon_single_contact_avatar_alt.xml 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 0000000000000000000000000000000000000000..2b4065f80264400b9bcb4b458824207c5ccd4b74 GIT binary patch literal 11743 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 literal 0 HcmV?d00001 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"/>