fix: extract controller from seen by row

linagora · Sep 7, 2023 · 7aec13d · 7aec13d
1 parent 1cbf91f
commit 7aec13d
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 17 deletions.
diff --git a/lib/pages/chat/events/message_time.dart b/lib/pages/chat/events/message_time.dart
@@ -6,6 +6,7 @@ import 'package:intl/intl.dart';
 import 'package:linagora_design_flutter/colors/linagora_ref_colors.dart';
 import 'package:matrix/matrix.dart';
 import 'package:linagora_design_flutter/colors/linagora_state_layer.dart';
+import 'package:fluffychat/utils/room_status_extension.dart';
 
 class MessageTime extends StatelessWidget {
   const MessageTime({
@@ -57,9 +58,12 @@ class MessageTime extends StatelessWidget {
           if (ownMessage) ...[
             SizedBox(width: MessageTimeStyle.paddingTimeAndIcon),
             SeenByRow(
-              controller,
               timelineOverlayMessage: timelineOverlayMessage,
-              eventId: event.eventId,
+              participants: timeline.room.getParticipants(),
+              getSeenByUsers: controller.room!.getSeenByUsers(
+                controller.timeline!,
+                eventId: event.eventId,
+              ),
               eventStatus: event.status,
             ),
           ],

diff --git a/lib/pages/chat/seen_by_row.dart b/lib/pages/chat/seen_by_row.dart
@@ -1,8 +1,5 @@
 import 'package:fluffychat/pages/chat/events/message_time_style.dart';
 import 'package:flutter/material.dart';
-
-import 'package:fluffychat/pages/chat/chat.dart';
-import 'package:fluffychat/utils/room_status_extension.dart';
 import 'package:matrix/matrix.dart';
 
 enum MessageStatus {
@@ -13,27 +10,22 @@ enum MessageStatus {
 }
 
 class SeenByRow extends StatelessWidget {
-  final ChatController controller;
-  final String? eventId;
+  final List<User> getSeenByUsers;
+  final List<User> participants;
   final EventStatus? eventStatus;
   final bool timelineOverlayMessage;
 
-  const SeenByRow(
-    this.controller, {
-    this.eventId,
+  const SeenByRow({
     this.eventStatus,
     Key? key,
+    required this.getSeenByUsers,
+    required this.participants,
     required this.timelineOverlayMessage,
   }) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
-    final seenByUsers = controller.room!.getSeenByUsers(
-      controller.timeline!,
-      eventId: eventId,
-    );
-
-    return getEventIcon(context, eventStatus, seenByUsers);
+    return getEventIcon(context, eventStatus, getSeenByUsers);
   }
 
   MessageStatus getMessageStatus(
@@ -49,7 +41,7 @@ class SeenByRow extends StatelessWidget {
       return MessageStatus.sent;
     }
 
-    if (seenByUsers.length == controller.room!.getParticipants().length - 1) {
+    if (seenByUsers.length == participants.length - 1) {
       return MessageStatus.hasBeenSeenByAll;
     }