From ee69aacf3e72f1541afd5906c9d9e384218beaae Mon Sep 17 00:00:00 2001
From: Andy Scherzinger <info@andy-scherzinger.de>
Date: Thu, 1 Jan 2026 18:49:10 +0100
Subject: [PATCH] fix(avatar): Fix avatar sizing for non-user avatars

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
---
 .../main/java/com/owncloud/android/ui/AvatarGroupLayout.kt | 7 ++-----
 .../android/utils/theme/FilesSpecificViewThemeUtils.kt     | 5 +++--
 app/src/main/res/drawable/ic_talk.xml                      | 4 ++--
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/com/owncloud/android/ui/AvatarGroupLayout.kt b/app/src/main/java/com/owncloud/android/ui/AvatarGroupLayout.kt
index ab22b2c314fd..b57e29a083b6 100644
--- a/app/src/main/java/com/owncloud/android/ui/AvatarGroupLayout.kt
+++ b/app/src/main/java/com/owncloud/android/ui/AvatarGroupLayout.kt
@@ -1,11 +1,7 @@
 /*
  * Nextcloud Android client application
  *
- * @author Andy Scherzinger
- * @author Stefan Niedermann
- * Copyright (C) 2021 Andy Scherzinger
- * Copyright (C) 2021 Stefan Niedermann
- *
+ * SPDX-FileCopyrightText: 2021-2026 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
  */
 package com.owncloud.android.ui
@@ -76,6 +72,7 @@ class AvatarGroupLayout @JvmOverloads constructor(
             val avatar = ImageView(context).apply {
                 layoutParams = avatarLayoutParams
                 setPadding(avatarBorderSize, avatarBorderSize, avatarBorderSize, avatarBorderSize)
+                scaleType = ImageView.ScaleType.CENTER_INSIDE
                 background = borderDrawable
             }
 
diff --git a/app/src/main/java/com/owncloud/android/utils/theme/FilesSpecificViewThemeUtils.kt b/app/src/main/java/com/owncloud/android/utils/theme/FilesSpecificViewThemeUtils.kt
index 2ad091baa356..4fb2d277c0cd 100644
--- a/app/src/main/java/com/owncloud/android/utils/theme/FilesSpecificViewThemeUtils.kt
+++ b/app/src/main/java/com/owncloud/android/utils/theme/FilesSpecificViewThemeUtils.kt
@@ -1,8 +1,8 @@
 /*
  * Nextcloud - Android Client
  *
+ * SPDX-FileCopyrightText: 2022-2026 Nextcloud GmbH and Nextcloud contributors
  * SPDX-FileCopyrightText: 2022 Álvaro Brey <alvaro@alvarobrey.com>
- * SPDX-FileCopyrightText: 2022 Nextcloud GmbH
  * SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
  */
 package com.owncloud.android.utils.theme
@@ -70,6 +70,7 @@ class FilesSpecificViewThemeUtils @Inject constructor(
                 null
             )
             avatar.cropToPadding = true
+            avatar.scaleType = ImageView.ScaleType.CENTER_INSIDE
             avatar.setPadding(padding, padding, padding, padding)
         }
 
@@ -83,7 +84,7 @@ class FilesSpecificViewThemeUtils @Inject constructor(
                 androidViewThemeUtils.colorImageViewBackgroundAndIcon(avatar)
             }
             ShareType.ROOM -> {
-                createAvatarBase(R.drawable.first_run_talk, AvatarPadding.LARGE)
+                createAvatarBase(R.drawable.ic_talk, AvatarPadding.LARGE)
                 androidViewThemeUtils.colorImageViewBackgroundAndIcon(avatar)
             }
             ShareType.CIRCLE -> {
diff --git a/app/src/main/res/drawable/ic_talk.xml b/app/src/main/res/drawable/ic_talk.xml
index 8957c64bd25a..e55ac5d9a2ac 100644
--- a/app/src/main/res/drawable/ic_talk.xml
+++ b/app/src/main/res/drawable/ic_talk.xml
@@ -6,8 +6,8 @@
   ~ SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
 -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="16dp"
-    android:height="16dp"
+    android:width="24dp"
+    android:height="24dp"
     android:autoMirrored="true"
     android:viewportWidth="16"
     android:viewportHeight="16">