From bfed3b4cd80f08a69af61e59d0eaa780980b9f39 Mon Sep 17 00:00:00 2001
From: tapframe <85391825+tapframe@users.noreply.github.com>
Date: Tue, 2 Jun 2026 20:23:42 +0530
Subject: [PATCH] Revert "Merge pull request #1180 from
 luqmanfadlli/fix-ios-animated-avatar"

This reverts commit 61ab0e7e3da720d08c5901e7207a97407cf07e1b, reversing
changes made to 9d1558ddb474d8d231745c71d6b1fcfefd957b63.
---
 .../app/features/profiles/ProfileEditScreen.kt   |  8 +++-----
 .../features/profiles/ProfileSelectionScreen.kt  |  8 +++-----
 .../app/features/profiles/ProfileSwitcherTab.kt  | 16 ++++++----------
 3 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/composeApp/src/commonMain/kotlin/com/nuvio/app/features/profiles/ProfileEditScreen.kt b/composeApp/src/commonMain/kotlin/com/nuvio/app/features/profiles/ProfileEditScreen.kt
index f8e0ca9b3..5f00697d7 100644
--- a/composeApp/src/commonMain/kotlin/com/nuvio/app/features/profiles/ProfileEditScreen.kt
+++ b/composeApp/src/commonMain/kotlin/com/nuvio/app/features/profiles/ProfileEditScreen.kt
@@ -54,7 +54,6 @@ import com.nuvio.app.core.ui.NuvioScreen
 import com.nuvio.app.core.ui.NuvioScreenHeader
 import com.nuvio.app.core.ui.NuvioStatusModal
 import com.nuvio.app.core.ui.NuvioSurfaceCard
-import com.nuvio.app.features.home.components.CollectionCardRemoteImage
 import kotlinx.coroutines.launch
 import nuvio.composeapp.generated.resources.*
 import org.jetbrains.compose.resources.stringResource
@@ -409,12 +408,11 @@ private fun ProfileIdentityCard(
                     contentAlignment = Alignment.Center,
                 ) {
                     if (customAvatarUrl != null) {
-                        CollectionCardRemoteImage(
-                            imageUrl = customAvatarUrl,
+                        AsyncImage(
+                            model = customAvatarUrl,
                             contentDescription = name,
-                            modifier = Modifier.fillMaxSize(),
+                            modifier = Modifier.size(88.dp).clip(CircleShape),
                             contentScale = ContentScale.Crop,
-                            animateIfPossible = true,
                         )
                     } else if (selectedAvatar != null) {
                         AsyncImage(
diff --git a/composeApp/src/commonMain/kotlin/com/nuvio/app/features/profiles/ProfileSelectionScreen.kt b/composeApp/src/commonMain/kotlin/com/nuvio/app/features/profiles/ProfileSelectionScreen.kt
index ec8a99a8a..195ba6748 100644
--- a/composeApp/src/commonMain/kotlin/com/nuvio/app/features/profiles/ProfileSelectionScreen.kt
+++ b/composeApp/src/commonMain/kotlin/com/nuvio/app/features/profiles/ProfileSelectionScreen.kt
@@ -59,7 +59,6 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import coil3.compose.AsyncImage
 import com.nuvio.app.core.auth.AuthRepository
 import com.nuvio.app.core.auth.AuthState
-import com.nuvio.app.features.home.components.CollectionCardRemoteImage
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import nuvio.composeapp.generated.resources.*
@@ -374,12 +373,11 @@ private fun ProfileAvatarCard(
                 contentAlignment = Alignment.Center,
             ) {
                 if (avatarImageUrl != null) {
-                    CollectionCardRemoteImage(
-                        imageUrl = avatarImageUrl,
+                    AsyncImage(
+                        model = avatarImageUrl,
                         contentDescription = avatarItem?.displayName ?: profile.name,
-                        modifier = Modifier.fillMaxSize(),
+                        modifier = Modifier.size(100.dp).clip(CircleShape),
                         contentScale = ContentScale.Crop,
-                        animateIfPossible = true,
                     )
                 } else if (profile.name.isNotBlank()) {
                     Text(
diff --git a/composeApp/src/commonMain/kotlin/com/nuvio/app/features/profiles/ProfileSwitcherTab.kt b/composeApp/src/commonMain/kotlin/com/nuvio/app/features/profiles/ProfileSwitcherTab.kt
index 46c38992f..a399c8220 100644
--- a/composeApp/src/commonMain/kotlin/com/nuvio/app/features/profiles/ProfileSwitcherTab.kt
+++ b/composeApp/src/commonMain/kotlin/com/nuvio/app/features/profiles/ProfileSwitcherTab.kt
@@ -21,7 +21,6 @@ import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.imePadding
@@ -70,7 +69,6 @@ import androidx.compose.ui.window.Popup
 import androidx.compose.ui.window.PopupProperties
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import coil3.compose.AsyncImage
-import com.nuvio.app.features.home.components.CollectionCardRemoteImage
 import com.nuvio.app.isIos
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
@@ -506,12 +504,11 @@ private fun PopupProfileBubble(
                 contentAlignment = Alignment.Center,
             ) {
                 if (avatarImageUrl != null) {
-                    CollectionCardRemoteImage(
-                        imageUrl = avatarImageUrl,
+                    AsyncImage(
+                        model = avatarImageUrl,
                         contentDescription = profile.name,
-                        modifier = Modifier.fillMaxSize(),
+                        modifier = Modifier.size(48.dp).clip(CircleShape),
                         contentScale = ContentScale.Crop,
-                        animateIfPossible = true,
                     )
                 } else if (profile.name.isNotBlank()) {
                     Text(
@@ -821,12 +818,11 @@ fun ActiveProfileMiniAvatar(
         contentAlignment = Alignment.Center,
     ) {
         if (avatarImageUrl != null) {
-            CollectionCardRemoteImage(
-                imageUrl = avatarImageUrl,
+            AsyncImage(
+                model = avatarImageUrl,
                 contentDescription = profile.name,
-                modifier = Modifier.fillMaxSize(),
+                modifier = Modifier.size(size.dp).clip(CircleShape),
                 contentScale = ContentScale.Crop,
-                animateIfPossible = true,
             )
         } else if (profile.name.isNotBlank()) {
             Text(