inbox: Show at-mention marker on streams

The `hasMention` flag was added to the abstract `_HeaderItem` class so `_AllDmsHeaderItem` is affected by this change. It will be hard-coded as False for DMs for now.
sirpengi · Feb 9, 2024 · 28d93bd · 28d93bd
1 parent 2c182c9
commit 28d93bd
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/lib/widgets/inbox.dart b/lib/widgets/inbox.dart
@@ -134,10 +134,12 @@ class _InboxPageState extends State<InboxPage> with PerAccountStoreAwareStateMix
     for (final MapEntry(key: streamId, value: topics) in sortedUnreadStreams) {
       final topicItems = <(String, int, bool, int)>[];
       int countInStream = 0;
+      bool streamHasMention = false;
       for (final MapEntry(key: topic, value: messageIds) in topics.entries) {
         if (!store.isTopicVisible(streamId, topic)) continue;
         final countInTopic = messageIds.length;
         final hasMention = messageIds.any((messageId) => unreadsModel!.mentions.contains(messageId));
+        if (hasMention) streamHasMention = true;
         topicItems.add((topic, countInTopic, hasMention, messageIds.last));
         countInStream += countInTopic;
       }
@@ -149,7 +151,7 @@ class _InboxPageState extends State<InboxPage> with PerAccountStoreAwareStateMix
         final (_, _, _, bLastUnreadId) = b;
         return bLastUnreadId.compareTo(aLastUnreadId);
       });
-      sections.add(_StreamSectionData(streamId, countInStream, topicItems));
+      sections.add(_StreamSectionData(streamId, countInStream, streamHasMention, topicItems));
     }
 
     return Scaffold(
@@ -190,20 +192,23 @@ class _AllDmsSectionData extends _InboxSectionData {
 class _StreamSectionData extends _InboxSectionData {
   final int streamId;
   final int count;
+  final bool hasMention;
   final List<(String, int, bool, int)> items;
 
-  const _StreamSectionData(this.streamId, this.count, this.items);
+  const _StreamSectionData(this.streamId, this.count, this.hasMention, this.items);
 }
 
 abstract class _HeaderItem extends StatelessWidget {
   final bool collapsed;
   final _InboxPageState pageState;
   final int count;
+  final bool hasMention;
 
   const _HeaderItem({
     required this.collapsed,
     required this.pageState,
     required this.count,
+    required this.hasMention,
   });
 
   String get title;
@@ -247,7 +252,7 @@ abstract class _HeaderItem extends StatelessWidget {
               overflow: TextOverflow.ellipsis,
               title))),
           const SizedBox(width: 12),
-          // TODO(#384) for streams, show @-mention indicator when it applies
+          if (hasMention) const _AtMentionMarker(),
           Padding(padding: const EdgeInsetsDirectional.only(end: 16),
             child: UnreadCountBadge(backgroundColor: unreadCountBadgeBackgroundColor, bold: true,
               count: count)),
@@ -260,6 +265,7 @@ class _AllDmsHeaderItem extends _HeaderItem {
     required super.collapsed,
     required super.pageState,
     required super.count,
+    required super.hasMention,
   });
 
   @override get title => 'Direct messages'; // TODO(i18n)
@@ -290,6 +296,7 @@ class _AllDmsSection extends StatelessWidget {
   Widget build(BuildContext context) {
     final header = _AllDmsHeaderItem(
       count: data.count,
+      hasMention: false,
       collapsed: collapsed,
       pageState: pageState,
     );
@@ -369,6 +376,7 @@ class _StreamHeaderItem extends _HeaderItem {
     required super.collapsed,
     required super.pageState,
     required super.count,
+    required super.hasMention,
   });
 
   @override get title => subscription.name;
@@ -407,6 +415,7 @@ class _StreamSection extends StatelessWidget {
     final header = _StreamHeaderItem(
       subscription: subscription,
       count: data.count,
+      hasMention: data.hasMention,
       collapsed: collapsed,
       pageState: pageState,
     );

diff --git a/test/widgets/inbox_test.dart b/test/widgets/inbox_test.dart
@@ -203,6 +203,8 @@ void main() {
           unreadMessages: [eg.streamMessage(stream: stream, topic: topic,
             flags: [MessageFlag.mentioned])]);
 
+        check(hasAtSign(tester, findStreamHeaderRow(tester, stream.streamId)))
+          .isTrue();
         check(hasAtSign(tester, findRowByLabel(tester, topic))).isTrue();
       });
 
@@ -213,6 +215,8 @@ void main() {
           unreadMessages: [eg.streamMessage(stream: stream, topic: topic,
             flags: [])]);
 
+        check(hasAtSign(tester, findStreamHeaderRow(tester, stream.streamId)))
+          .isFalse();
         check(hasAtSign(tester, findRowByLabel(tester, topic))).isFalse();
       });
     });