[MessageWidget] Move messageBorderSide handling one level up

Signed-off-by: Sahil Kumar <[email protected]>
This commit is contained in:
Sahil Kumar
2021-01-12 18:03:24 +05:30
parent 47a3a94c93
commit c5f2458083
2 changed files with 11 additions and 6 deletions
+9 -1
View File
@@ -811,6 +811,14 @@ class _MessageListViewState extends State<MessageListView> {
final showThreadReplyIndicator = !_isThreadConversation && hasReplies; final showThreadReplyIndicator = !_isThreadConversation && hasReplies;
final isOnlyEmoji = message.text.isOnlyEmoji; final isOnlyEmoji = message.text.isOnlyEmoji;
final borderSide = isMyMessage
? !(showThreadReplyIndicator || showInChannelIndicator)
? BorderSide.none
: null
: isOnlyEmoji
? BorderSide.none
: null;
Widget child = MessageWidget( Widget child = MessageWidget(
key: ValueKey<String>('MESSAGE-${message.id}'), key: ValueKey<String>('MESSAGE-${message.id}'),
message: message, message: message,
@@ -846,7 +854,7 @@ class _MessageListViewState extends State<MessageListView> {
showEditMessage: isMyMessage, showEditMessage: isMyMessage,
showDeleteMessage: isMyMessage, showDeleteMessage: isMyMessage,
showThreadReplyMessage: !isThreadMessage, showThreadReplyMessage: !isThreadMessage,
borderSide: isMyMessage && !isOnlyEmoji ? BorderSide.none : null, borderSide: borderSide,
onThreadTap: _onThreadTap, onThreadTap: _onThreadTap,
onReplyTap: widget.onReplyTap, onReplyTap: widget.onReplyTap,
attachmentBorderRadiusGeometry: BorderRadius.only( attachmentBorderRadiusGeometry: BorderRadius.only(
+2 -5
View File
@@ -383,11 +383,8 @@ class _MessageWidgetState extends State<MessageWidget> {
), ),
shape: widget.shape ?? shape: widget.shape ??
RoundedRectangleBorder( RoundedRectangleBorder(
side: isOnlyEmoji && side:
!(showThreadReplyIndicator || widget.borderSide ??
showInChannel)
? BorderSide.none
: widget.borderSide ??
BorderSide( BorderSide(
color: widget color: widget
.messageTheme .messageTheme