From 80ed22b85a4218e9c23dd091162f922d808800ab Mon Sep 17 00:00:00 2001 From: Arne <arne@monocles.de> Date: Mon, 30 Oct 2023 21:00:26 +0100 Subject: [PATCH] further round square avatars --- .../ui/ConferenceContactDetailsActivity.java | 8 ++++++++ src/main/res/layout/activity_muc_contact_details.xml | 10 ++++++++++ 2 files changed, 18 insertions(+) diff --git a/src/main/java/eu/siacs/conversations/ui/ConferenceContactDetailsActivity.java b/src/main/java/eu/siacs/conversations/ui/ConferenceContactDetailsActivity.java index 6767eecf9..cff7c805a 100644 --- a/src/main/java/eu/siacs/conversations/ui/ConferenceContactDetailsActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/ConferenceContactDetailsActivity.java @@ -86,11 +86,19 @@ public class ConferenceContactDetailsActivity extends XmppActivity { binding.jid.setText(IrregularUnicodeDetector.style(this, contactJid)); String account = accountJid.asBareJid().toEscapedString(); binding.detailsAccount.setText(getString(R.string.using_account, account)); + if (xmppConnectionService.getBooleanPreference("set_round_avatars", R.bool.set_round_avatars)) { AvatarWorkerTask.loadAvatar(user, binding.detailsContactBadge, R.dimen.avatar_on_details_screen_size); binding.detailsContactBadge.setOnLongClickListener(v -> { ShowAvatarPopup(ConferenceContactDetailsActivity.this, user); return true; }); + } else if (!xmppConnectionService.getBooleanPreference("set_round_avatars", R.bool.set_round_avatars)) { + AvatarWorkerTask.loadAvatar(user, binding.detailsContactBadgeSquare, R.dimen.avatar_on_details_screen_size); + binding.detailsContactBadgeSquare.setOnLongClickListener(v -> { + ShowAvatarPopup(ConferenceContactDetailsActivity.this, user); + return true; + }); + } if (xmppConnectionService.multipleAccounts()) { binding.detailsAccount.setVisibility(View.VISIBLE); } else { diff --git a/src/main/res/layout/activity_muc_contact_details.xml b/src/main/res/layout/activity_muc_contact_details.xml index dea98a9bd..161a438bc 100644 --- a/src/main/res/layout/activity_muc_contact_details.xml +++ b/src/main/res/layout/activity_muc_contact_details.xml @@ -73,6 +73,16 @@ android:scaleType="centerCrop" app:riv_corner_radius="80dp" /> + <com.makeramen.roundedimageview.RoundedImageView + android:id="@+id/details_contact_badge_square" + android:layout_width="@dimen/avatar_on_details_screen_size" + android:layout_height="@dimen/avatar_on_details_screen_size" + android:layout_marginEnd="@dimen/avatar_item_distance" + android:layout_marginRight="@dimen/avatar_item_distance" + android:padding="1dp" + android:scaleType="centerCrop" + app:riv_corner_radius="5dp" /> + <LinearLayout android:layout_width="wrap_content" android:layout_height="wrap_content"