ember/fluffychat
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #4769 from pangeachat/4768-roles-not-showing-user-avatars

Browse source 
fix: don't show shimmer until selectable
This commit is contained in:
ggurdin 2025-12-02 14:32:22 -05:00 • committed by GitHub
commit 09dfb0c708
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 34 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

74
lib/pangea/activity_sessions/activity_participant_indicator.dart
View file

@ -56,6 +56,33 @@ class ActivityParticipantIndicator extends StatelessWidget {
absorbing: !selectable,
child: HoverBuilder(
builder: (context, hovered) {
final avatar = userId != null
? user?.avatarUrl == null ||
user!.avatarUrl!.toString().startsWith("mxc")
? Avatar(
mxContent:
user?.avatarUrl != null ? user!.avatarUrl! : null,
name: userId!.localpart,
size: 60.0,
userId: userId,
)
: ClipRRect(
borderRadius: BorderRadius.circular(30),
child: CachedNetworkImage(
imageUrl: user!.avatarUrl!.toString(),
width: 60.0,
height: 60.0,
fit: BoxFit.cover,
),
)
: CircleAvatar(
radius: 30.0,
backgroundColor: theme.colorScheme.primaryContainer,
child: const Icon(
Icons.question_mark,
size: 30.0,
),
);
return Opacity(
opacity: opacity,
child: Container(
@ -74,46 +101,13 @@ class ActivityParticipantIndicator extends StatelessWidget {
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
Shimmer.fromColors(
enabled: shimmer && !selected,
baseColor: shimmer && !selected
? AppConfig.gold.withAlpha(20)
: Colors.transparent,
highlightColor: shimmer && !selected
? AppConfig.gold.withAlpha(50)
: Colors.transparent,
child: userId != null
? user?.avatarUrl == null ||
user!.avatarUrl!
.toString()
.startsWith("mxc")
? Avatar(
mxContent: user?.avatarUrl != null
? user!.avatarUrl!
: null,
name: userId!.localpart,
size: 60.0,
userId: userId,
)
: ClipRRect(
borderRadius: BorderRadius.circular(30),
child: CachedNetworkImage(
imageUrl: user!.avatarUrl!.toString(),
width: 60.0,
height: 60.0,
fit: BoxFit.cover,
),
)
: CircleAvatar(
radius: 30.0,
backgroundColor:
theme.colorScheme.primaryContainer,
child: const Icon(
Icons.question_mark,
size: 30.0,
),
),
),
shimmer && !selected
? Shimmer.fromColors(
baseColor: AppConfig.gold.withAlpha(20),
highlightColor: AppConfig.gold.withAlpha(50),
child: avatar,
)
: avatar,
Text(
name,
style: const TextStyle(