home: Show unread counts in main menu

Fixes-partly: #1088

Author: chrisbobbe

lib/widgets/home.dart

@@ -23,6 +23,7 @@ import 'store.dart';
 import 'subscription_list.dart';
 import 'text.dart';
 import 'theme.dart';
+import 'unread_count_badge.dart';
 import 'user.dart';
 
 enum _HomePageTab {
@@ -419,6 +420,8 @@ abstract class _MenuButton extends StatelessWidget {
       color: selected ? designVariables.iconSelected : designVariables.icon);
   }
 
+  Widget? buildTrailing(BuildContext context) => null;
+
   void onPressed(BuildContext context);
 
   void _handlePress(BuildContext context) {
@@ -459,6 +462,8 @@ abstract class _MenuButton extends StatelessWidget {
         ~WidgetState.pressed: selected ? borderSideSelected : null,
       }));
 
+    final trailing = buildTrailing(context);
+
     return AnimatedScaleOnTap(
       duration: const Duration(milliseconds: 100),
       scaleEnd: 0.95,
@@ -475,6 +480,7 @@ abstract class _MenuButton extends StatelessWidget {
               overflow: TextOverflow.ellipsis,
               style: const TextStyle(fontSize: 19, height: 26 / 19)
                 .merge(weightVariableTextStyle(context, wght: selected ? 600 : 400)))),
+            ?trailing,
           ]))));
   }
 }
@@ -525,6 +531,18 @@ class _InboxButton extends _NavigationBarMenuButton {
     return zulipLocalizations.inboxPageTitle;
   }
 
+  @override
+  Widget? buildTrailing(BuildContext context) {
+    final store = PerAccountStoreWidget.of(context);
+    final unreadCount = store.unreads.countInCombinedFeedNarrow();
+    if (unreadCount == 0) return null;
+    return UnreadCountBadge(
+      style: UnreadCountBadgeStyle.mainMenu,
+      count: unreadCount,
+      channelIdForBackground: null,
+    );
+  }
+
   @override
   _HomePageTab get navigationTarget => _HomePageTab.inbox;
 }
@@ -540,6 +558,18 @@ class _MentionsButton extends _MenuButton {
     return zulipLocalizations.mentionsPageTitle;
   }
 
+  @override
+  Widget? buildTrailing(BuildContext context) {
+    final store = PerAccountStoreWidget.of(context);
+    final unreadCount = store.unreads.countInMentionsNarrow();
+    if (unreadCount == 0) return null;
+    return UnreadCountBadge(
+      style: UnreadCountBadgeStyle.mainMenu,
+      count: unreadCount,
+      channelIdForBackground: null,
+    );
+  }
+
   @override
   void onPressed(BuildContext context) {
     Navigator.of(context).push(MessageListPage.buildRoute(
@@ -609,6 +639,18 @@ class _DirectMessagesButton extends _NavigationBarMenuButton {
     return zulipLocalizations.recentDmConversationsPageTitle;
   }
 
+  @override
+  Widget? buildTrailing(BuildContext context) {
+    final store = PerAccountStoreWidget.of(context);
+    final unreadCount = store.unreads.countInDms();
+    if (unreadCount == 0) return null;
+    return UnreadCountBadge(
+      style: UnreadCountBadgeStyle.mainMenu,
+      count: unreadCount,
+      channelIdForBackground: null,
+    );
+  }
+
   @override
   _HomePageTab get navigationTarget => _HomePageTab.directMessages;
 }

lib/widgets/unread_count_badge.dart

@@ -10,23 +10,20 @@ import 'theme.dart';
 ///   https://www.figma.com/design/1JTNtYo9memgW7vV6d0ygq/Zulip-Mobile?node-id=2037-186671&m=dev
 /// It looks like that component was created for the main menu,
 /// then adapted for various other contexts, like the Inbox page.
+/// See [UnreadCountBadgeStyle].
 ///
-/// Currently this widget supports only those other contexts (not the main menu)
-/// and only the component's "kind=unread" variant (not "kind=quantity").
-/// For example, the "Channels" page and the topic-list page:
-///   https://www.figma.com/design/1JTNtYo9memgW7vV6d0ygq/Zulip-Mobile?node-id=6205-26001&m=dev
-///   https://www.figma.com/design/1JTNtYo9memgW7vV6d0ygq/Zulip-Mobile?node-id=6823-37113&m=dev
-/// (We use this for the topic-list page even though the Figma makes it a bit
-/// more compact there…the inconsistency seems worse and might be accidental.)
-// TODO support the main-menu context, update dartdoc
+/// Currently this widget supports only the component's "kind=unread" variant,
+/// not "kind=quantity".
 // TODO support the "kind=quantity" variant, update dartdoc
 class UnreadCountBadge extends StatelessWidget {
   const UnreadCountBadge({
     super.key,
+    this.style = UnreadCountBadgeStyle.other,
     required this.count,
     required this.channelIdForBackground,
   });
 
+  final UnreadCountBadgeStyle style;
   final int count;
 
   /// An optional [Subscription.streamId], for a channel-colorized background.
@@ -55,23 +52,52 @@ class UnreadCountBadge extends StatelessWidget {
       backgroundColor = designVariables.bgCounterUnread;
     }
 
+    final padding = switch (style) {
+      UnreadCountBadgeStyle.mainMenu =>
+        const EdgeInsets.symmetric(horizontal: 5, vertical: 4),
+      UnreadCountBadgeStyle.other =>
+        const EdgeInsets.symmetric(horizontal: 5, vertical: 3),
+    };
+
+    final double wght = switch (style) {
+      UnreadCountBadgeStyle.mainMenu => 600,
+      UnreadCountBadgeStyle.other => 500,
+    };
+
     return DecoratedBox(
       decoration: BoxDecoration(
         borderRadius: BorderRadius.circular(5),
         color: backgroundColor,
       ),
       child: Padding(
-        padding: const EdgeInsets.symmetric(horizontal: 5, vertical: 3),
+        padding: padding,
         child: Text(
           style: TextStyle(
             fontSize: 16,
             height: (16 / 16),
             color: textColor,
-          ).merge(weightVariableTextStyle(context, wght: 500)),
+          ).merge(weightVariableTextStyle(context, wght: wght)),
           count.toString())));
   }
 }
 
+enum UnreadCountBadgeStyle {
+  /// The style to use in the main menu.
+  ///
+  /// Figma:
+  ///   https://www.figma.com/design/1JTNtYo9memgW7vV6d0ygq/Zulip-Mobile?node-id=2037-185126&m=dev
+  mainMenu,
+
+  /// The style to use in other contexts besides the main menu.
+  ///
+  /// Other contexts include the "Channels" page and the topic-list page:
+  ///   https://www.figma.com/design/1JTNtYo9memgW7vV6d0ygq/Zulip-Mobile?node-id=6205-26001&m=dev
+  ///   https://www.figma.com/design/1JTNtYo9memgW7vV6d0ygq/Zulip-Mobile?node-id=6823-37113&m=dev
+  /// (We use this for the topic-list page even though the Figma makes it a bit
+  /// more compact there…the inconsistency seems worse and might be accidental.)
+  other,
+}
+
 class MutedUnreadBadge extends StatelessWidget {
   const MutedUnreadBadge({super.key});