Merge branch 'feature/new-ui' of https://github.com/GetStream/stream-chat-flutter into feature/flag

Conflicts: lib/src/message_actions_modal.dart lib/src/message_list_view.dart lib/src/message_widget.dart
2021-01-11 21:38:12 +05:30
parent 6274f1437e ff2653bea3
commit 0130eaa3f5
18 changed files with 458 additions and 320 deletions
@@ -187,7 +187,6 @@ class MessageListView extends StatefulWidget {

 class _MessageListViewState extends State<MessageListView> {
  ItemScrollController _scrollController;
-  bool _bottomWasVisible = false;
  Function _onThreadTap;
  bool _showScrollToBottom = false;
  ItemPositionsListener _itemPositionListener;
@@ -220,6 +219,8 @@ class _MessageListViewState extends State<MessageListView> {

  bool get _upToDate => streamChannel.channel.state.isUpToDate;

+  bool get _isThreadConversation => widget.parentMessage != null;
+
  bool _topPaginationActive = false;
  bool _bottomPaginationActive = false;

@@ -234,7 +235,7 @@ class _MessageListViewState extends State<MessageListView> {

  @override
  Widget build(BuildContext context) {
-    final messagesStream = widget.parentMessage != null
+    final messagesStream = _isThreadConversation
        ? streamChannel.channel.state.threadsStream
            .where((threads) => threads.containsKey(widget.parentMessage.id))
            .map((threads) => threads[widget.parentMessage.id])
@@ -333,9 +334,8 @@ class _MessageListViewState extends State<MessageListView> {
                  physics: widget.scrollPhysics,
                  itemScrollController: _scrollController,
                  reverse: true,
-                  itemCount: messages.length +
-                      2 +
-                      (widget.parentMessage != null ? 1 : 0),
+                  itemCount:
+                      messages.length + 2 + (_isThreadConversation ? 1 : 0),
                  separatorBuilder: (context, i) {
                    if (i == messages.length) return Offstage();
                    if (i == messages.length + 2) return Offstage();
@@ -368,7 +368,11 @@ class _MessageListViewState extends State<MessageListView> {
                    final isNextUserSame =
                        message.user.id == nextMessage.user?.id;
                    final isThread = message.replyCount > 0;
-                    if (timeDiff >= 1 || !isNextUserSame || isThread) {
+                    final isDeleted = message.isDeleted;
+                    if (timeDiff >= 1 ||
+                        !isNextUserSame ||
+                        isThread ||
+                        isDeleted) {
                      return SizedBox(height: 8);
                    }
                    return SizedBox(height: 2);
@@ -497,7 +501,7 @@ class _MessageListViewState extends State<MessageListView> {

  Future<void> _paginateData(
      StreamChannelState channel, QueryDirection direction) {
-    if (widget.parentMessage == null) {
+    if (!_isThreadConversation) {
      return channel.queryMessages(direction: direction);
    } else {
      return channel.getReplies(widget.parentMessage.id);
@@ -687,14 +691,13 @@ class _MessageListViewState extends State<MessageListView> {
      key: ValueKey<String>('BOTTOM-MESSAGE'),
      onVisibilityChanged: (visibility) {
        final isVisible = visibility.visibleBounds != Rect.zero;
-        if (isVisible && !_bottomWasVisible) {
+        if (isVisible) {
          final channel = streamChannel.channel;
          if (_upToDate &&
              channel.config?.readEvents == true &&
              channel.state.unreadCount > 0) {
            streamChannel.channel.markRead();
          }
-          _bottomWasVisible = !isVisible;
        }
        if (mounted) {
          setState(() => _showScrollToBottom = !isVisible);
@@ -712,7 +715,12 @@ class _MessageListViewState extends State<MessageListView> {
    return MessageWidget(
      showThreadReplyIndicator: false,
      showInChannelIndicator: false,
-      showReplyIndicator: false,
+      showReplyMessage: false,
+      showResendMessage: false,
+      showThreadReplyMessage: false,
+      showCopyMessage: false,
+      showDeleteMessage: false,
+      showEditMessage: false,
      message: message,
      reverse: isMyMessage,
      showUsername: !isMyMessage,
@@ -722,10 +730,8 @@ class _MessageListViewState extends State<MessageListView> {
        right: 8.0,
        bottom: 16.0,
      ),
-      showSendingIndicator: DisplayWidget.hide,
+      showSendingIndicator: false,
      onThreadTap: _onThreadTap,
-      showEditMessage: false,
-      showDeleteMessage: false,
      borderRadiusGeometry: BorderRadius.only(
        topLeft: Radius.circular(16),
        bottomLeft: Radius.circular(2),
@@ -768,32 +774,60 @@ class _MessageListViewState extends State<MessageListView> {
    }

    final channel = streamChannel.channel;
-    final readList = channel.state?.read
-            ?.where((element) => element.user.id != userId)
-            ?.where((read) =>
-                (read.lastRead.isAfter(message.createdAt) ||
-                    read.lastRead.isAtSameMomentAs(message.createdAt)) &&
-                (index == 0 ||
-                    read.lastRead.isBefore(messages[index - 1].createdAt)))
-            ?.toList() ??
+    final readList = channel.state?.read?.where((read) {
+          if (read.user.id == userId) return false;
+          return (read.lastRead.isAfter(message.createdAt) ||
+                  read.lastRead.isAtSameMomentAs(message.createdAt)) &&
+              (index == 0 ||
+                  read.lastRead.isBefore(messages[index - 1].createdAt));
+        })?.toList() ??
        [];

    final allRead = readList.length >= (channel.memberCount ?? 0) - 1;
-
-    final isThreadMessage =
-        widget.parentMessage != null || message?.showInChannel == true;
-
    final hasFileAttachment =
        message.attachments.any((it) => it.type == 'file');

+    final isThreadMessage =
+        message?.parentId != null && message?.showInChannel == true;
+
+    final hasReplies = message.replyCount > 0;
+
    final attachmentBorderRadius = hasFileAttachment ? 12.0 : 14.0;

+    final showTimeStamp = message.createdAt != null &&
+        (!isThreadMessage || _isThreadConversation) &&
+        !hasReplies &&
+        (timeDiff >= 1 || !isNextUserSame);
+
+    final showUsername = !isMyMessage &&
+        (!isThreadMessage || _isThreadConversation) &&
+        !hasReplies &&
+        (timeDiff >= 1 || !isNextUserSame);
+
+    final showUserAvatar = isMyMessage
+        ? DisplayWidget.gone
+        : (timeDiff >= 1 || !isNextUserSame)
+            ? DisplayWidget.show
+            : DisplayWidget.hide;
+
+    final showSendingIndicator =
+        isMyMessage && (index == 0 || timeDiff >= 1 || !isNextUserSame);
+
+    bool showInChannelIndicator = !_isThreadConversation && isThreadMessage;
+    bool showThreadReplyIndicator = !_isThreadConversation && hasReplies;
+
    Widget child = MessageWidget(
      key: ValueKey<String>('MESSAGE-${message.id}'),
      message: message,
      reverse: isMyMessage,
      showReactions: !message.isDeleted,
      padding: const EdgeInsets.symmetric(horizontal: 8.0),
+      showInChannelIndicator: showInChannelIndicator,
+      showThreadReplyIndicator: showThreadReplyIndicator,
+      showUsername: showUsername,
+      showTimestamp: showTimeStamp,
+      showSendingIndicator: showSendingIndicator,
+      showUserAvatar: showUserAvatar,
      onQuotedMessageTap: (quotedMessageId) async {
        final scrollToIndex = () {
          final index = messages.indexWhere((m) => m.id == quotedMessageId);
@@ -814,17 +848,9 @@ class _MessageListViewState extends State<MessageListView> {
          });
        }
      },
-      showInChannelIndicator: widget.parentMessage == null,
-      showThreadReplyIndicator: widget.parentMessage == null,
-      showUsername: !isMyMessage && (timeDiff >= 1 || !isNextUserSame),
-      showSendingIndicator:
-          isMyMessage && (index == 0 || timeDiff >= 1 || !isNextUserSame)
-              ? DisplayWidget.show
-              : DisplayWidget.hide,
-      showTimestamp:
-          !isNextUserSame || readList?.isNotEmpty == true || timeDiff >= 1,
      showEditMessage: isMyMessage,
      showDeleteMessage: isMyMessage,
+      showThreadReplyMessage: !isThreadMessage,
      showFlagButton: !isMyMessage,
      borderSide: isMyMessage ? BorderSide.none : null,
      onThreadTap: _onThreadTap,
@@ -843,11 +869,6 @@ class _MessageListViewState extends State<MessageListView> {
        topRight: Radius.circular(16),
        bottomRight: Radius.circular(16),
      ),
-      showUserAvatar: isMyMessage
-          ? DisplayWidget.gone
-          : (timeDiff >= 1 || !isNextUserSame
-              ? DisplayWidget.show
-              : DisplayWidget.hide),
      messageTheme: isMyMessage
          ? StreamChatTheme.of(context).ownMessageTheme
          : StreamChatTheme.of(context).otherMessageTheme,
@@ -856,7 +877,7 @@ class _MessageListViewState extends State<MessageListView> {
      onShowMessage: widget.onShowMessage,
    );

-    if (!isThreadMessage) {
+    if (!message.isDeleted && !message.isSystem && !message.isEphemeral) {
      child = Swipeable(
        onSwipeEnd: () => widget.onMessageSwiped(message),
        backgroundIcon: StreamSvgIcon.reply(
@@ -919,7 +940,7 @@ class _MessageListViewState extends State<MessageListView> {
      }
    });

-    if (widget.parentMessage != null) {
+    if (_isThreadConversation) {
      streamChannel.getReplies(widget.parentMessage.id);
    }