subscription_list: Show a dot for unreads if channel is muted

Fixes: zulip#712

Author: Khader-1

lib/model/unreads.dart

@@ -206,6 +206,15 @@ class Unreads extends ChangeNotifier {
     }
   }
 
+  /// Checks if stream contains strictly muted unreads,
+  /// using [ChannelStore.isTopicVisible].
+  bool hasMutedInStream(int streamId) {
+    final stream = streams[streamId];
+    if (stream == null) return false;
+    return stream.entries.any((entry) =>
+      !channelStore.isTopicVisible(streamId, entry.key) && entry.value.isNotEmpty);
+  }
+
   void handleMessageEvent(MessageEvent event) {
     final message = event.message;
     if (message.flags.contains(MessageFlag.read)) {

lib/widgets/subscription_list.dart

@@ -188,8 +188,12 @@ class _SubscriptionList extends StatelessWidget {
       itemBuilder: (BuildContext context, int index) {
         final subscription = subscriptions[index];
         final unreadCount = unreadsModel!.countInStream(subscription.streamId);
-        // TODO(#712): if stream muted, show a dot for unreads
-        return SubscriptionItem(subscription: subscription, unreadCount: unreadCount);
+        final hasUnmutedUnreads = unreadCount > 0;
+        final hasAllUnreadsMuted = !hasUnmutedUnreads && unreadsModel!.hasMutedInStream(subscription.streamId);
+        return SubscriptionItem(subscription: subscription,
+          unreadCount: unreadCount,
+          hasUnmutedUnreads: hasUnmutedUnreads,
+          hasAllUnreadsMuted: hasAllUnreadsMuted);
     });
   }
 }
@@ -200,15 +204,18 @@ class SubscriptionItem extends StatelessWidget {
     super.key,
     required this.subscription,
     required this.unreadCount,
+    required this.hasAllUnreadsMuted,
+    required this.hasUnmutedUnreads,
   });
 
   final Subscription subscription;
   final int unreadCount;
+  final bool hasAllUnreadsMuted;
+  final bool hasUnmutedUnreads;
 
   @override
   Widget build(BuildContext context) {
     final swatch = colorSwatchFor(context, subscription);
-    final hasUnreads = (unreadCount > 0);
     final opacity = subscription.isMuted ? 0.55 : 1.0;
     return Material(
       // TODO(#95) need dark-theme color
@@ -243,11 +250,11 @@ class SubscriptionItem extends StatelessWidget {
                     // TODO(#95) need dark-theme color
                     color: Color(0xFF262626),
                   ).merge(weightVariableTextStyle(context,
-                      wght: hasUnreads && !subscription.isMuted ? 600 : null)),
+                      wght: hasUnmutedUnreads && !subscription.isMuted ? 600 : null)),
                   maxLines: 1,
                   overflow: TextOverflow.ellipsis,
                   subscription.name)))),
-          if (unreadCount > 0) ...[
+          if (hasUnmutedUnreads) ...[
             const SizedBox(width: 12),
             // TODO(#747) show @-mention indicator when it applies
             Opacity(
@@ -256,6 +263,9 @@ class SubscriptionItem extends StatelessWidget {
                 count: unreadCount,
                 backgroundColor: swatch,
                 bold: true)),
+          ] else if (hasAllUnreadsMuted && subscription.isMuted) ...[
+            const SizedBox(width: 12),
+            const MutedUnreadBadge(),
           ],
           const SizedBox(width: 16),
         ])));

lib/widgets/unread_count_badge.dart

@@ -65,3 +65,20 @@ class UnreadCountBadge extends StatelessWidget {
           count.toString())));
   }
 }
+
+class MutedUnreadBadge extends StatelessWidget {
+  const MutedUnreadBadge({
+    super.key,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      width: 8,
+      height: 8,
+      margin: const EdgeInsetsDirectional.only(end: 3),
+      decoration: BoxDecoration(
+        color: const HSLColor.fromAHSL(0.5, 0, 0, 0.8).toColor(),
+        shape: BoxShape.circle));
+  }
+}

test/model/unreads_test.dart

@@ -217,6 +217,31 @@ void main() {
     });
   });
 
+  group('muted helpers', () {
+    test('hasMutedInStream', () async {
+      final stream = eg.stream();
+      prepare();
+      await channelStore.addStream(stream);
+      await channelStore.addSubscription(eg.subscription(stream));
+      await channelStore.addUserTopic(stream, 'a', UserTopicVisibilityPolicy.unmuted);
+      await channelStore.addUserTopic(stream, 'c', UserTopicVisibilityPolicy.unmuted);
+      fillWithMessages([
+        eg.streamMessage(stream: stream, topic: 'a', flags: []),
+        eg.streamMessage(stream: stream, topic: 'a', flags: []),
+        eg.streamMessage(stream: stream, topic: 'b', flags: []),
+        eg.streamMessage(stream: stream, topic: 'b', flags: []),
+        eg.streamMessage(stream: stream, topic: 'b', flags: []),
+        eg.streamMessage(stream: stream, topic: 'c', flags: []),
+      ]);
+      check(model.hasMutedInStream(stream.streamId)).equals(false);
+
+      await channelStore.handleEvent(SubscriptionUpdateEvent(id: 1,
+        streamId: stream.streamId,
+        property: SubscriptionProperty.isMuted, value: true));
+      check(model.hasMutedInStream(stream.streamId)).equals(true);
+    });
+  });
+
   group('handleMessageEvent', () {
     for (final (isUnread, isStream, isDirectMentioned, isWildcardMentioned) in [
       (true,  true,  true,  true ),

test/widgets/subscription_list_test.dart

@@ -187,6 +187,49 @@ void main() {
     check(find.byType(UnreadCountBadge).evaluate()).length.equals(0);
   });
 
+  testWidgets('muted unread badge shows with muted unreads', (tester) async {
+    final stream = eg.stream();
+    final unreadMsgs = eg.unreadMsgs(streams: [
+      UnreadStreamSnapshot(streamId: stream.streamId, topic: 'b', unreadMessageIds: [3]),
+    ]);
+    await setupStreamListPage(tester,
+      subscriptions: [eg.subscription(stream, isMuted: true)],
+      userTopics: [eg.userTopicItem(stream, 'b', UserTopicVisibilityPolicy.muted)],
+      unreadMsgs: unreadMsgs);
+    final finder = find.byWidgetPredicate((widget) => widget is MutedUnreadBadge);
+    check(finder.evaluate().length).equals(1);
+  });
+
+  testWidgets('muted unread badge does not show with any unmuted streams', (tester) async {
+    final stream = eg.stream();
+    final unreadMsgs = eg.unreadMsgs(streams: [
+      UnreadStreamSnapshot(streamId: stream.streamId, topic: 'b', unreadMessageIds: [3]),
+    ]);
+    await setupStreamListPage(tester,
+      subscriptions: [eg.subscription(stream, isMuted: false)],
+      userTopics: [eg.userTopicItem(stream, 'b', UserTopicVisibilityPolicy.muted)],
+      unreadMsgs: unreadMsgs);
+    final finder = find.byWidgetPredicate((widget) => widget is MutedUnreadBadge);
+    check(finder.evaluate().length).equals(0);
+  });
+
+  testWidgets('muted unread badge does not show with any unmuted unreads', (tester) async {
+    final stream = eg.stream();
+    final unreadMsgs = eg.unreadMsgs(streams: [
+      UnreadStreamSnapshot(streamId: stream.streamId, topic: 'a', unreadMessageIds: [1, 2]),
+      UnreadStreamSnapshot(streamId: stream.streamId, topic: 'b', unreadMessageIds: [3]),
+    ]);
+    await setupStreamListPage(tester,
+      subscriptions: [eg.subscription(stream, isMuted: true)],
+      userTopics: [
+        eg.userTopicItem(stream, 'b', UserTopicVisibilityPolicy.muted),
+        eg.userTopicItem(stream, 'a', UserTopicVisibilityPolicy.unmuted),
+      ],
+      unreadMsgs: unreadMsgs);
+    final finder = find.byWidgetPredicate((widget) => widget is MutedUnreadBadge);
+    check(finder.evaluate().length).equals(0);
+  });
+
   testWidgets('color propagates to icon and badge', (tester) async {
     final stream = eg.stream();
     final unreadMsgs = eg.unreadMsgs(streams: [