mirror of
https://github.com/tapframe/NuvioStreaming.git
synced 2026-08-09 00:17:59 +00:00
Revert "Merge pull request #1180 from luqmanfadlli/fix-ios-animated-avatar"
This reverts commit61ab0e7e3d, reversing changes made to9d1558ddb4.
This commit is contained in:
parent
02fd82c753
commit
bfed3b4cd8
3 changed files with 12 additions and 20 deletions
|
|
@ -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(
|
||||
|
|
|
|||
|
|
@ -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(
|
||||
|
|
|
|||
|
|
@ -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(
|
||||
|
|
|
|||
Loading…
Reference in a new issue