Merge pull request #368 from provokateurin/fix/user-avatars

Cleanup user avatars
nextcloud · Jun 7, 2023 · 42b7f78 · 42b7f78
2 parents 7918047 + 342c9fe
commit 42b7f78
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/packages/neon/neon/lib/src/widgets/user_avatar.dart b/packages/neon/neon/lib/src/widgets/user_avatar.dart
@@ -11,13 +11,17 @@ class NeonUserAvatar extends StatefulWidget {
     final String? username,
     this.showStatus = true,
     this.size = kAvatarSize,
+    this.backgroundColor,
+    this.foregroundColor,
     super.key,
   }) : username = username ?? account.client.username!;
 
   final Account account;
   final String username;
   final bool showStatus;
   final double size;
+  final Color? backgroundColor;
+  final Color? foregroundColor;
 
   @override
   State<NeonUserAvatar> createState() => _UserAvatarState();
@@ -31,7 +35,9 @@ class _UserAvatarState extends State<NeonUserAvatar> {
   void initState() {
     super.initState();
 
-    unawaited(_userStatusBloc.load(widget.username));
+    if (widget.showStatus) {
+      unawaited(_userStatusBloc.load(widget.username));
+    }
   }
 
   @override
@@ -45,6 +51,7 @@ class _UserAvatarState extends State<NeonUserAvatar> {
             children: [
               CircleAvatar(
                 radius: size / 2,
+                backgroundColor: widget.backgroundColor,
                 child: ClipOval(
                   child: NeonCachedApiImage(
                     account: widget.account,
@@ -85,7 +92,7 @@ class _UserAvatarState extends State<NeonUserAvatar> {
     if (result.loading) {
       child = CircularProgressIndicator(
         strokeWidth: 1.5,
-        color: Theme.of(context).colorScheme.onPrimary,
+        color: widget.foregroundColor ?? Theme.of(context).colorScheme.onPrimary,
       );
     } else if (result.error != null) {
       child = Icon(