home: Show unread counts in main menu #1997
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -22,6 +22,7 @@ import 'store.dart'; | |
| import 'subscription_list.dart'; | ||
| import 'text.dart'; | ||
| import 'theme.dart'; | ||
| import 'unread_count_badge.dart'; | ||
| import 'user.dart'; | ||
|
|
||
| enum _HomePageTab { | ||
|
|
@@ -351,6 +352,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) { | ||
|
|
@@ -391,6 +394,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, | ||
|
|
@@ -407,6 +412,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, | ||
| ])))); | ||
| } | ||
| } | ||
|
|
@@ -457,6 +463,18 @@ class _InboxButton extends _NavigationBarMenuButton { | |
| return zulipLocalizations.inboxPageTitle; | ||
| } | ||
|
|
||
| @override | ||
| Widget? buildTrailing(BuildContext context) { | ||
| final store = PerAccountStoreWidget.of(context); | ||
| final unreadCount = store.unreads.countInCombinedFeedNarrow(); | ||
|
Member
There was a problem hiding this comment. Hmm, I worry a bit about adding this call site given this TODO for #370: Do you have any timings on how long this takes with lots of unreads?
Member
There was a problem hiding this comment. Ah I see, this is only in the main-menu bottom sheet, not the bottom tabs. In that case I guess it doesn't make the impact any worse than it is now with the mark-as-read button in the message list. |
||
| if (unreadCount == 0) return null; | ||
| return UnreadCountBadge( | ||
| style: UnreadCountBadgeStyle.mainMenu, | ||
| count: unreadCount, | ||
| channelIdForBackground: null, | ||
| ); | ||
| } | ||
|
|
||
| @override | ||
| _HomePageTab get navigationTarget => _HomePageTab.inbox; | ||
| } | ||
|
|
@@ -472,6 +490,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( | ||
|
|
@@ -541,6 +571,18 @@ class _DirectMessagesButton extends _NavigationBarMenuButton { | |
| return zulipLocalizations.recentDmConversationsPageTitle; | ||
| } | ||
|
|
||
| @override | ||
| Widget? buildTrailing(BuildContext context) { | ||
| final store = PerAccountStoreWidget.of(context); | ||
| final unreadCount = store.unreads.countInAllDms(); | ||
| if (unreadCount == 0) return null; | ||
| return UnreadCountBadge( | ||
| style: UnreadCountBadgeStyle.mainMenu, | ||
| count: unreadCount, | ||
| channelIdForBackground: null, | ||
| ); | ||
| } | ||
|
|
||
| @override | ||
| _HomePageTab get navigationTarget => _HomePageTab.directMessages; | ||
| } | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The name feels misleading, given that this isn't actually all DMs. 🙂 A bit like how we moved away from "All messages" to "Combined feed".
How about just
countInDms? And maybe dartdoc mentioning it excludes muted DM conversations.