From 558003649cee5c8638bc0cf6cc65366c558680cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com> Date: Sun, 25 Feb 2024 14:46:46 -0500 Subject: [PATCH] use AvatarView Change-Id: I55bf89cdb327fbda28b8c50b7de606cdcdfa8487 --- .../java/cx/ring/viewholders/SmartListViewHolder.kt | 10 ++++------ .../app/src/main/res/layout/item_smartlist.xml | 9 +++++---- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/jami-android/app/src/main/java/cx/ring/viewholders/SmartListViewHolder.kt b/jami-android/app/src/main/java/cx/ring/viewholders/SmartListViewHolder.kt index 4e1021205..aca50f30c 100644 --- a/jami-android/app/src/main/java/cx/ring/viewholders/SmartListViewHolder.kt +++ b/jami-android/app/src/main/java/cx/ring/viewholders/SmartListViewHolder.kt @@ -74,7 +74,7 @@ class SmartListViewHolder : RecyclerView.ViewHolder { binding.convLastItem.text = "" binding.convLastTime.text = "" binding.convParticipant.text = "" - binding.photo.setImageDrawable(null) + binding.photo.setAvatar(null) } itemView.setOnClickListener { clickListener.onItemClick(conversation) } @@ -119,12 +119,10 @@ class SmartListViewHolder : RecyclerView.ViewHolder { .observeOn(DeviceUtils.uiScheduler) .subscribe { conversationItemViewModel -> binding.convParticipant.text = conversationItemViewModel.title - val fade = binding.photo.drawable !is AvatarDrawable - binding.photo.setImageDrawable(AvatarDrawable.Builder() + if (binding.photo.setAvatar(AvatarDrawable.Builder() .withViewModel(conversationItemViewModel) .withCircleCrop(true) - .build(binding.photo.context)) - if (fade) + .build(binding.photo.context))) binding.photo.startAnimation(fadeIn()) }) @@ -135,7 +133,7 @@ class SmartListViewHolder : RecyclerView.ViewHolder { } fun unbind() { - binding?.photo?.setImageDrawable(null) + binding?.photo?.setAvatar(null) compositeDisposable.clear() } diff --git a/jami-android/app/src/main/res/layout/item_smartlist.xml b/jami-android/app/src/main/res/layout/item_smartlist.xml index ba90ca831..41149b87b 100644 --- a/jami-android/app/src/main/res/layout/item_smartlist.xml +++ b/jami-android/app/src/main/res/layout/item_smartlist.xml @@ -27,14 +27,14 @@ along with this program; if not, write to the Free Software android:paddingRight="16dp" android:paddingBottom="8dp"> - <ImageView + <cx.ring.views.AvatarView android:id="@+id/photo" android:layout_width="60dp" android:layout_height="60dp" android:layout_centerVertical="true" android:layout_marginEnd="16dp" - android:scaleType="fitCenter" - tools:src="@drawable/ic_contact_picture_fallback" /> + tools:uri="@tools:sample/us_phones" + tools:avatar="@tools:sample/avatars" /> <RelativeLayout android:id="@+id/conv_info" @@ -58,7 +58,8 @@ along with this program; if not, write to the Free Software android:textColor="?attr/colorOnSurface" android:textSize="@dimen/text_size_medium" android:textStyle="bold" - tools:text="Person Name" /> + tools:text="@tools:sample/full_names" + android:paddingBottom="3dp"/> <TextView android:id="@+id/conv_last_item" -- GitLab