File tree Expand file tree Collapse file tree 2 files changed +14
-5
lines changed Expand file tree Collapse file tree 2 files changed +14
-5
lines changed Original file line number Diff line number Diff line change @@ -191,16 +191,19 @@ mixin _MessageSequence {
191
191
if (index == 0 || ! haveSameRecipient (messages[index - 1 ], message)) {
192
192
items.add (MessageListRecipientHeaderItem (message));
193
193
canShareSender = false ;
194
- } else if (! messagesSameDay (messages[index - 1 ], message)) {
195
- items.add (MessageListDateSeparatorItem (message));
196
- canShareSender = false ;
197
194
} else {
198
195
assert (items.last is MessageListMessageItem );
199
196
final prevMessageItem = items.last as MessageListMessageItem ;
200
197
assert (identical (prevMessageItem.message, messages[index - 1 ]));
201
198
assert (prevMessageItem.isLastInBlock);
202
199
prevMessageItem.isLastInBlock = false ;
203
- canShareSender = (prevMessageItem.message.senderId == message.senderId);
200
+
201
+ if (! messagesSameDay (prevMessageItem.message, message)) {
202
+ items.add (MessageListDateSeparatorItem (message));
203
+ canShareSender = false ;
204
+ } else {
205
+ canShareSender = (prevMessageItem.message.senderId == message.senderId);
206
+ }
204
207
}
205
208
items.add (MessageListMessageItem (message, content,
206
209
showSender: ! canShareSender, isLastInBlock: true ));
Original file line number Diff line number Diff line change @@ -967,7 +967,13 @@ void checkInvariants(MessageListView model) {
967
967
..showSender.equals (
968
968
forcedShowSender || model.messages[j].senderId != model.messages[j- 1 ].senderId)
969
969
..isLastInBlock.equals (
970
- i == model.items.length || model.items[i] is ! MessageListMessageItem );
970
+ i == model.items.length || switch (model.items[i]) {
971
+ MessageListMessageItem ()
972
+ || MessageListDateSeparatorItem () => false ,
973
+ MessageListRecipientHeaderItem ()
974
+ || MessageListHistoryStartItem ()
975
+ || MessageListLoadingItem () => true ,
976
+ });
971
977
}
972
978
check (model.items).length.equals (i);
973
979
}
You can’t perform that action at this time.
0 commit comments