From 120974bc00f85b5275c1a6530740763a8f90c752 Mon Sep 17 00:00:00 2001
From: sowjanyakch <sowjanya.kch@gmail.com>
Date: Tue, 8 Jul 2025 19:06:07 +0200
Subject: [PATCH] add consistent icons

Signed-off-by: sowjanyakch <sowjanya.kch@gmail.com>
---
 .../adapters/items/MentionAutocompleteItem.kt | 27 ++++++-------------
 .../res/drawable/ic_avatar_group_small.xml    |  2 +-
 .../res/drawable/ic_avatar_team_small.xml     |  5 ++--
 3 files changed, 12 insertions(+), 22 deletions(-)

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 d0b9b207a..a3ce3fffb 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
@@ -13,8 +13,6 @@ import android.content.Context
 import android.view.View
 import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.core.content.res.ResourcesCompat
-import coil.Coil
-import coil.request.ImageRequest
 import com.nextcloud.talk.PhoneUtils.isPhoneNumber
 import com.nextcloud.talk.R
 import com.nextcloud.talk.adapters.items.ParticipantItem.ParticipantItemViewHolder
@@ -41,8 +39,7 @@ class MentionAutocompleteItem(
     private val context: Context,
     @JvmField val roomToken: String,
     private val viewThemeUtils: ViewThemeUtils
-) : AbstractFlexibleItem<ParticipantItemViewHolder>(),
-    IFilterable<String?> {
+) : AbstractFlexibleItem<ParticipantItemViewHolder>(), IFilterable<String?> {
     @JvmField
     var source: String?
 
@@ -137,7 +134,7 @@ class MentionAutocompleteItem(
                         holder.binding.avatarView.loadUserAvatar(
                             viewThemeUtils.talk.themePlaceholderAvatar(
                                 holder.binding.avatarView,
-                                R.drawable.ic_avatar_group
+                                R.drawable.ic_avatar_group_small
                             )
                         )
                     }
@@ -146,7 +143,8 @@ class MentionAutocompleteItem(
 
             SOURCE_GROUPS -> {
                 holder.binding.avatarView.loadUserAvatar(
-                    viewThemeUtils.talk.themePlaceholderAvatar(holder.binding.avatarView, R.drawable.ic_avatar_group)
+                    viewThemeUtils.talk.themePlaceholderAvatar(holder.binding.avatarView, R.drawable
+                        .ic_avatar_group_small)
                 )
             }
 
@@ -172,19 +170,10 @@ class MentionAutocompleteItem(
             }
 
             SOURCE_TEAMS -> {
-                holder.binding.avatarView.post {
-                    val imageViewWidth = holder.binding.avatarView.width
-                    val imageViewHeight = holder.binding.avatarView.height
-
-                    val request = ImageRequest.Builder(context)
-                        .data(R.drawable.icon_circular_team)
-                        .size(imageViewWidth, imageViewHeight)
-                        .scale(coil.size.Scale.FILL)
-                        .target(holder.binding.avatarView)
-                        .build()
-
-                    Coil.imageLoader(context).enqueue(request)
-                }
+                holder.binding.avatarView.loadUserAvatar(
+                    viewThemeUtils.talk.themePlaceholderAvatar(holder.binding.avatarView, R.drawable
+                        .ic_avatar_team_small)
+                )
             }
 
             else -> {
diff --git a/app/src/main/res/drawable/ic_avatar_group_small.xml b/app/src/main/res/drawable/ic_avatar_group_small.xml
index 30055f042..319ecd253 100644
--- a/app/src/main/res/drawable/ic_avatar_group_small.xml
+++ b/app/src/main/res/drawable/ic_avatar_group_small.xml
@@ -1,7 +1,7 @@
 <!--
   ~ Nextcloud Talk - Android Client
   ~
-  ~ SPDX-FileCopyrightText: 2018-2024 Google LLC
+  ~ SPDX-FileCopyrightText: 2018-2025 Google LLC
   ~ SPDX-License-Identifier: Apache-2.0
 -->
 
diff --git a/app/src/main/res/drawable/ic_avatar_team_small.xml b/app/src/main/res/drawable/ic_avatar_team_small.xml
index 8c5269471..47fb7fdcd 100644
--- a/app/src/main/res/drawable/ic_avatar_team_small.xml
+++ b/app/src/main/res/drawable/ic_avatar_team_small.xml
@@ -16,7 +16,8 @@
         android:pivotY="12"
         android:scaleX="0.65"
         android:scaleY="0.65">
-      
-    <path android:fillColor="@android:color/white" android:pathData="M12,12.75c1.63,0 3.07,0.39 4.24,0.9c1.08,0.48 1.76,1.56 1.76,2.73L18,17c0,0.55 -0.45,1 -1,1H7c-0.55,0 -1,-0.45 -1,-1l0,-0.61c0,-1.18 0.68,-2.26 1.76,-2.73C8.93,13.14 10.37,12.75 12,12.75zM4,13c1.1,0 2,-0.9 2,-2c0,-1.1 -0.9,-2 -2,-2s-2,0.9 -2,2C2,12.1 2.9,13 4,13zM5.13,14.1C4.76,14.04 4.39,14 4,14c-0.99,0 -1.93,0.21 -2.78,0.58C0.48,14.9 0,15.62 0,16.43L0,17c0,0.55 0.45,1 1,1l3.5,0v-1.61C4.5,15.56 4.73,14.78 5.13,14.1zM20,13c1.1,0 2,-0.9 2,-2c0,-1.1 -0.9,-2 -2,-2s-2,0.9 -2,2C18,12.1 18.9,13 20,13zM24,16.43c0,-0.81 -0.48,-1.53 -1.22,-1.85C21.93,14.21 20.99,14 20,14c-0.39,0 -0.76,0.04 -1.13,0.1c0.4,0.68 0.63,1.46 0.63,2.29V18l3.5,0c0.55,0 1,-0.45 1,-1L24,16.43zM12,6c1.66,0 3,1.34 3,3c0,1.66 -1.34,3 -3,3s-3,-1.34 -3,-3C9,7.34 10.34,6 12,6z"/>
+
+        <path android:fillColor="@android:color/white"
+            android:pathData="M0,720L0,657Q0,614 44,587Q88,560 160,560Q173,560 185,560.5Q197,561 208,563Q194,584 187,607Q180,630 180,655L180,720L0,720ZM240,720L240,655Q240,623 257.5,596.5Q275,570 307,550Q339,530 383.5,520Q428,510 480,510Q533,510 577.5,520Q622,530 654,550Q686,570 703,596.5Q720,623 720,655L720,720L240,720ZM780,720L780,655Q780,629 773.5,606Q767,583 754,563Q765,561 776.5,560.5Q788,560 800,560Q872,560 916,586.5Q960,613 960,657L960,720L780,720ZM325,640L636,640L636,640Q626,620 580.5,605Q535,590 480,590Q425,590 379.5,605Q334,620 325,640ZM160,520Q127,520 103.5,496.5Q80,473 80,440Q80,406 103.5,383Q127,360 160,360Q194,360 217,383Q240,406 240,440Q240,473 217,496.5Q194,520 160,520ZM800,520Q767,520 743.5,496.5Q720,473 720,440Q720,406 743.5,383Q767,360 800,360Q834,360 857,383Q880,406 880,440Q880,473 857,496.5Q834,520 800,520ZM480,480Q430,480 395,445Q360,410 360,360Q360,309 395,274.5Q430,240 480,240Q531,240 565.5,274.5Q600,309 600,360Q600,410 565.5,445Q531,480 480,480ZM480,400Q497,400 508.5,388.5Q520,377 520,360Q520,343 508.5,331.5Q497,320 480,320Q463,320 451.5,331.5Q440,343 440,360Q440,377 451.5,388.5Q463,400 480,400ZM481,640L481,640Q481,640 481,640Q481,640 481,640Q481,640 481,640Q481,640 481,640L481,640ZM480,360Q480,360 480,360Q480,360 480,360Q480,360 480,360Q480,360 480,360Q480,360 480,360Q480,360 480,360Q480,360 480,360Q480,360 480,360Z"/>
     </group>
 </vector>