-
Notifications
You must be signed in to change notification settings - Fork 374
Show archive icon for archived channels and add test (fixes #1992) #2037
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
nsamuelreddy
wants to merge
2
commits into
zulip:main
Choose a base branch
from
nsamuelreddy:archived-channel-icon
base: main
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.
+78
−59
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
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
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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 |
|---|---|---|
| @@ -1,4 +1,3 @@ | ||
|
|
||
| import 'package:flutter/widgets.dart'; | ||
|
|
||
| import '../api/model/model.dart'; | ||
|
|
@@ -24,179 +23,182 @@ abstract final class ZulipIcons { | |
| // | ||
| // BEGIN GENERATED ICON DATA | ||
|
|
||
| /// The Zulip custom icon "archive". | ||
| static const IconData archive = IconData(0xf101, fontFamily: "Zulip Icons"); | ||
|
|
||
| /// The Zulip custom icon "arrow_down". | ||
| static const IconData arrow_down = IconData(0xf101, fontFamily: "Zulip Icons"); | ||
| static const IconData arrow_down = IconData(0xf102, fontFamily: "Zulip Icons"); | ||
|
|
||
| /// The Zulip custom icon "arrow_left_right". | ||
| static const IconData arrow_left_right = IconData(0xf102, fontFamily: "Zulip Icons"); | ||
| static const IconData arrow_left_right = IconData(0xf103, fontFamily: "Zulip Icons"); | ||
|
|
||
| /// The Zulip custom icon "arrow_right". | ||
| static const IconData arrow_right = IconData(0xf103, fontFamily: "Zulip Icons"); | ||
| static const IconData arrow_right = IconData(0xf104, fontFamily: "Zulip Icons"); | ||
|
|
||
| /// The Zulip custom icon "at_sign". | ||
| static const IconData at_sign = IconData(0xf104, fontFamily: "Zulip Icons"); | ||
| static const IconData at_sign = IconData(0xf105, fontFamily: "Zulip Icons"); | ||
|
|
||
| /// The Zulip custom icon "attach_file". | ||
| static const IconData attach_file = IconData(0xf105, fontFamily: "Zulip Icons"); | ||
| static const IconData attach_file = IconData(0xf106, fontFamily: "Zulip Icons"); | ||
|
|
||
| /// The Zulip custom icon "bot". | ||
| static const IconData bot = IconData(0xf106, fontFamily: "Zulip Icons"); | ||
| static const IconData bot = IconData(0xf107, fontFamily: "Zulip Icons"); | ||
|
|
||
| /// The Zulip custom icon "camera". | ||
| static const IconData camera = IconData(0xf107, fontFamily: "Zulip Icons"); | ||
| static const IconData camera = IconData(0xf108, fontFamily: "Zulip Icons"); | ||
|
|
||
| /// The Zulip custom icon "check". | ||
| static const IconData check = IconData(0xf108, fontFamily: "Zulip Icons"); | ||
| static const IconData check = IconData(0xf109, fontFamily: "Zulip Icons"); | ||
|
|
||
| /// The Zulip custom icon "check_check". | ||
| static const IconData check_check = IconData(0xf109, fontFamily: "Zulip Icons"); | ||
| static const IconData check_check = IconData(0xf10a, fontFamily: "Zulip Icons"); | ||
|
|
||
| /// The Zulip custom icon "check_circle_checked". | ||
| static const IconData check_circle_checked = IconData(0xf10a, fontFamily: "Zulip Icons"); | ||
| static const IconData check_circle_checked = IconData(0xf10b, fontFamily: "Zulip Icons"); | ||
|
|
||
| /// The Zulip custom icon "check_circle_unchecked". | ||
| static const IconData check_circle_unchecked = IconData(0xf10b, fontFamily: "Zulip Icons"); | ||
| static const IconData check_circle_unchecked = IconData(0xf10c, fontFamily: "Zulip Icons"); | ||
|
|
||
| /// The Zulip custom icon "check_remove". | ||
| static const IconData check_remove = IconData(0xf10c, fontFamily: "Zulip Icons"); | ||
| static const IconData check_remove = IconData(0xf10d, fontFamily: "Zulip Icons"); | ||
|
|
||
| /// The Zulip custom icon "chevron_down". | ||
| static const IconData chevron_down = IconData(0xf10d, fontFamily: "Zulip Icons"); | ||
| static const IconData chevron_down = IconData(0xf10e, fontFamily: "Zulip Icons"); | ||
|
|
||
| /// The Zulip custom icon "chevron_right". | ||
| static const IconData chevron_right = IconData(0xf10e, fontFamily: "Zulip Icons"); | ||
| static const IconData chevron_right = IconData(0xf10f, fontFamily: "Zulip Icons"); | ||
|
|
||
| /// The Zulip custom icon "circle_x". | ||
| static const IconData circle_x = IconData(0xf10f, fontFamily: "Zulip Icons"); | ||
| static const IconData circle_x = IconData(0xf110, fontFamily: "Zulip Icons"); | ||
|
|
||
| /// The Zulip custom icon "clock". | ||
| static const IconData clock = IconData(0xf110, fontFamily: "Zulip Icons"); | ||
| static const IconData clock = IconData(0xf111, fontFamily: "Zulip Icons"); | ||
|
|
||
| /// The Zulip custom icon "contacts". | ||
| static const IconData contacts = IconData(0xf111, fontFamily: "Zulip Icons"); | ||
| static const IconData contacts = IconData(0xf112, fontFamily: "Zulip Icons"); | ||
|
|
||
| /// The Zulip custom icon "copy". | ||
| static const IconData copy = IconData(0xf112, fontFamily: "Zulip Icons"); | ||
| static const IconData copy = IconData(0xf113, fontFamily: "Zulip Icons"); | ||
|
|
||
| /// The Zulip custom icon "edit". | ||
| static const IconData edit = IconData(0xf113, fontFamily: "Zulip Icons"); | ||
| static const IconData edit = IconData(0xf114, fontFamily: "Zulip Icons"); | ||
|
|
||
| /// The Zulip custom icon "eye". | ||
| static const IconData eye = IconData(0xf114, fontFamily: "Zulip Icons"); | ||
| static const IconData eye = IconData(0xf115, fontFamily: "Zulip Icons"); | ||
|
|
||
| /// The Zulip custom icon "eye_off". | ||
| static const IconData eye_off = IconData(0xf115, fontFamily: "Zulip Icons"); | ||
| static const IconData eye_off = IconData(0xf116, fontFamily: "Zulip Icons"); | ||
|
|
||
| /// The Zulip custom icon "follow". | ||
| static const IconData follow = IconData(0xf116, fontFamily: "Zulip Icons"); | ||
| static const IconData follow = IconData(0xf117, fontFamily: "Zulip Icons"); | ||
|
|
||
| /// The Zulip custom icon "format_quote". | ||
| static const IconData format_quote = IconData(0xf117, fontFamily: "Zulip Icons"); | ||
| static const IconData format_quote = IconData(0xf118, fontFamily: "Zulip Icons"); | ||
|
|
||
| /// The Zulip custom icon "globe". | ||
| static const IconData globe = IconData(0xf118, fontFamily: "Zulip Icons"); | ||
| static const IconData globe = IconData(0xf119, fontFamily: "Zulip Icons"); | ||
|
|
||
| /// The Zulip custom icon "group_dm". | ||
| static const IconData group_dm = IconData(0xf119, fontFamily: "Zulip Icons"); | ||
| static const IconData group_dm = IconData(0xf11a, fontFamily: "Zulip Icons"); | ||
|
|
||
| /// The Zulip custom icon "hash_italic". | ||
| static const IconData hash_italic = IconData(0xf11a, fontFamily: "Zulip Icons"); | ||
| static const IconData hash_italic = IconData(0xf11b, fontFamily: "Zulip Icons"); | ||
|
|
||
| /// The Zulip custom icon "hash_sign". | ||
| static const IconData hash_sign = IconData(0xf11b, fontFamily: "Zulip Icons"); | ||
| static const IconData hash_sign = IconData(0xf11c, fontFamily: "Zulip Icons"); | ||
|
|
||
| /// The Zulip custom icon "image". | ||
| static const IconData image = IconData(0xf11c, fontFamily: "Zulip Icons"); | ||
| static const IconData image = IconData(0xf11d, fontFamily: "Zulip Icons"); | ||
|
|
||
| /// The Zulip custom icon "inbox". | ||
| static const IconData inbox = IconData(0xf11d, fontFamily: "Zulip Icons"); | ||
| static const IconData inbox = IconData(0xf11e, fontFamily: "Zulip Icons"); | ||
|
|
||
| /// The Zulip custom icon "info". | ||
| static const IconData info = IconData(0xf11e, fontFamily: "Zulip Icons"); | ||
| static const IconData info = IconData(0xf11f, fontFamily: "Zulip Icons"); | ||
|
|
||
| /// The Zulip custom icon "inherit". | ||
| static const IconData inherit = IconData(0xf11f, fontFamily: "Zulip Icons"); | ||
| static const IconData inherit = IconData(0xf120, fontFamily: "Zulip Icons"); | ||
|
|
||
| /// The Zulip custom icon "language". | ||
| static const IconData language = IconData(0xf120, fontFamily: "Zulip Icons"); | ||
| static const IconData language = IconData(0xf121, fontFamily: "Zulip Icons"); | ||
|
|
||
| /// The Zulip custom icon "link". | ||
| static const IconData link = IconData(0xf121, fontFamily: "Zulip Icons"); | ||
| static const IconData link = IconData(0xf122, fontFamily: "Zulip Icons"); | ||
|
|
||
| /// The Zulip custom icon "lock". | ||
| static const IconData lock = IconData(0xf122, fontFamily: "Zulip Icons"); | ||
| static const IconData lock = IconData(0xf123, fontFamily: "Zulip Icons"); | ||
|
|
||
| /// The Zulip custom icon "menu". | ||
| static const IconData menu = IconData(0xf123, fontFamily: "Zulip Icons"); | ||
| static const IconData menu = IconData(0xf124, fontFamily: "Zulip Icons"); | ||
|
|
||
| /// The Zulip custom icon "message_checked". | ||
| static const IconData message_checked = IconData(0xf124, fontFamily: "Zulip Icons"); | ||
| static const IconData message_checked = IconData(0xf125, fontFamily: "Zulip Icons"); | ||
|
|
||
| /// The Zulip custom icon "message_feed". | ||
| static const IconData message_feed = IconData(0xf125, fontFamily: "Zulip Icons"); | ||
| static const IconData message_feed = IconData(0xf126, fontFamily: "Zulip Icons"); | ||
|
|
||
| /// The Zulip custom icon "more_horizontal". | ||
| static const IconData more_horizontal = IconData(0xf126, fontFamily: "Zulip Icons"); | ||
| static const IconData more_horizontal = IconData(0xf127, fontFamily: "Zulip Icons"); | ||
|
|
||
| /// The Zulip custom icon "mute". | ||
| static const IconData mute = IconData(0xf127, fontFamily: "Zulip Icons"); | ||
| static const IconData mute = IconData(0xf128, fontFamily: "Zulip Icons"); | ||
|
|
||
| /// The Zulip custom icon "person". | ||
| static const IconData person = IconData(0xf128, fontFamily: "Zulip Icons"); | ||
| static const IconData person = IconData(0xf129, fontFamily: "Zulip Icons"); | ||
|
|
||
| /// The Zulip custom icon "plus". | ||
| static const IconData plus = IconData(0xf129, fontFamily: "Zulip Icons"); | ||
| static const IconData plus = IconData(0xf12a, fontFamily: "Zulip Icons"); | ||
|
|
||
| /// The Zulip custom icon "read_receipts". | ||
| static const IconData read_receipts = IconData(0xf12a, fontFamily: "Zulip Icons"); | ||
| static const IconData read_receipts = IconData(0xf12b, fontFamily: "Zulip Icons"); | ||
|
|
||
| /// The Zulip custom icon "remove". | ||
| static const IconData remove = IconData(0xf12b, fontFamily: "Zulip Icons"); | ||
| static const IconData remove = IconData(0xf12c, fontFamily: "Zulip Icons"); | ||
|
|
||
| /// The Zulip custom icon "search". | ||
| static const IconData search = IconData(0xf12c, fontFamily: "Zulip Icons"); | ||
| static const IconData search = IconData(0xf12d, fontFamily: "Zulip Icons"); | ||
|
|
||
| /// The Zulip custom icon "see_who_reacted". | ||
| static const IconData see_who_reacted = IconData(0xf12d, fontFamily: "Zulip Icons"); | ||
| static const IconData see_who_reacted = IconData(0xf12e, fontFamily: "Zulip Icons"); | ||
|
|
||
| /// The Zulip custom icon "send". | ||
| static const IconData send = IconData(0xf12e, fontFamily: "Zulip Icons"); | ||
| static const IconData send = IconData(0xf12f, fontFamily: "Zulip Icons"); | ||
|
|
||
| /// The Zulip custom icon "settings". | ||
| static const IconData settings = IconData(0xf12f, fontFamily: "Zulip Icons"); | ||
| static const IconData settings = IconData(0xf130, fontFamily: "Zulip Icons"); | ||
|
|
||
| /// The Zulip custom icon "share". | ||
| static const IconData share = IconData(0xf130, fontFamily: "Zulip Icons"); | ||
| static const IconData share = IconData(0xf131, fontFamily: "Zulip Icons"); | ||
|
|
||
| /// The Zulip custom icon "share_ios". | ||
| static const IconData share_ios = IconData(0xf131, fontFamily: "Zulip Icons"); | ||
| static const IconData share_ios = IconData(0xf132, fontFamily: "Zulip Icons"); | ||
|
|
||
| /// The Zulip custom icon "smile". | ||
| static const IconData smile = IconData(0xf132, fontFamily: "Zulip Icons"); | ||
| static const IconData smile = IconData(0xf133, fontFamily: "Zulip Icons"); | ||
|
|
||
| /// The Zulip custom icon "star". | ||
| static const IconData star = IconData(0xf133, fontFamily: "Zulip Icons"); | ||
| static const IconData star = IconData(0xf134, fontFamily: "Zulip Icons"); | ||
|
|
||
| /// The Zulip custom icon "star_filled". | ||
| static const IconData star_filled = IconData(0xf134, fontFamily: "Zulip Icons"); | ||
| static const IconData star_filled = IconData(0xf135, fontFamily: "Zulip Icons"); | ||
|
|
||
| /// The Zulip custom icon "three_person". | ||
| static const IconData three_person = IconData(0xf135, fontFamily: "Zulip Icons"); | ||
| static const IconData three_person = IconData(0xf136, fontFamily: "Zulip Icons"); | ||
|
|
||
| /// The Zulip custom icon "topic". | ||
| static const IconData topic = IconData(0xf136, fontFamily: "Zulip Icons"); | ||
| static const IconData topic = IconData(0xf137, fontFamily: "Zulip Icons"); | ||
|
|
||
| /// The Zulip custom icon "topics". | ||
| static const IconData topics = IconData(0xf137, fontFamily: "Zulip Icons"); | ||
| static const IconData topics = IconData(0xf138, fontFamily: "Zulip Icons"); | ||
|
|
||
| /// The Zulip custom icon "trash". | ||
| static const IconData trash = IconData(0xf138, fontFamily: "Zulip Icons"); | ||
| static const IconData trash = IconData(0xf139, fontFamily: "Zulip Icons"); | ||
|
|
||
| /// The Zulip custom icon "two_person". | ||
| static const IconData two_person = IconData(0xf139, fontFamily: "Zulip Icons"); | ||
| static const IconData two_person = IconData(0xf13a, fontFamily: "Zulip Icons"); | ||
|
|
||
| /// The Zulip custom icon "unmute". | ||
| static const IconData unmute = IconData(0xf13a, fontFamily: "Zulip Icons"); | ||
| static const IconData unmute = IconData(0xf13b, fontFamily: "Zulip Icons"); | ||
|
|
||
| // END GENERATED ICON DATA | ||
| } | ||
|
|
@@ -206,6 +208,7 @@ IconData iconDataForStream(ZulipStream stream) { | |
| // see this message and the one after it: | ||
| // https://chat.zulip.org/#narrow/stream/243-mobile-team/topic/design.3A.20.23F117.20.22Inbox.22.20screen/near/1680637 | ||
| return switch(stream) { | ||
| ZulipStream(isArchived: true) => ZulipIcons.archive, | ||
|
Collaborator
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. Please don't start showing the icon in the same commit that adds the asset to the project. I mentioned this in my last review: #2037 (review) |
||
| ZulipStream(isWebPublic: true) => ZulipIcons.globe, | ||
| ZulipStream(inviteOnly: true) => ZulipIcons.lock, | ||
| ZulipStream() => ZulipIcons.hash_sign, | ||
|
|
||
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.
How did you create the link to the design discussion, in the commit message? The channel-ID part is wrong, so it doesn't take me to the intended message.