Skip to content

Commit 88fba83

Browse files
PIG208gnprice
authored andcommitted
msglist [nfc]: Let MessageItem take a MessageListMessageBaseItem
This will make MessageItem compatible with other future subclasses of MessageListMessageBaseItem, in particular MessageListOutboxMessageItem, which do not need unread markers.
1 parent 7a47731 commit 88fba83

File tree

1 file changed

+17
-10
lines changed

1 file changed

+17
-10
lines changed

lib/widgets/message_list.dart

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -992,25 +992,32 @@ class MessageItem extends StatelessWidget {
992992
this.trailingWhitespace,
993993
});
994994

995-
final MessageListMessageItem item;
995+
final MessageListMessageBaseItem item;
996996
final Widget header;
997997
final double? trailingWhitespace;
998998

999999
@override
10001000
Widget build(BuildContext context) {
1001-
final message = item.message;
10021001
final messageListTheme = MessageListTheme.of(context);
1002+
1003+
final item = this.item;
1004+
Widget child = ColoredBox(
1005+
color: messageListTheme.bgMessageRegular,
1006+
child: Column(children: [
1007+
switch (item) {
1008+
MessageListMessageItem() => MessageWithPossibleSender(item: item),
1009+
},
1010+
if (trailingWhitespace != null && item.isLastInBlock) SizedBox(height: trailingWhitespace!),
1011+
]));
1012+
if (item case MessageListMessageItem(:final message)) {
1013+
child = _UnreadMarker(
1014+
isRead: message.flags.contains(MessageFlag.read),
1015+
child: child);
1016+
}
10031017
return StickyHeaderItem(
10041018
allowOverflow: !item.isLastInBlock,
10051019
header: header,
1006-
child: _UnreadMarker(
1007-
isRead: message.flags.contains(MessageFlag.read),
1008-
child: ColoredBox(
1009-
color: messageListTheme.bgMessageRegular,
1010-
child: Column(children: [
1011-
MessageWithPossibleSender(item: item),
1012-
if (trailingWhitespace != null && item.isLastInBlock) SizedBox(height: trailingWhitespace!),
1013-
]))));
1020+
child: child);
10141021
}
10151022
}
10161023

0 commit comments

Comments
 (0)