Skip to content

Commit f4b0b80

Browse files
lakshya1goelgnprice
authored andcommitted
msglist [nfc]: Move _containsDifferentChannels to StreamMessageRecipientHeader
Move _containsDifferentChannels method to StreamMessageRecipientHeader where it's used, and pass narrow directly instead of a pre-computed showStream boolean.
1 parent 55fdfd3 commit f4b0b80

File tree

1 file changed

+25
-21
lines changed

1 file changed

+25
-21
lines changed

lib/widgets/message_list.dart

Lines changed: 25 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -884,27 +884,12 @@ class RecipientHeader extends StatelessWidget {
884884
final Message message;
885885
final Narrow narrow;
886886

887-
static bool _containsDifferentChannels(Narrow narrow) {
888-
switch (narrow) {
889-
case CombinedFeedNarrow():
890-
case MentionsNarrow():
891-
case StarredMessagesNarrow():
892-
return true;
893-
894-
case ChannelNarrow():
895-
case TopicNarrow():
896-
case DmNarrow():
897-
return false;
898-
}
899-
}
900-
901887
@override
902888
Widget build(BuildContext context) {
903889
final message = this.message;
904890
return switch (message) {
905-
StreamMessage() => StreamMessageRecipientHeader(message: message,
906-
showStream: _containsDifferentChannels(narrow)),
907-
DmMessage() => DmRecipientHeader(message: message),
891+
StreamMessage() => StreamMessageRecipientHeader(message: message, narrow: narrow),
892+
DmMessage() => DmRecipientHeader(message: message, narrow: narrow),
908893
};
909894
}
910895
}
@@ -1018,11 +1003,25 @@ class StreamMessageRecipientHeader extends StatelessWidget {
10181003
const StreamMessageRecipientHeader({
10191004
super.key,
10201005
required this.message,
1021-
required this.showStream,
1006+
required this.narrow,
10221007
});
10231008

10241009
final StreamMessage message;
1025-
final bool showStream;
1010+
final Narrow narrow;
1011+
1012+
static bool _containsDifferentChannels(Narrow narrow) {
1013+
switch (narrow) {
1014+
case CombinedFeedNarrow():
1015+
case MentionsNarrow():
1016+
case StarredMessagesNarrow():
1017+
return true;
1018+
1019+
case ChannelNarrow():
1020+
case TopicNarrow():
1021+
case DmNarrow():
1022+
return false;
1023+
}
1024+
}
10261025

10271026
@override
10281027
Widget build(BuildContext context) {
@@ -1049,7 +1048,7 @@ class StreamMessageRecipientHeader extends StatelessWidget {
10491048
}
10501049

10511050
final Widget streamWidget;
1052-
if (!showStream) {
1051+
if (!_containsDifferentChannels(narrow)) {
10531052
streamWidget = const SizedBox(width: 16);
10541053
} else {
10551054
final stream = store.streams[message.streamId];
@@ -1130,9 +1129,14 @@ class StreamMessageRecipientHeader extends StatelessWidget {
11301129
}
11311130

11321131
class DmRecipientHeader extends StatelessWidget {
1133-
const DmRecipientHeader({super.key, required this.message});
1132+
const DmRecipientHeader({
1133+
super.key,
1134+
required this.message,
1135+
required this.narrow,
1136+
});
11341137

11351138
final DmMessage message;
1139+
final Narrow narrow;
11361140

11371141
@override
11381142
Widget build(BuildContext context) {

0 commit comments

Comments
 (0)