From 6bd5094a7a1ded33afbcc521cbed18a99214f96b Mon Sep 17 00:00:00 2001 From: Infi Date: Sat, 21 Dec 2024 21:29:57 +0100 Subject: [PATCH] fix: do not animate server and channel icons Signed-off-by: Infi --- app/src/main/java/chat/revolt/activities/InviteActivity.kt | 1 + app/src/main/java/chat/revolt/components/emoji/EmojiPicker.kt | 1 + app/src/main/java/chat/revolt/components/generic/UserAvatar.kt | 1 + .../chat/revolt/components/screens/chat/ChannelSheetHeader.kt | 1 + .../revolt/components/screens/chat/drawer/ChannelSideDrawer.kt | 1 + .../chat/revolt/components/screens/settings/ServerOverview.kt | 1 + 6 files changed, 6 insertions(+) diff --git a/app/src/main/java/chat/revolt/activities/InviteActivity.kt b/app/src/main/java/chat/revolt/activities/InviteActivity.kt index c40a6f95..a336b90c 100644 --- a/app/src/main/java/chat/revolt/activities/InviteActivity.kt +++ b/app/src/main/java/chat/revolt/activities/InviteActivity.kt @@ -207,6 +207,7 @@ fun InviteScreen( if (invite?.serverIcon != null) { RemoteImage( url = "$REVOLT_FILES/icons/${invite.serverIcon.id}/${invite.serverIcon.filename}", + allowAnimation = false, description = viewModel.inviteResult?.value?.serverName ?: stringResource(id = R.string.unknown), modifier = Modifier diff --git a/app/src/main/java/chat/revolt/components/emoji/EmojiPicker.kt b/app/src/main/java/chat/revolt/components/emoji/EmojiPicker.kt index e6873efc..3f64a6d6 100644 --- a/app/src/main/java/chat/revolt/components/emoji/EmojiPicker.kt +++ b/app/src/main/java/chat/revolt/components/emoji/EmojiPicker.kt @@ -405,6 +405,7 @@ fun EmojiPicker( } else { RemoteImage( url = "$REVOLT_FILES/icons/${server.icon.id}", + allowAnimation = false, description = server.name, modifier = Modifier .clip(CircleShape) diff --git a/app/src/main/java/chat/revolt/components/generic/UserAvatar.kt b/app/src/main/java/chat/revolt/components/generic/UserAvatar.kt index c8b7e899..a76fe1a5 100644 --- a/app/src/main/java/chat/revolt/components/generic/UserAvatar.kt +++ b/app/src/main/java/chat/revolt/components/generic/UserAvatar.kt @@ -168,6 +168,7 @@ fun GroupIcon( if (icon?.id != null) { RemoteImage( url = rawUrl ?: "$REVOLT_FILES/icons/${icon.id}", + allowAnimation = false, contentScale = ContentScale.Crop, description = stringResource(id = R.string.avatar_alt, name), modifier = Modifier diff --git a/app/src/main/java/chat/revolt/components/screens/chat/ChannelSheetHeader.kt b/app/src/main/java/chat/revolt/components/screens/chat/ChannelSheetHeader.kt index f5e70c22..df8b49ca 100644 --- a/app/src/main/java/chat/revolt/components/screens/chat/ChannelSheetHeader.kt +++ b/app/src/main/java/chat/revolt/components/screens/chat/ChannelSheetHeader.kt @@ -71,6 +71,7 @@ fun ChannelSheetHeader( contentScale = ContentScale.Crop, height = 48, width = 48, + allowAnimation = false, modifier = Modifier .size(48.dp) ) diff --git a/app/src/main/java/chat/revolt/components/screens/chat/drawer/ChannelSideDrawer.kt b/app/src/main/java/chat/revolt/components/screens/chat/drawer/ChannelSideDrawer.kt index fbde101f..8560f814 100644 --- a/app/src/main/java/chat/revolt/components/screens/chat/drawer/ChannelSideDrawer.kt +++ b/app/src/main/java/chat/revolt/components/screens/chat/drawer/ChannelSideDrawer.kt @@ -343,6 +343,7 @@ fun ChannelSideDrawer( if (icon != null) { RemoteImage( url = icon, + allowAnimation = false, modifier = Modifier .size(48.dp) .clip(CircleShape), diff --git a/app/src/main/java/chat/revolt/components/screens/settings/ServerOverview.kt b/app/src/main/java/chat/revolt/components/screens/settings/ServerOverview.kt index d50d136a..9ec6fa59 100644 --- a/app/src/main/java/chat/revolt/components/screens/settings/ServerOverview.kt +++ b/app/src/main/java/chat/revolt/components/screens/settings/ServerOverview.kt @@ -82,6 +82,7 @@ fun ServerOverview(server: Server) { RemoteImage( url = "$REVOLT_FILES/icons/${it.id}", description = null, + allowAnimation = false, modifier = Modifier .clip(CircleShape) .height(48.dp)