@@ -884,27 +884,12 @@ class RecipientHeader extends StatelessWidget {
884
884
final Message message;
885
885
final Narrow narrow;
886
886
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
-
901
887
@override
902
888
Widget build (BuildContext context) {
903
889
final message = this .message;
904
890
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),
908
893
};
909
894
}
910
895
}
@@ -1018,11 +1003,25 @@ class StreamMessageRecipientHeader extends StatelessWidget {
1018
1003
const StreamMessageRecipientHeader ({
1019
1004
super .key,
1020
1005
required this .message,
1021
- required this .showStream ,
1006
+ required this .narrow ,
1022
1007
});
1023
1008
1024
1009
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
+ }
1026
1025
1027
1026
@override
1028
1027
Widget build (BuildContext context) {
@@ -1049,7 +1048,7 @@ class StreamMessageRecipientHeader extends StatelessWidget {
1049
1048
}
1050
1049
1051
1050
final Widget streamWidget;
1052
- if (! showStream ) {
1051
+ if (! _containsDifferentChannels (narrow) ) {
1053
1052
streamWidget = const SizedBox (width: 16 );
1054
1053
} else {
1055
1054
final stream = store.streams[message.streamId];
@@ -1130,9 +1129,14 @@ class StreamMessageRecipientHeader extends StatelessWidget {
1130
1129
}
1131
1130
1132
1131
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
+ });
1134
1137
1135
1138
final DmMessage message;
1139
+ final Narrow narrow;
1136
1140
1137
1141
@override
1138
1142
Widget build (BuildContext context) {
0 commit comments