Merge branch 'develop' of https://github.com/GetStream/stream-chat-flutter into hotfix/event

2021-11-26 17:27:58 +05:30
parent f951be82f7 16e7494bdb
commit 60bbd60d93
10 changed files with 74 additions and 38 deletions
@@ -10,7 +10,7 @@ Customizing Message Actions

 Message actions pop up in message overlay, when you long-press a message.

-![](../assets/message_actions.png)
+![](../assets/message_actions.jpg)

 We have provided granular control over these actions.

@@ -1,3 +1,4 @@
+import 'package:equatable/equatable.dart';
 import 'package:json_annotation/json_annotation.dart';
 import 'package:stream_chat/src/core/models/user.dart';

@@ -5,7 +6,7 @@ part 'read.g.dart';

 /// The class that defines a read event
@JsonSerializable()
-class Read {
+class Read extends Equatable {
  /// Constructor used for json serialization
  Read({
    required this.lastRead,
@@ -39,4 +40,11 @@ class Read {
        user: user ?? this.user,
        unreadMessages: unreadMessages ?? this.unreadMessages,
      );
+
+  @override
+  List<Object?> get props => [
+        lastRead,
+        user,
+        unreadMessages,
+      ];
 }
@@ -12,7 +12,9 @@
 - Fixed `MessageWidget` null errors associated with `channel.memberCount`.
 - Fixed adding attachments on web.
 - [[#767]](https://github.com/GetStream/stream-chat-flutter/issues/767): Fix `MessageInput` focus behaviour when sending messages.
- Fixed user presence indicator not updating correctly
+- Fixed user presence indicator not updating correctly.
+- Do not use `withData: true` in `FilePicker` calls.
+- Fixed read indicator not updating correctly in specific situations.

 ## 3.2.0

@@ -126,16 +126,26 @@ class ChannelPreview extends StatelessWidget {
                          streamChatState.currentUser?.id) {
                        return Padding(
                          padding: const EdgeInsets.only(right: 4),
-                          child: SendingIndicator(
-                            message: lastMessage!,
-                            size: channelPreviewTheme.indicatorIconSize,
-                            isMessageRead: channel.state!.read
-                                .where((element) =>
-                                    element.user.id !=
-                                    channel.client.state.currentUser!.id)
-                                .where((element) => element.lastRead
-                                    .isAfter(lastMessage.createdAt))
-                                .isNotEmpty,
+                          child: BetterStreamBuilder<List<Read>>(
+                            stream: channel.state?.readStream,
+                            initialData: channel.state?.read,
+                            builder: (context, data) {
+                              final readList = data.where((it) =>
+                                  it.user.id !=
+                                      channel.client.state.currentUser?.id &&
+                                  (it.lastRead
+                                          .isAfter(lastMessage!.createdAt) ||
+                                      it.lastRead.isAtSameMomentAs(
+                                        lastMessage.createdAt,
+                                      )));
+                              final isMessageRead = readList.length >=
+                                  (channel.memberCount ?? 0) - 1;
+                              return SendingIndicator(
+                                message: lastMessage!,
+                                size: channelPreviewTheme.indicatorIconSize,
+                                isMessageRead: isMessageRead,
+                              );
+                            },
                          ),
                        );
                      }
@@ -1645,7 +1645,6 @@ class MessageInputState extends State<MessageInput> {
      }
      final res = await FilePicker.platform.pickFiles(
        type: type,
-        withData: true,
      );
      if (res?.files.isNotEmpty == true) {
        file = res!.files.single.toAttachmentFile;
@@ -97,14 +97,20 @@ class MessageWidget extends StatefulWidget {
    this.deletedBottomRowBuilder,
    this.onReturnAction,
    this.customAttachmentBuilders,
-    this.readList,
    this.padding,
    this.textPadding = const EdgeInsets.symmetric(
      horizontal: 16,
      vertical: 8,
    ),
    this.attachmentPadding = EdgeInsets.zero,
-    this.allRead = false,
+    @Deprecated('''
+    allRead is now deprecated and it will be removed in future releases. 
+    The MessageWidget now listens for read events on its own.
+    ''') this.allRead = false,
+    @Deprecated('''
+    readList is now deprecated and it will be removed in future releases. 
+    The MessageWidget now listens for read events on its own.
+    ''') this.readList,
    this.onQuotedMessageTap,
    this.customActions = const [],
    this.onAttachmentTap,
@@ -558,8 +564,6 @@ class _MessageWidgetState extends State<MessageWidget>

  bool get showTimeStamp => widget.showTimestamp;

-  bool get isMessageRead => widget.readList?.isNotEmpty == true;
-
  bool get showInChannel => widget.showInChannelIndicator;

  bool get hasQuotedMessage => widget.message.quotedMessage != null;
@@ -1253,27 +1257,40 @@ class _MessageWidgetState extends State<MessageWidget>
      );
    }

-    Widget child = SendingIndicator(
-      message: message,
-      isMessageRead: isMessageRead,
-      size: style!.fontSize,
+    final channel = StreamChannel.of(context).channel;
+
+    return BetterStreamBuilder<List<Read>>(
+      stream: channel.state?.readStream,
+      initialData: channel.state?.read,
+      builder: (context, data) {
+        final readList = data.where((it) =>
+            it.user.id != _streamChat.currentUser?.id &&
+            (it.lastRead.isAfter(message.createdAt) ||
+                it.lastRead.isAtSameMomentAs(message.createdAt)));
+        final isMessageRead = readList.length >= (channel.memberCount ?? 0) - 1;
+        Widget child = SendingIndicator(
+          message: message,
+          isMessageRead: isMessageRead,
+          size: style!.fontSize,
+        );
+        if (isMessageRead) {
+          child = Row(
+            children: [
+              if (memberCount > 2)
+                Text(
+                  readList.length.toString(),
+                  style: style.copyWith(
+                    color: _streamChatTheme.colorTheme.accentPrimary,
+                  ),
+                ),
+              const SizedBox(width: 2),
+              child,
+            ],
+          );
+        }
+        return child;
+      },
    );
-    if (isMessageRead) {
-      child = Row(
-        children: [
-          if (memberCount > 2)
-            Text(
-              widget.readList!.length.toString(),
-              style: style.copyWith(
-                color: _streamChatTheme.colorTheme.accentPrimary,
-              ),
-            ),
-          const SizedBox(width: 2),
-          child,
-        ],
-      );
-    }
-    return child;
  }

  Widget _buildUserAvatar() => Transform.translate(