subscription_list: Show a dot for unreads if channel is muted

Fixes: #712

Author: Khader-1

lib/model/unreads.dart

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

lib/widgets/subscription_list.dart

@@ -180,8 +180,10 @@ class _SubscriptionList extends StatelessWidget {
       itemBuilder: (BuildContext context, int index) {
         final subscription = subscriptions[index];
         final unreadCount = unreadsModel!.countInStream(subscription.streamId);
-        // TODO(#346): if stream muted, show a dot for unreads
-        return SubscriptionItem(subscription: subscription, unreadCount: unreadCount);
+        final hasMutedUnreads = unreadCount == 0 && unreadsModel!.hasMutedInStream(subscription.streamId);
+        return SubscriptionItem(subscription: subscription,
+          unreadCount: unreadCount,
+          hasMutedUnreads: hasMutedUnreads);
     });
   }
 }
@@ -192,10 +194,12 @@ class SubscriptionItem extends StatelessWidget {
     super.key,
     required this.subscription,
     required this.unreadCount,
+    required this.hasMutedUnreads,
   });
 
   final Subscription subscription;
   final int unreadCount;
+  final bool hasMutedUnreads;
 
   @override
   Widget build(BuildContext context) {
@@ -239,6 +243,10 @@ class SubscriptionItem extends StatelessWidget {
             // TODO(#384) show @-mention indicator when it applies
             UnreadCountBadge(count: unreadCount, backgroundColor: swatch, bold: true),
           ],
+          if (hasMutedUnreads) ...[
+            const SizedBox(width: 12),
+            const MutedUnreadBadge(),
+          ],
           const SizedBox(width: 16),
         ])));
   }

lib/widgets/unread_count_badge.dart

@@ -1,5 +1,6 @@
 
 import 'package:flutter/material.dart';
+import 'package:flutter_color_models/flutter_color_models.dart';
 
 import '../api/model/model.dart';
 import 'text.dart';
@@ -65,3 +66,22 @@ class UnreadCountBadge extends StatelessWidget {
           count.toString())));
   }
 }
+
+class MutedUnreadBadge extends StatelessWidget {
+  const MutedUnreadBadge({
+    super.key,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return Opacity(
+      opacity: 0.5,
+      child: Container(
+        width: 8,
+        height: 8,
+        margin: const EdgeInsetsDirectional.only(end: 3),
+        decoration: const BoxDecoration(
+          color: HslColor(0, 0, 0.8),
+          shape: BoxShape.circle,),),);
+  }
+}

test/model/unreads_test.dart

@@ -216,6 +216,30 @@ void main() {
       check(model.countInDmNarrow(narrow)).equals(5);
     });
   });
+  group('muted helpers', () {
+    test('hasMutedInStream', () async {
+      final stream = eg.stream();
+      prepare();
+      await streamStore.addStream(stream);
+      await streamStore.addSubscription(eg.subscription(stream));
+      await streamStore.addUserTopic(stream, 'a', UserTopicVisibilityPolicy.unmuted);
+      await streamStore.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 streamStore.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 [

test/widgets/subscription_list_test.dart

@@ -174,6 +174,50 @@ 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: 'a', unreadMessageIds: [1, 2]),
+      UnreadStreamSnapshot(streamId: stream.streamId, topic: 'b', unreadMessageIds: [3]),
+    ]);
+    await setupStreamListPage(tester,
+      subscriptions: [eg.subscription(stream, isMuted: true)],
+        userTopics: [UserTopicItem(
+          streamId: stream.streamId,
+          topicName: 'b',
+          lastUpdated: 1234567890,
+          visibilityPolicy: 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 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: [UserTopicItem(
+          streamId: stream.streamId,
+          topicName: 'b',
+          lastUpdated: 1234567890,
+          visibilityPolicy: UserTopicVisibilityPolicy.muted,
+        ),
+        UserTopicItem(
+          streamId: stream.streamId,
+          topicName: 'a',
+          lastUpdated: 9876543210,
+          visibilityPolicy: 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: [