Fix rectangle avatars

lib/widgets/avatar.dart

@@ -59,8 +59,17 @@ class Avatar extends StatelessWidget {
               borderRadius: borderRadius,
               side: border ?? BorderSide.none,
             ),
-            clipBehavior: Clip.hardEdge,
+            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(
                       decoration: BoxDecoration(color: name?.lightColorAvatar),
                       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(
                         Icons.person_2,
                         color: theme.colorScheme.tertiary,

lib/widgets/mxc_image.dart

@@ -26,6 +26,7 @@ class MxcImage extends StatefulWidget {
   final Widget Function(BuildContext context)? placeholder;
   final String? cacheKey;
   final Client? client;
+  final BorderRadius borderRadius;
 
   const MxcImage({
     this.uri,
@@ -42,6 +43,7 @@ class MxcImage extends StatefulWidget {
     this.thumbnailMethod = ThumbnailMethod.scale,
     this.cacheKey,
     this.client,
+    this.borderRadius = BorderRadius.zero,
     super.key,
   });
 
@@ -140,9 +142,11 @@ class _MxcImageState extends State<MxcImage> {
     final hasData = data != null && data.isNotEmpty;
 
     return AnimatedSwitcher(
-        duration: const Duration(milliseconds: 128),
+        duration: FluffyThemes.animationDuration,
         child: hasData
-            ? Image.memory(
+            ? ClipRRect(
+              borderRadius: widget.borderRadius,
+              child: Image.memory(
                 data,
                 width: widget.width,
                 height: widget.height,
@@ -165,6 +169,7 @@ class _MxcImageState extends State<MxcImage> {
                     ),
                   );
                 },
+              ),
             )
             : placeholder(context));
   }