Merge pull request #1680 from nextcloud/fix/neon_framework/user-statu…

…s-icon

packages/neon/neon_dashboard/lib/src/pages/main.dart

@@ -153,8 +153,9 @@ class DashboardMainPage extends StatelessWidget {
 
               return _buildStatus(
                 context: context,
-                icon: NeonServerIcon(
-                  icon: 'user-status-$statusIcon',
+                icon: NeonUserStatusIcon(
+                  type: statusIcon,
+                  size: 20,
                 ),
                 label: Text(label.toString()),
                 onPressed: () async {

packages/neon_framework/lib/src/widgets/dialog.dart

@@ -12,7 +12,7 @@ import 'package:neon_framework/src/utils/user_status_clear_at.dart';
 import 'package:neon_framework/src/widgets/account_tile.dart';
 import 'package:neon_framework/src/widgets/error.dart';
 import 'package:neon_framework/src/widgets/linear_progress_indicator.dart';
-import 'package:neon_framework/src/widgets/server_icon.dart';
+import 'package:neon_framework/src/widgets/user_status_icon.dart';
 import 'package:neon_framework/theme.dart';
 import 'package:neon_framework/utils.dart';
 import 'package:nextcloud/user_status.dart' as user_status;
@@ -832,7 +832,10 @@ class _NeonUserStatusDialogState extends State<NeonUserStatusDialog> {
             return buildCard(
               selected: types.contains(status?.status),
               child: ListTile(
-                leading: NeonServerIcon(icon: 'user-status-${onlineStatus.key}'),
+                leading: NeonUserStatusIcon(
+                  type: onlineStatus.key,
+                  size: 24,
+                ),
                 title: Text(
                   title,
                   overflow: TextOverflow.ellipsis,

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

@@ -7,7 +7,7 @@ import 'package:neon_framework/src/theme/icons.dart';
 import 'package:neon_framework/src/theme/sizes.dart';
 import 'package:neon_framework/src/utils/provider.dart';
 import 'package:neon_framework/src/widgets/image.dart';
-import 'package:neon_framework/src/widgets/server_icon.dart';
+import 'package:neon_framework/src/widgets/user_status_icon.dart';
 import 'package:nextcloud/core.dart' as core;
 import 'package:nextcloud/user_status.dart' as user_status;
 
@@ -151,8 +151,11 @@ class NeonUserStatusIndicator extends StatelessWidget {
       );
     } else if (result.hasData) {
       final type = result.requireData.status;
-      if (type == user_status.$Type.dnd || (!hasEmoji && type != user_status.$Type.offline)) {
-        child = NeonServerIcon(icon: 'user-status-$type');
+      if (type == user_status.$Type.dnd || !hasEmoji) {
+        child = NeonUserStatusIcon(
+          type: type,
+          size: 16,
+        );
       } else if (hasEmoji) {
         child = Text(
           result.data!.icon!,

packages/neon_framework/lib/src/widgets/user_status_icon.dart

@@ -0,0 +1,53 @@
+import 'dart:math';
+
+import 'package:flutter/material.dart';
+import 'package:flutter_material_design_icons/flutter_material_design_icons.dart';
+import 'package:neon_framework/src/theme/colors.dart';
+import 'package:nextcloud/user_status.dart' as user_status;
+
+const _minus45Rad = -45 * pi / 180;
+
+/// Displays the current user status [type] as an icon.
+class NeonUserStatusIcon extends StatelessWidget {
+  /// Creates a new user status icon.
+  const NeonUserStatusIcon({
+    required this.type,
+    this.size,
+    super.key,
+  });
+
+  /// The type of the user status.
+  final user_status.$Type type;
+
+  /// The size of the icon.
+  final double? size;
+
+  @override
+  Widget build(BuildContext context) => switch (type) {
+        user_status.$Type.online => Icon(
+            size: size,
+            Icons.circle,
+            color: NcColors.success,
+          ),
+        user_status.$Type.dnd => Icon(
+            size: size,
+            MdiIcons.minusCircle,
+            color: NcColors.error,
+          ),
+        user_status.$Type.away => Transform.rotate(
+            angle: _minus45Rad,
+            child: Icon(
+              size: size,
+              MdiIcons.moonWaningCrescent,
+              color: NcColors.warning,
+            ),
+          ),
+        user_status.$Type.invisible => Icon(
+            size: size,
+            Icons.circle_outlined,
+            color: Theme.of(context).colorScheme.onBackground,
+          ),
+        user_status.$Type.offline || user_status.$Type.busy => const SizedBox.shrink(),
+        _ => throw UnimplementedError(type.value),
+      };
+}

packages/neon_framework/lib/widgets.dart

@@ -7,3 +7,4 @@ export 'package:neon_framework/src/widgets/list_view.dart';
 export 'package:neon_framework/src/widgets/relative_time.dart';
 export 'package:neon_framework/src/widgets/server_icon.dart';
 export 'package:neon_framework/src/widgets/user_avatar.dart' hide NeonUserStatusIndicator;
+export 'package:neon_framework/src/widgets/user_status_icon.dart';

packages/neon_framework/test/user_avatar_test.dart

@@ -67,7 +67,7 @@ void main() {
   group('Status indicator', () {
     for (final (status, icon, textMatcher, iconMatcher) in [
       (user_status.$Type.offline, '😀', findsOne, findsNothing),
-      (user_status.$Type.offline, null, findsNothing, findsNothing),
+      (user_status.$Type.offline, null, findsNothing, findsOne),
       (user_status.$Type.online, '😀', findsOne, findsNothing),
       (user_status.$Type.online, null, findsNothing, findsOne),
       (user_status.$Type.dnd, '😀', findsNothing, findsOne),
@@ -95,7 +95,7 @@ void main() {
         await tester.pumpAndSettle();
 
         expect(find.byType(Text), textMatcher);
-        expect(find.byType(NeonServerIcon), iconMatcher);
+        expect(find.byType(NeonUserStatusIcon), iconMatcher);
       });
     }
   });