Revert "refactor: Performance boost for avatar widget"

This reverts commit 58577bb9e8.

lib/widgets/avatar.dart

@@ -19,7 +19,7 @@ class Avatar extends StatelessWidget {
   final IconData? icon;
   final BorderSide? border;
 
-  Avatar({
+  const Avatar({
     this.mxContent,
     this.name,
     this.size = defaultSize,
@@ -31,27 +31,40 @@ class Avatar extends StatelessWidget {
     this.border,
     this.icon,
     super.key,
-  })  : fallbackLetters = name?.firstTwoCharsOrFallback ?? '@',
+  });
-        textColor = name?.lightColorAvatar,
-        noPic = mxContent == null ||
-            mxContent.toString().isEmpty ||
-            mxContent.toString() == 'null';
-
-  final String fallbackLetters;
-  final Color? textColor;
-  final bool noPic;
 
   @override
   Widget build(BuildContext context) {
     final theme = Theme.of(context);
 
+    var fallbackLetters = '@';
+    final name = this.name;
+    if (name != null) {
+      if (name.runes.length >= 2) {
+        fallbackLetters = String.fromCharCodes(name.runes, 0, 2);
+      } else if (name.runes.length == 1) {
+        fallbackLetters = name;
+      }
+    }
+    final noPic = mxContent == null ||
+        mxContent.toString().isEmpty ||
+        mxContent.toString() == 'null';
+    final textColor = name?.lightColorAvatar;
+    final textWidget = Container(
+      color: textColor,
+      alignment: Alignment.center,
+      child: Text(
+        fallbackLetters,
+        style: TextStyle(
+          color: Colors.white,
+          fontWeight: FontWeight.bold,
+          fontSize: (size / 3).roundToDouble(),
+        ),
+      ),
+    );
     final borderRadius = this.borderRadius ?? BorderRadius.circular(size / 2);
     final presenceUserId = this.presenceUserId;
-
+    final container = Stack(
-    return InkWell(
-      onTap: onTap,
-      borderRadius: borderRadius,
-      child: Stack(
       children: [
         SizedBox(
           width: size,
@@ -66,18 +79,7 @@ class Avatar extends StatelessWidget {
             ),
             clipBehavior: Clip.hardEdge,
             child: noPic
-                  ? Container(
+                ? textWidget
-                      color: textColor,
-                      alignment: Alignment.center,
-                      child: Text(
-                        fallbackLetters,
-                        style: TextStyle(
-                          color: Colors.white,
-                          fontWeight: FontWeight.bold,
-                          fontSize: (size / 3).roundToDouble(),
-                        ),
-                      ),
-                    )
                 : MxcImage(
                     client: client,
                     key: ValueKey(mxContent.toString()),
@@ -118,8 +120,7 @@ class Avatar extends StatelessWidget {
                   width: 16,
                   height: 16,
                   decoration: BoxDecoration(
-                      color:
+                    color: presenceBackgroundColor ?? theme.colorScheme.surface,
-                          presenceBackgroundColor ?? theme.colorScheme.surface,
                     borderRadius: BorderRadius.circular(32),
                   ),
                   alignment: Alignment.center,
@@ -140,20 +141,12 @@ class Avatar extends StatelessWidget {
             },
           ),
       ],
-      ),
+    );
+    if (onTap == null) return container;
+    return InkWell(
+      onTap: onTap,
+      borderRadius: borderRadius,
+      child: container,
     );
   }
 }
-
-extension on String {
-  String get firstTwoCharsOrFallback {
-    var fallbackLetters = '@';
-    if (runes.length >= 2) {
-      fallbackLetters = String.fromCharCodes(runes, 0, 2);
-    } else if (runes.length == 1) {
-      fallbackLetters = this;
-    }
-
-    return fallbackLetters;
-  }
-}

lib/widgets/presence_builder.dart

@@ -1,12 +1,10 @@
-import 'dart:async';
-
 import 'package:flutter/material.dart';
 
 import 'package:matrix/matrix.dart';
 
 import 'package:fluffychat/widgets/matrix.dart';
 
-class PresenceBuilder extends StatefulWidget {
+class PresenceBuilder extends StatelessWidget {
   final Widget Function(BuildContext context, CachedPresence? presence) builder;
   final String? userId;
   final Client? client;
@@ -19,41 +17,21 @@ class PresenceBuilder extends StatefulWidget {
   });
 
   @override
-  State<PresenceBuilder> createState() => _PresenceBuilderState();
+  Widget build(BuildContext context) {
-}
+    final userId = this.userId;
+    if (userId == null) return builder(context, null);
 
-class _PresenceBuilderState extends State<PresenceBuilder> {
+    final client = this.client ?? Matrix.of(context).client;
-  CachedPresence? _presence;
+    return FutureBuilder<CachedPresence>(
-  StreamSubscription<CachedPresence>? _sub;
+      future: client.fetchCurrentPresence(userId),
-
+      builder: (context, cachedPresenceSnapshot) => StreamBuilder(
-  @override
+        stream: client.onPresenceChanged.stream
-  void initState() {
+            .where((cachedPresence) => cachedPresence.userid == userId),
-    final client = widget.client ?? Matrix.of(context).client;
+        builder: (context, snapshot) => builder(
-    final userId = widget.userId;
+          context,
-    if (userId != null) {
+          snapshot.data ?? cachedPresenceSnapshot.data,
-      WidgetsBinding.instance.addPostFrameCallback((_) async {
+        ),
-        final presence = await client.fetchCurrentPresence(userId);
+      ),
-        setState(() {
+    );
-          _presence = presence;
-          _sub = client.onPresenceChanged.stream.listen((presence) {
-            if (!mounted) return;
-            setState(() {
-              _presence = presence;
-            });
-          });
-        });
-      });
   }
-
-    super.initState();
-  }
-
-  @override
-  void dispose() {
-    _sub?.cancel();
-    super.dispose();
-  }
-
-  @override
-  Widget build(BuildContext context) => widget.builder(context, _presence);
 }