-
Notifications
You must be signed in to change notification settings - Fork 383
feat(ui): add configurable StreamBackButton unread count
#2816
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
VelikovPetar
wants to merge
1
commit into
master
Choose a base branch
from
feature/FLU-557_fix_back_button_unread_counts
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
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
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
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 |
|---|---|---|
|
|
@@ -9,19 +9,39 @@ class StreamBackButton extends StatelessWidget { | |
| const StreamBackButton({ | ||
| super.key, | ||
| this.onPressed, | ||
| @Deprecated( | ||
| "Use 'unreadCount: StreamBackButtonUnreadCount.total()' instead. " | ||
| 'This will be removed in a future version.', | ||
| ) | ||
| this.showUnreadCount = false, | ||
| @Deprecated( | ||
| "Use 'unreadCount: StreamBackButtonUnreadCount.channel(cid)' instead. " | ||
| 'This will be removed in a future version.', | ||
| ) | ||
| this.channelId, | ||
| this.unreadCount, | ||
| }); | ||
|
|
||
| /// Callback for when button is pressed | ||
| final VoidCallback? onPressed; | ||
|
|
||
| /// Show unread count | ||
| @Deprecated( | ||
| "Use 'unreadCount: StreamBackButtonUnreadCount.total()' instead. " | ||
| 'This will be removed in a future version.', | ||
| ) | ||
| final bool showUnreadCount; | ||
|
|
||
| /// Channel ID used to retrieve unread count | ||
| @Deprecated( | ||
| "Use 'unreadCount: StreamBackButtonUnreadCount.channel(cid)' instead. " | ||
| 'This will be removed in a future version.', | ||
| ) | ||
| final String? channelId; | ||
|
|
||
| /// The unread count configuration for the back button. | ||
| final StreamBackButtonUnreadCount? unreadCount; | ||
|
|
||
| @override | ||
| Widget build(BuildContext context) { | ||
| final localizations = MaterialLocalizations.of(context); | ||
|
|
@@ -47,13 +67,56 @@ class StreamBackButton extends StatelessWidget { | |
| }, | ||
| ); | ||
|
|
||
| if (showUnreadCount) { | ||
| button = switch (channelId) { | ||
| final cid? => StreamUnreadIndicator.channels(offset: .zero, cid: cid, child: button), | ||
| _ => StreamUnreadIndicator(offset: .zero, child: button), | ||
| if (_effectiveUnreadCount case final effectiveUnreadCount?) { | ||
| button = switch (effectiveUnreadCount) { | ||
| _TotalUnreadCount(:final excludeCid) => StreamUnreadIndicator( | ||
| offset: .zero, | ||
| excludeCid: excludeCid, | ||
| child: button, | ||
| ), | ||
| _ChannelUnreadCount(:final cid) => StreamUnreadIndicator.channels( | ||
| offset: .zero, | ||
| cid: cid, | ||
| child: button, | ||
| ), | ||
| }; | ||
| } | ||
|
|
||
| return button; | ||
| } | ||
|
|
||
| StreamBackButtonUnreadCount? get _effectiveUnreadCount { | ||
| if (unreadCount case final effective?) return effective; | ||
| if (!showUnreadCount) return null; | ||
| return switch (channelId) { | ||
| final cid? => StreamBackButtonUnreadCount.channel(cid), | ||
| _ => const StreamBackButtonUnreadCount.total(), | ||
| }; | ||
| } | ||
| } | ||
|
|
||
| /// Configures the unread badge on a [StreamBackButton]. | ||
| sealed class StreamBackButtonUnreadCount { | ||
| const StreamBackButtonUnreadCount(); | ||
|
|
||
| /// Shows the total unread message count across all channels. | ||
| /// | ||
| /// Set [excludeCid] to omit a channel's unread messages from the total - | ||
| /// for example, the currently open channel. | ||
| const factory StreamBackButtonUnreadCount.total({String? excludeCid}) = _TotalUnreadCount; | ||
|
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Not completely sure about the naming here, let me know if you think we should use something different ( |
||
|
|
||
| /// Shows the unread message count of the channel identified by [cid]. | ||
| const factory StreamBackButtonUnreadCount.channel(String cid) = _ChannelUnreadCount; | ||
| } | ||
|
|
||
| final class _TotalUnreadCount extends StreamBackButtonUnreadCount { | ||
| const _TotalUnreadCount({this.excludeCid}); | ||
|
|
||
| final String? excludeCid; | ||
| } | ||
|
|
||
| final class _ChannelUnreadCount extends StreamBackButtonUnreadCount { | ||
| const _ChannelUnreadCount(this.cid); | ||
|
|
||
| final String cid; | ||
| } | ||
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
Oops, something went wrong.
Oops, something went wrong.
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.
🎯 Functional Correctness | 🟡 Minor | ⚡ Quick win
Show the total unread count excluding the current channel.
Configuring the back button to show the current channel's unread count (
.channel(cid)) results in a suboptimal UX, as the count will typically be 0 while the user is actively viewing the channel.Since navigating back from the
ChannelPagetakes the user to the channel list, it's generally preferable to show the total unread count excluding the current channel. This also accurately demonstrates the new default behavior ofStreamChannelHeaderintroduced in this PR.💡 Proposed fix
📝 Committable suggestion
🤖 Prompt for AI Agents