From 13b82a69eda516e7afd3502648ba36f97755fbb4 Mon Sep 17 00:00:00 2001 From: sowjanyakch Date: Tue, 8 Jul 2025 16:13:50 +0200 Subject: [PATCH] rename icon name + use scaled icons for participants view Signed-off-by: sowjanyakch --- .../adapters/items/MentionAutocompleteItem.kt | 2 +- .../talk/extensions/ImageViewExtensions.kt | 4 ++-- .../com/nextcloud/talk/utils/DisplayUtils.kt | 2 +- .../{icon_team.xml => icon_circular_team.xml} | 0 .../res/drawable/ic_avatar_group_small.xml | 22 +++++++++++++++++++ .../res/drawable/ic_avatar_team_small.xml | 22 +++++++++++++++++++ .../{icon_team.xml => icon_circular_team.xml} | 0 7 files changed, 48 insertions(+), 4 deletions(-) rename app/src/main/res/drawable-night/{icon_team.xml => icon_circular_team.xml} (100%) create mode 100644 app/src/main/res/drawable/ic_avatar_group_small.xml create mode 100644 app/src/main/res/drawable/ic_avatar_team_small.xml rename app/src/main/res/drawable/{icon_team.xml => icon_circular_team.xml} (100%) diff --git a/app/src/main/java/com/nextcloud/talk/adapters/items/MentionAutocompleteItem.kt b/app/src/main/java/com/nextcloud/talk/adapters/items/MentionAutocompleteItem.kt index d61912503..d0b9b207a 100644 --- a/app/src/main/java/com/nextcloud/talk/adapters/items/MentionAutocompleteItem.kt +++ b/app/src/main/java/com/nextcloud/talk/adapters/items/MentionAutocompleteItem.kt @@ -177,7 +177,7 @@ class MentionAutocompleteItem( val imageViewHeight = holder.binding.avatarView.height val request = ImageRequest.Builder(context) - .data(R.drawable.icon_team) + .data(R.drawable.icon_circular_team) .size(imageViewWidth, imageViewHeight) .scale(coil.size.Scale.FILL) .target(holder.binding.avatarView) diff --git a/app/src/main/java/com/nextcloud/talk/extensions/ImageViewExtensions.kt b/app/src/main/java/com/nextcloud/talk/extensions/ImageViewExtensions.kt index 15991352f..0431ef5b3 100644 --- a/app/src/main/java/com/nextcloud/talk/extensions/ImageViewExtensions.kt +++ b/app/src/main/java/com/nextcloud/talk/extensions/ImageViewExtensions.kt @@ -332,12 +332,12 @@ fun ImageView.loadBotsAvatar(): io.reactivex.disposables.Disposable { } fun ImageView.loadDefaultGroupCallAvatar(viewThemeUtils: ViewThemeUtils): io.reactivex.disposables.Disposable { - val data: Any = viewThemeUtils.talk.themePlaceholderAvatar(this, R.drawable.ic_avatar_group) as Any + val data: Any = viewThemeUtils.talk.themePlaceholderAvatar(this, R.drawable.ic_avatar_group_small) as Any return loadUserAvatar(data) } fun ImageView.loadTeamAvatar(viewThemeUtils: ViewThemeUtils): io.reactivex.disposables.Disposable { - val data: Any = viewThemeUtils.talk.themePlaceholderAvatar(this, R.drawable.icon_team) as Any + val data: Any = viewThemeUtils.talk.themePlaceholderAvatar(this, R.drawable.ic_avatar_team_small) as Any return loadUserAvatar(data) } diff --git a/app/src/main/java/com/nextcloud/talk/utils/DisplayUtils.kt b/app/src/main/java/com/nextcloud/talk/utils/DisplayUtils.kt index 7119a7e2c..76c63acb1 100644 --- a/app/src/main/java/com/nextcloud/talk/utils/DisplayUtils.kt +++ b/app/src/main/java/com/nextcloud/talk/utils/DisplayUtils.kt @@ -174,7 +174,7 @@ object DisplayUtils { chip.setChipIconResource(R.drawable.ic_circular_group) } if (type == "circle" || type == "teams") { - chip.setChipIconResource(R.drawable.icon_team) + chip.setChipIconResource(R.drawable.icon_circular_team) } if (isCall && isPhoneNumber(label.toString())) { diff --git a/app/src/main/res/drawable-night/icon_team.xml b/app/src/main/res/drawable-night/icon_circular_team.xml similarity index 100% rename from app/src/main/res/drawable-night/icon_team.xml rename to app/src/main/res/drawable-night/icon_circular_team.xml diff --git a/app/src/main/res/drawable/ic_avatar_group_small.xml b/app/src/main/res/drawable/ic_avatar_group_small.xml new file mode 100644 index 000000000..30055f042 --- /dev/null +++ b/app/src/main/res/drawable/ic_avatar_group_small.xml @@ -0,0 +1,22 @@ + + + + + + + diff --git a/app/src/main/res/drawable/ic_avatar_team_small.xml b/app/src/main/res/drawable/ic_avatar_team_small.xml new file mode 100644 index 000000000..8c5269471 --- /dev/null +++ b/app/src/main/res/drawable/ic_avatar_team_small.xml @@ -0,0 +1,22 @@ + + + + + + + + + diff --git a/app/src/main/res/drawable/icon_team.xml b/app/src/main/res/drawable/icon_circular_team.xml similarity index 100% rename from app/src/main/res/drawable/icon_team.xml rename to app/src/main/res/drawable/icon_circular_team.xml