From 9e9cd2b66f8a0a7369281ecb0d77e4390cee2782 Mon Sep 17 00:00:00 2001 From: Deven Joshi Date: Tue, 18 May 2021 15:22:41 +0530 Subject: [PATCH] fix: attachment borders --- .../lib/src/message_actions_modal.dart | 2 +- .../lib/src/message_list_view.dart | 23 +++++++++++++------ .../lib/src/message_reactions_modal.dart | 2 +- .../lib/src/message_widget.dart | 10 -------- .../stream_chat_flutter/lib/src/utils.dart | 14 ++++------- 5 files changed, 23 insertions(+), 28 deletions(-) diff --git a/packages/stream_chat_flutter/lib/src/message_actions_modal.dart b/packages/stream_chat_flutter/lib/src/message_actions_modal.dart index c0a4acaf..5336ed48 100644 --- a/packages/stream_chat_flutter/lib/src/message_actions_modal.dart +++ b/packages/stream_chat_flutter/lib/src/message_actions_modal.dart @@ -192,7 +192,7 @@ class _MessageActionsModalState extends State { attachmentBorderRadiusGeometry: widget .attachmentBorderRadiusGeometry ?.mirrorBorderIfReversed( - reverse: widget.reverse), + reverse: !widget.reverse), message: widget.message.copyWith( text: widget.message.text!.length > 200 // ignore: lines_longer_than_80_chars diff --git a/packages/stream_chat_flutter/lib/src/message_list_view.dart b/packages/stream_chat_flutter/lib/src/message_list_view.dart index c0b8ac0d..c24ceb00 100644 --- a/packages/stream_chat_flutter/lib/src/message_list_view.dart +++ b/packages/stream_chat_flutter/lib/src/message_list_view.dart @@ -980,14 +980,23 @@ class _MessageListViewState extends State { onReplyTap: widget.onReplyTap, attachmentBorderRadiusGeometry: BorderRadius.only( topLeft: Radius.circular(attachmentBorderRadius), - bottomLeft: Radius.circular( - (timeDiff >= 1 || !isNextUserSame) && - !(hasReplies || isThreadMessage || hasFileAttachment) - ? 0 - : attachmentBorderRadius, - ), + bottomLeft: isMyMessage + ? Radius.circular(attachmentBorderRadius) + : Radius.circular( + (timeDiff >= 1 || !isNextUserSame) && + !(hasReplies || isThreadMessage || hasFileAttachment) + ? 0 + : attachmentBorderRadius, + ), topRight: Radius.circular(attachmentBorderRadius), - bottomRight: Radius.circular(attachmentBorderRadius), + bottomRight: isMyMessage + ? Radius.circular( + (timeDiff >= 1 || !isNextUserSame) && + !(hasReplies || isThreadMessage || hasFileAttachment) + ? 0 + : attachmentBorderRadius, + ) + : Radius.circular(attachmentBorderRadius), ), attachmentPadding: EdgeInsets.all(hasFileAttachment ? 4 : 2), borderRadiusGeometry: BorderRadius.only( diff --git a/packages/stream_chat_flutter/lib/src/message_reactions_modal.dart b/packages/stream_chat_flutter/lib/src/message_reactions_modal.dart index 35cd45e3..5f3bc5a4 100644 --- a/packages/stream_chat_flutter/lib/src/message_reactions_modal.dart +++ b/packages/stream_chat_flutter/lib/src/message_reactions_modal.dart @@ -146,7 +146,7 @@ class MessageReactionsModal extends StatelessWidget { attachmentBorderRadiusGeometry: attachmentBorderRadiusGeometry ?.mirrorBorderIfReversed( - reverse: reverse), + reverse: !reverse), attachmentPadding: EdgeInsets.all( hasFileAttachment ? 4 : 2, ), diff --git a/packages/stream_chat_flutter/lib/src/message_widget.dart b/packages/stream_chat_flutter/lib/src/message_widget.dart index dfacd111..a2d19c7e 100644 --- a/packages/stream_chat_flutter/lib/src/message_widget.dart +++ b/packages/stream_chat_flutter/lib/src/message_widget.dart @@ -131,8 +131,6 @@ class MessageWidget extends StatefulWidget { ), border, reverse, - attachmentBorderRadiusGeometry as BorderRadius? ?? - BorderRadius.zero, ), ); } @@ -157,8 +155,6 @@ class MessageWidget extends StatefulWidget { ), border, reverse, - attachmentBorderRadiusGeometry as BorderRadius? ?? - BorderRadius.zero, ); }, 'video': (context, message, attachments) { @@ -191,8 +187,6 @@ class MessageWidget extends StatefulWidget { ), border, reverse, - attachmentBorderRadiusGeometry as BorderRadius? ?? - BorderRadius.zero, ); }, 'giphy': (context, message, attachments) { @@ -219,8 +213,6 @@ class MessageWidget extends StatefulWidget { ), border, reverse, - attachmentBorderRadiusGeometry as BorderRadius? ?? - BorderRadius.zero, ); }, 'file': (context, message, attachments) { @@ -248,8 +240,6 @@ class MessageWidget extends StatefulWidget { ), border, reverse, - attachmentBorderRadiusGeometry as BorderRadius? ?? - BorderRadius.zero, ); }) .insertBetween(SizedBox( diff --git a/packages/stream_chat_flutter/lib/src/utils.dart b/packages/stream_chat_flutter/lib/src/utils.dart index d8bbcde6..159c02e0 100644 --- a/packages/stream_chat_flutter/lib/src/utils.dart +++ b/packages/stream_chat_flutter/lib/src/utils.dart @@ -331,14 +331,10 @@ Widget wrapAttachmentWidget( ShapeBorder attachmentShape, // ignore: avoid_positional_boolean_parameters bool reverse, - BorderRadius borderRadius, ) => - ClipRRect( - borderRadius: borderRadius.mirrorBorderIfReversed(reverse: reverse), - child: Material( - clipBehavior: Clip.antiAlias, - shape: attachmentShape, - type: MaterialType.transparency, - child: attachmentWidget, - ), + Material( + clipBehavior: Clip.antiAlias, + shape: attachmentShape, + type: MaterialType.transparency, + child: attachmentWidget, );