Merge pull request #360 from provokateurin/fix/account-selector-avatar

Fix account selector avatar

packages/neon/neon/lib/src/pages/home.dart

@@ -495,12 +495,10 @@ class _HomePageState extends State<HomePage> {
                             AccountSettingsRoute(accountid: account.id).go(context);
                           },
                           tooltip: AppLocalizations.of(context).settingsAccount,
-                          icon: IntrinsicWidth(
+                          icon: NeonUserAvatar(
-                            child: NeonUserAvatar(
                             account: account,
                           ),
                         ),
-                        ),
                       ],
                     );
 

packages/neon/neon/lib/src/widgets/account_tile.dart

@@ -33,11 +33,9 @@ class NeonAccountTile extends StatelessWidget {
               vertical: -4,
             )
           : null,
-      leading: IntrinsicWidth(
+      leading: NeonUserAvatar(
-        child: NeonUserAvatar(
         account: account,
       ),
-      ),
       title: ResultBuilder<NextcloudProvisioningApiUserDetails>(
         stream: userDetailsBloc.userDetails,
         builder: (final context, final userDetails) => Row(

packages/neon/neon/lib/src/widgets/user_avatar.dart

@@ -25,6 +25,7 @@ class NeonUserAvatar extends StatefulWidget {
 
 class _UserAvatarState extends State<NeonUserAvatar> {
   late final _userStatusBloc = Provider.of<AccountsBloc>(context, listen: false).getUserStatusesBloc(widget.account);
+  late double size;
 
   @override
   void initState() {
@@ -34,28 +35,30 @@ class _UserAvatarState extends State<NeonUserAvatar> {
   }
 
   @override
-  Widget build(final BuildContext context) {
+  Widget build(final BuildContext context) => LayoutBuilder(
+        builder: (final context, final constraints) {
           final isDark = Theme.of(context).brightness == Brightness.dark;
-    final size = (widget.size * MediaQuery.of(context).devicePixelRatio).toInt();
+          size = constraints.constrain(Size.square(widget.size)).shortestSide;
+          final pixelSize = (size * MediaQuery.of(context).devicePixelRatio).toInt();
           return Stack(
             alignment: Alignment.center,
             children: [
               CircleAvatar(
-          radius: widget.size / 2,
+                radius: size / 2,
                 child: ClipOval(
                   child: NeonCachedApiImage(
                     account: widget.account,
-              cacheKey: 'avatar-${widget.username}-${isDark ? 'dark' : 'light'}$size',
+                    cacheKey: 'avatar-${widget.username}-${isDark ? 'dark' : 'light'}$pixelSize',
                     download: () async {
                       if (isDark) {
                         return widget.account.client.core.getDarkAvatar(
                           userId: widget.username,
-                    size: size,
+                          size: pixelSize,
                         );
                       } else {
                         return widget.account.client.core.getAvatar(
                           userId: widget.username,
-                    size: size,
+                          size: pixelSize,
                         );
                       }
                     },
@@ -70,11 +73,12 @@ class _UserAvatarState extends State<NeonUserAvatar> {
               ],
             ],
           );
-  }
+        },
+      );
 
   Widget _userStatusIconBuilder(final BuildContext context, final Result<NextcloudUserStatusPublicStatus?> result) {
     final hasEmoji = result.data?.icon != null;
-    final scaledSize = widget.size / (hasEmoji ? 2 : 3);
+    final scaledSize = size / (hasEmoji ? 2 : 3);
 
     Widget? child;
     Decoration? decoration;
@@ -104,7 +108,7 @@ class _UserAvatarState extends State<NeonUserAvatar> {
     }
 
     return SizedBox.square(
-      dimension: widget.size,
+      dimension: size,
       child: Align(
         alignment: Alignment.bottomRight,
         child: Container(