fix: Follow up fix rectangle avatars

pull/2139/head
Christian Kußowski 2 months ago
parent c7871b2421
commit 510f9ca9d0
No known key found for this signature in database
GPG Key ID: E067ECD60F1A0652

@ -60,7 +60,16 @@ class Avatar extends StatelessWidget {
side: border ?? BorderSide.none, side: border ?? BorderSide.none,
), ),
clipBehavior: Clip.antiAlias, clipBehavior: Clip.antiAlias,
child: noPic child: MxcImage(
client: client,
borderRadius: borderRadius,
key: ValueKey(mxContent.toString()),
cacheKey: '${mxContent}_$size',
uri: mxContent,
fit: BoxFit.cover,
width: size,
height: size,
placeholder: (_) => noPic
? Container( ? Container(
decoration: BoxDecoration(color: name?.lightColorAvatar), decoration: BoxDecoration(color: name?.lightColorAvatar),
alignment: Alignment.center, alignment: Alignment.center,
@ -75,15 +84,7 @@ class Avatar extends StatelessWidget {
), ),
), ),
) )
: MxcImage( : Center(
client: client,
key: ValueKey(mxContent.toString()),
cacheKey: '${mxContent}_$size',
uri: mxContent,
fit: BoxFit.cover,
width: size,
height: size,
placeholder: (_) => Center(
child: Icon( child: Icon(
Icons.person_2, Icons.person_2,
color: theme.colorScheme.tertiary, color: theme.colorScheme.tertiary,

@ -26,6 +26,7 @@ class MxcImage extends StatefulWidget {
final Widget Function(BuildContext context)? placeholder; final Widget Function(BuildContext context)? placeholder;
final String? cacheKey; final String? cacheKey;
final Client? client; final Client? client;
final BorderRadius borderRadius;
const MxcImage({ const MxcImage({
this.uri, this.uri,
@ -42,6 +43,7 @@ class MxcImage extends StatefulWidget {
this.thumbnailMethod = ThumbnailMethod.scale, this.thumbnailMethod = ThumbnailMethod.scale,
this.cacheKey, this.cacheKey,
this.client, this.client,
this.borderRadius = BorderRadius.zero,
super.key, super.key,
}); });
@ -141,15 +143,18 @@ class _MxcImageState extends State<MxcImage> {
final hasData = data != null && data.isNotEmpty; final hasData = data != null && data.isNotEmpty;
return AnimatedSwitcher( return AnimatedSwitcher(
duration: const Duration(milliseconds: 128), duration: FluffyThemes.animationDuration,
child: hasData child: hasData
? Image.memory( ? ClipRRect(
borderRadius: widget.borderRadius,
child: Image.memory(
data, data,
width: widget.width, width: widget.width,
height: widget.height, height: widget.height,
fit: widget.fit, fit: widget.fit,
filterQuality: filterQuality: widget.isThumbnail
widget.isThumbnail ? FilterQuality.low : FilterQuality.medium, ? FilterQuality.low
: FilterQuality.medium,
errorBuilder: (context, e, s) { errorBuilder: (context, e, s) {
Logs().d('Unable to render mxc image', e, s); Logs().d('Unable to render mxc image', e, s);
return SizedBox( return SizedBox(
@ -165,6 +170,7 @@ class _MxcImageState extends State<MxcImage> {
), ),
); );
}, },
),
) )
: placeholder(context), : placeholder(context),
); );

Loading…
Cancel
Save