Merge pull request #863 from nextcloud/refactor/neon/conditional-stacks

refactor(neon): Use Stacks conditionally

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

@@ -21,17 +21,23 @@ class NeonAppImplementationIcon extends StatelessWidget {
   final double? size;
 
   @override
-  Widget build(final BuildContext context) => Stack(
+  Widget build(final BuildContext context) {
-        alignment: Alignment.bottomRight,
+    final icon = Container(
-        children: [
-          Container(
       margin: const EdgeInsets.all(5),
       child: appImplementation.buildIcon(
         size: size,
         color: color,
       ),
-          ),
+    );
-          if (unreadCount > 0) ...[
+
+    if (unreadCount == 0) {
+      return icon;
+    }
+
+    return Stack(
+      alignment: Alignment.bottomRight,
+      children: [
+        icon,
         Text(
           unreadCount.toString(),
           style: TextStyle(
@@ -40,6 +46,6 @@ class NeonAppImplementationIcon extends StatelessWidget {
           ),
         ),
       ],
-        ],
     );
   }
+}

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

@@ -56,10 +56,8 @@ class _UserAvatarState extends State<NeonUserAvatar> {
           final brightness = Theme.of(context).brightness;
           size = constraints.constrain(Size.square(widget.size ?? largeIconSize)).shortestSide;
           final pixelSize = (size * MediaQuery.of(context).devicePixelRatio).toInt();
-          return Stack(
+
-            alignment: Alignment.center,
+          final avatar = CircleAvatar(
-            children: [
-              CircleAvatar(
             radius: size / 2,
             backgroundColor: widget.backgroundColor,
             child: ClipOval(
@@ -82,14 +80,21 @@ class _UserAvatarState extends State<NeonUserAvatar> {
                 },
               ),
             ),
-              ),
+          );
-              if (widget.showStatus) ...[
+
+          if (!widget.showStatus) {
+            return avatar;
+          }
+
+          return Stack(
+            alignment: Alignment.center,
+            children: [
+              avatar,
               ResultBuilder<UserStatusPublicInterface?>(
                 stream: _userStatusBloc.statuses.mapNotNull((final statuses) => statuses[widget.username]),
                 builder: _userStatusIconBuilder,
               ),
             ],
-            ],
           );
         },
       );