diff --git a/app/src/main/java/com/nextcloud/talk/adapters/items/CallItem.java b/app/src/main/java/com/nextcloud/talk/adapters/items/CallItem.java index 0bee85c0c..2ecbbc6ed 100644 --- a/app/src/main/java/com/nextcloud/talk/adapters/items/CallItem.java +++ b/app/src/main/java/com/nextcloud/talk/adapters/items/CallItem.java @@ -145,13 +145,13 @@ public class CallItem extends AbstractFlexibleItem case ROOM_GROUP_CALL: holder.moreMenuButton.setContentDescription(String.format(resources.getString(R.string .nc_description_more_menu_group), conversation.getDisplayName())); - holder.avatarImageView.setActualImageResource(R.drawable.ic_people_group_white_24px); + holder.avatarImageView.setActualImageResource(R.drawable.ic_circular_group); holder.avatarImageView.setVisibility(View.VISIBLE); break; case ROOM_PUBLIC_CALL: holder.moreMenuButton.setContentDescription(String.format(resources.getString(R.string .nc_description_more_menu_public), conversation.getDisplayName())); - holder.avatarImageView.setActualImageResource(R.drawable.ic_link_white_24px); + holder.avatarImageView.setActualImageResource(R.drawable.ic_circular_link); holder.avatarImageView.setVisibility(View.VISIBLE); break; default: diff --git a/app/src/main/java/com/nextcloud/talk/adapters/items/ConversationItem.java b/app/src/main/java/com/nextcloud/talk/adapters/items/ConversationItem.java index cb552c08f..c00aa504e 100644 --- a/app/src/main/java/com/nextcloud/talk/adapters/items/ConversationItem.java +++ b/app/src/main/java/com/nextcloud/talk/adapters/items/ConversationItem.java @@ -258,12 +258,10 @@ public class ConversationItem extends AbstractFlexibleItem } } else if ("groups".equals(participant.getSource())) { - holder.simpleDraweeView.getHierarchy().setImage(new BitmapDrawable(DisplayUtils.getRoundedBitmapFromVectorDrawableResource(NextcloudTalkApplication.Companion.getSharedApplication().getResources(), R.drawable.ic_people_group_white_24px)), 100, true); + holder.simpleDraweeView.setImageResource(R.drawable.ic_circular_group); } Resources resources = NextcloudTalkApplication.Companion.getSharedApplication().getResources(); diff --git a/app/src/main/java/com/nextcloud/talk/controllers/CallNotificationController.java b/app/src/main/java/com/nextcloud/talk/controllers/CallNotificationController.java index 64b8e77ba..2ccd5a57b 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/CallNotificationController.java +++ b/app/src/main/java/com/nextcloud/talk/controllers/CallNotificationController.java @@ -455,11 +455,9 @@ public class CallNotificationController extends BaseController { break; case ROOM_GROUP_CALL: - avatarImageView.getHierarchy().setImage(DisplayUtils.getRoundedDrawable(context.getDrawable(R.drawable.ic_people_group_white_24px)) - , 100, true); + avatarImageView.setImageResource(R.drawable.ic_circular_group); case ROOM_PUBLIC_CALL: - avatarImageView.getHierarchy().setImage(DisplayUtils.getRoundedDrawable(context.getDrawable(R.drawable.ic_people_group_white_24px)) - , 100, true); + avatarImageView.setImageResource(R.drawable.ic_circular_group); break; default: } diff --git a/app/src/main/java/com/nextcloud/talk/controllers/ConversationInfoController.kt b/app/src/main/java/com/nextcloud/talk/controllers/ConversationInfoController.kt index 77a5e8465..dda408a6c 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/ConversationInfoController.kt +++ b/app/src/main/java/com/nextcloud/talk/controllers/ConversationInfoController.kt @@ -652,18 +652,10 @@ class ConversationInfoController(args: Bundle) : BaseController(args), FlexibleA conversationAvatarImageView.controller = draweeController } Conversation.ConversationType.ROOM_GROUP_CALL -> conversationAvatarImageView.hierarchy.setPlaceholderImage( - DisplayUtils - .getRoundedBitmapDrawableFromVectorDrawableResource( - resources, - R.drawable.ic_people_group_white_24px - ) + R.drawable.ic_circular_group ) Conversation.ConversationType.ROOM_PUBLIC_CALL -> conversationAvatarImageView.hierarchy.setPlaceholderImage( - DisplayUtils - .getRoundedBitmapDrawableFromVectorDrawableResource( - resources, - R.drawable.ic_link_white_24px - ) + R.drawable.ic_circular_link ) Conversation.ConversationType.ROOM_SYSTEM -> { val layers = arrayOfNulls(2) diff --git a/app/src/main/java/com/nextcloud/talk/utils/DisplayUtils.java b/app/src/main/java/com/nextcloud/talk/utils/DisplayUtils.java index a580336e9..f8c0815dd 100644 --- a/app/src/main/java/com/nextcloud/talk/utils/DisplayUtils.java +++ b/app/src/main/java/com/nextcloud/talk/utils/DisplayUtils.java @@ -294,9 +294,9 @@ public class DisplayUtils { drawable = R.drawable.accent_circle; } - chip.setChipIcon(context.getDrawable(drawable)); + chip.setChipIconResource(drawable); } else { - chip.setChipIcon(getRoundedDrawable(context.getDrawable(R.drawable.ic_people_group_white_24px))); + chip.setChipIconResource(R.drawable.ic_circular_group); } chip.setBounds(0, 0, chip.getIntrinsicWidth(), chip.getIntrinsicHeight()); diff --git a/app/src/main/res/drawable/ic_people_group_white_24px.xml b/app/src/main/res/drawable/ic_circular_group.xml similarity index 69% rename from app/src/main/res/drawable/ic_people_group_white_24px.xml rename to app/src/main/res/drawable/ic_circular_group.xml index 7b16a39a0..af24e8f42 100644 --- a/app/src/main/res/drawable/ic_people_group_white_24px.xml +++ b/app/src/main/res/drawable/ic_circular_group.xml @@ -1,8 +1,8 @@ - - - + + + diff --git a/app/src/main/res/drawable/ic_circular_link.xml b/app/src/main/res/drawable/ic_circular_link.xml new file mode 100644 index 000000000..44c77cc88 --- /dev/null +++ b/app/src/main/res/drawable/ic_circular_link.xml @@ -0,0 +1,35 @@ + + + + + + diff --git a/app/src/main/res/drawable/ic_link_white_24px.xml b/app/src/main/res/drawable/ic_link_white_24px.xml deleted file mode 100644 index 44c11a81d..000000000 --- a/app/src/main/res/drawable/ic_link_white_24px.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - diff --git a/drawable_resources/other/circular_group.svg b/drawable_resources/other/circular_group.svg new file mode 100644 index 000000000..128f800d0 --- /dev/null +++ b/drawable_resources/other/circular_group.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/drawable_resources/other/circular_link.svg b/drawable_resources/other/circular_link.svg new file mode 100644 index 000000000..d641286e7 --- /dev/null +++ b/drawable_resources/other/circular_link.svg @@ -0,0 +1,8 @@ + + + + + + + +