subscription_list: Show muted streams below unmuted ones

Author: Khader-1

lib/widgets/subscription_list.dart

@@ -1,4 +1,3 @@
-import 'package:collection/collection.dart';
 import 'package:flutter/material.dart';
 
 import '../api/model/model.dart';
@@ -48,6 +47,15 @@ class _SubscriptionListPageState extends State<SubscriptionListPage> with PerAcc
     });
   }
 
+  void _sortSubs(List<Subscription> list) {
+    list.sort((a, b) {
+      if (a.isMuted && !b.isMuted) return 1;
+      if (!a.isMuted && b.isMuted) return -1;
+      // TODO(i18n): add locale-aware sorting
+      return a.name.toLowerCase().compareTo(b.name.toLowerCase());
+    });
+  }
+
   @override
   Widget build(BuildContext context) {
     // Design referenced from:
@@ -77,9 +85,8 @@ class _SubscriptionListPageState extends State<SubscriptionListPage> with PerAcc
         unpinned.add(subscription);
       }
     }
-    // TODO(i18n): add locale-aware sorting
-    pinned.sortBy((subscription) => subscription.name.toLowerCase());
-    unpinned.sortBy((subscription) => subscription.name.toLowerCase());
+    _sortSubs(pinned);
+    _sortSubs(unpinned);
 
     return Scaffold(
       appBar: AppBar(title: const Text("Channels")),

test/widgets/subscription_list_test.dart

@@ -132,6 +132,18 @@ void main() {
       ]);
       check(listedStreamIds(tester)).deepEquals([1, 2, 3, 4, 5, 6]);
     });
+
+    testWidgets('muted subscriptions come last among pinned streams and among unpinned streams', (tester) async {
+      await setupStreamListPage(tester, subscriptions: [
+        eg.subscription(eg.stream(streamId: 1, name: 'a'), isMuted: true, pinToTop: true),
+        eg.subscription(eg.stream(streamId: 2, name: 'b'), isMuted: false, pinToTop: true),
+        eg.subscription(eg.stream(streamId: 3, name: 'c'), isMuted: true, pinToTop: true),
+        eg.subscription(eg.stream(streamId: 4, name: 'd'), isMuted: false, pinToTop: false),
+        eg.subscription(eg.stream(streamId: 5, name: 'e'), isMuted: true, pinToTop: false),
+        eg.subscription(eg.stream(streamId: 6, name: 'f'), isMuted: false, pinToTop: false),
+      ]);
+      check(listedStreamIds(tester)).deepEquals([2, 1, 3, 4, 6, 5]);
+    });
   });
 
   testWidgets('unread badge shows with unreads', (tester) async {