grouped the participants list

Reviewed-on: #87
Reviewed-by: Elias Müller <elias@elias-mueller.com>

lib/api/marianumcloud/autocomplete/autocompleteResponse.dart

@@ -18,7 +18,7 @@ class AutocompleteResponseObject {
   String label;
   String? icon;
   String? source;
-  List<String>? status;
+  String? status;
   String? subline;
   String? shareWithDisplayNameUniqe;
 

lib/api/marianumcloud/autocomplete/autocompleteResponse.g.dart

@@ -28,7 +28,7 @@ AutocompleteResponseObject _$AutocompleteResponseObjectFromJson(
       json['label'] as String,
       json['icon'] as String?,
       json['source'] as String?,
-      (json['status'] as List<dynamic>?)?.map((e) => e as String).toList(),
+      json['status'] as String?,
       json['subline'] as String?,
       json['shareWithDisplayNameUniqe'] as String?,
     );

lib/api/marianumcloud/talk/getParticipants/getParticipantsResponse.dart

@@ -55,12 +55,15 @@ class GetParticipantsResponseObject {
 }
 
 enum GetParticipantsResponseObjectParticipantType {
-  @JsonValue(1) owner,
-  @JsonValue(2) moderator,
-  @JsonValue(3) user,
-  @JsonValue(4) guest,
-  @JsonValue(5) userFollowingPublicLink,
-  @JsonValue(6) guestWithModeratorPermissions
+  @JsonValue(1) owner('Besitzer'),
+  @JsonValue(2) moderator('Moderator'),
+  @JsonValue(3) user('Benutzer'),
+  @JsonValue(4) guest('Gast'),
+  @JsonValue(5) userFollowingPublicLink('Link Nutzer'),
+  @JsonValue(6) guestWithModeratorPermissions('Gast Moderator');
+
+  const GetParticipantsResponseObjectParticipantType(this.prettyName);
+  final String prettyName;
 }
 
 enum GetParticipantsResponseObjectParticipantsInCallFlags {

lib/view/pages/talk/chatDetails/participants/participantsListView.dart

@@ -1,28 +1,52 @@
+import 'package:collection/collection.dart';
 import 'package:flutter/material.dart';
 
 import '../../../../../api/marianumcloud/talk/getParticipants/getParticipantsResponse.dart';
 import '../../../../../widget/userAvatar.dart';
 
-class ParticipantsListView extends StatefulWidget {
+class ParticipantsListView extends StatelessWidget {
   final GetParticipantsResponse participantsResponse;
   const ParticipantsListView(this.participantsResponse, {super.key});
 
   @override
-  State<ParticipantsListView> createState() => _ParticipantsListViewState();
-}
+  Widget build(BuildContext context) {
+    // final participants = participantsResponse.data.map((participant) => ListTile(
+    //   leading: UserAvatar(id: participant.actorId),
+    //   title: Text(participant.displayName),
+    //   subtitle: participant.statusMessage != null ? Text(participant.statusMessage!) : null,
+    // )).toList();
 
-class _ParticipantsListViewState extends State<ParticipantsListView> {
-  @override
-  Widget build(BuildContext context) => Scaffold(
+    lastname(participant) => participant.displayName.toString().split(' ').last;
+    
+    final participants = participantsResponse.data
+        .sorted((a, b) => lastname(a).compareTo(lastname(b)))
+        .sorted((a, b) => a.participantType.index.compareTo(b.participantType.index));
+    var groupedParticipants = participants.groupListsBy((participant) => participant.participantType);
+
+    // Map<GetParticipantsResponseObjectParticipantType, List<GetParticipantsResponseObject>>
+
+    return Scaffold(
       appBar: AppBar(
         title: const Text('Teilnehmende'),
       ),
       body: ListView(
-        children: widget.participantsResponse.data.map((participant) => ListTile(
-            leading: UserAvatar(id: participant.actorId),
-            title: Text(participant.displayName),
-            subtitle: participant.statusMessage != null ? Text(participant.statusMessage!) : null,
-          )).toList(),
-      ),
+        children: [
+          ...groupedParticipants.entries.map((entry) => Column(
+            children: [
+              ListTile(
+                title: Text(entry.key.prettyName),
+                titleTextStyle: TextStyle(fontWeight: FontWeight.bold),
+              ),
+              ...entry.value.map((participant) => ListTile(
+                leading: UserAvatar(id: participant.actorId),
+                title: Text(participant.displayName),
+                subtitle: participant.statusMessage != null ? Text(participant.statusMessage!) : null,
+              )),
+              Divider(),
+            ],
+          ))
+        ],
+      )
     );
+  }
 }

lib/view/pages/talk/components/chatBubble.dart

@@ -206,7 +206,7 @@ class _ChatBubbleState extends State<ChatBubble> with SingleTickerProviderStateM
             ),
           ),
           Visibility(
-            visible: widget.bubbleData.message != '{file}',
+            visible: !message.containsFile,
             child: ListTile(
               leading: const Icon(Icons.copy),
               title: const Text('Nachricht kopieren'),

lib/view/pages/talk/components/chatMessage.dart

@@ -21,53 +21,39 @@ class ChatMessage {
   ChatMessage({required this.originalMessage, this.originalData}) {
     if(originalData?.containsKey('file') ?? false) {
       file = originalData?['file'];
+      content = file?.name ?? 'Datei';
+    } else {
+      content = RichObjectStringProcessor.parseToString(originalMessage, originalData);
     }
-    content = RichObjectStringProcessor.parseToString(originalMessage, originalData);
   }
 
   Widget getWidget() {
 
-    var contentWidget = Linkify(
-      text: content,
-      onOpen: onOpen,
-    );
+    if(file == null) {
+      return Linkify(
+        text: content,
+        onOpen: onOpen,
+      );
+    }
 
-    if(file == null) return contentWidget;
-
-    return Padding(
-        padding: const EdgeInsets.only(top: 5),
-        child: Column(
-          crossAxisAlignment: CrossAxisAlignment.start,
+    return Padding(padding: const EdgeInsets.only(top: 5), child: CachedNetworkImage(
+      errorWidget: (context, url, error) => Row(
+          mainAxisSize: MainAxisSize.min,
+          crossAxisAlignment: CrossAxisAlignment.center,
           children: [
-            Row(
-              mainAxisSize: MainAxisSize.max,
-              mainAxisAlignment: MainAxisAlignment.center,
-              children: [
-                CachedNetworkImage(
-                  errorWidget: (context, url, error) => Row(
-                    mainAxisSize: MainAxisSize.min,
-                    crossAxisAlignment: CrossAxisAlignment.center,
-                    children: [
-                      const Icon(Icons.file_open_outlined, size: 35),
-                      const SizedBox(width: 10),
-                      Flexible(child: Text(file!.name, maxLines: 2, overflow: TextOverflow.ellipsis, style: const TextStyle(fontWeight: FontWeight.bold))),
-                      const SizedBox(width: 10),
-                    ],
-                  ),
-                  alignment: Alignment.center,
-                  placeholder: (context, url) => const Padding(padding: EdgeInsets.all(15), child: SizedBox(width: 50, child: LinearProgressIndicator())),
-                  fadeInDuration: Duration.zero,
-                  fadeOutDuration: Duration.zero,
-                  errorListener: (value) {},
-                  imageUrl: 'https://${AccountData().buildHttpAuthString()}@${EndpointData().nextcloud().full()}/index.php/core/preview?fileId=${file!.id}&x=100&y=-1&a=1',
-                )
-              ],
-            ),
-            SizedBox(height: 5),
-            contentWidget
+            const Icon(Icons.file_open_outlined, size: 35),
+            const SizedBox(width: 10),
+            Flexible(child: Text(file!.name, maxLines: 2, overflow: TextOverflow.ellipsis, style: const TextStyle(fontWeight: FontWeight.bold))),
+            const SizedBox(width: 10),
           ],
-        )
-    );
+        ),
+      alignment: Alignment.center,
+      placeholder: (context, url) => const Padding(padding: EdgeInsets.all(15), child: SizedBox(width: 50, child: LinearProgressIndicator())),
+      fadeInDuration: Duration.zero,
+      fadeOutDuration: Duration.zero,
+      errorListener: (value) {},
+      imageUrl: 'https://${AccountData().buildHttpAuthString()}@${EndpointData().nextcloud().full()}/index.php/core/preview?fileId=${file!.id}&x=100&y=-1&a=1',
+    ));
   }
 
   Future<void> onOpen(LinkableElement link) async {

pubspec.yaml

@@ -101,6 +101,7 @@ dependencies:
   time_range_picker: ^2.3.0
   url_launcher: ^6.3.1
   uuid: ^4.5.1
+  collection: ^1.19.0
 
 dev_dependencies:
   flutter_test: