Skip to content

Commit 3669b15

Browse files
sm-sayedichrisbobbe
sm-sayedi
authored and
chrisbobbe
committed
icons: Add "person", "eye", and "eye_off" icons
Also renamed "user" to "two_person" to make it consistent with other icons of the same purpose. New icons taken from: https://www.figma.com/design/1JTNtYo9memgW7vV6d0ygq/Zulip-Mobile?node-id=5968-237884&t=dku3J5Fv2dmWo7ht-0 https://www.figma.com/design/1JTNtYo9memgW7vV6d0ygq/Zulip-Mobile?node-id=5968-264632&t=dku3J5Fv2dmWo7ht-0 https://www.figma.com/design/1JTNtYo9memgW7vV6d0ygq/Zulip-Mobile?node-id=5968-291260&t=B5jAmeUMMG4dlsU7-0
1 parent 4438ff8 commit 3669b15

File tree

12 files changed

+63
-38
lines changed

12 files changed

+63
-38
lines changed

‎assets/icons/ZulipIcons.ttf‎

816 Bytes
Binary file not shown.

‎assets/icons/eye.svg‎

Lines changed: 3 additions & 0 deletions
Loading

‎assets/icons/eye_off.svg‎

Lines changed: 3 additions & 0 deletions
Loading

‎assets/icons/person.svg‎

Lines changed: 10 additions & 0 deletions
Loading

‎assets/icons/user.svg‎ renamed to ‎assets/icons/two_person.svg‎

File renamed without changes.

‎lib/widgets/home.dart‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ class _HomePageState extends State<HomePage> {
111111
narrow: const CombinedFeedNarrow()))),
112112
button(_HomePageTab.channels, ZulipIcons.hash_italic),
113113
// TODO(#1094): Users
114-
button(_HomePageTab.directMessages, ZulipIcons.user),
114+
button(_HomePageTab.directMessages, ZulipIcons.two_person),
115115
_NavigationBarButton( icon: ZulipIcons.menu,
116116
selected: false,
117117
onPressed: () => _showMainMenu(context, tabNotifier: _tab)),
@@ -515,7 +515,7 @@ class _DirectMessagesButton extends _NavigationBarMenuButton {
515515
const _DirectMessagesButton({required super.tabNotifier});
516516

517517
@override
518-
IconData get icon => ZulipIcons.user;
518+
IconData get icon => ZulipIcons.two_person;
519519

520520
@override
521521
String label(ZulipLocalizations zulipLocalizations) {

‎lib/widgets/icons.dart‎

Lines changed: 40 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -66,92 +66,101 @@ abstract final class ZulipIcons {
6666
/// The Zulip custom icon "edit".
6767
static const IconData edit = IconData(0xf10e, fontFamily: "Zulip Icons");
6868

69+
/// The Zulip custom icon "eye".
70+
static const IconData eye = IconData(0xf10f, fontFamily: "Zulip Icons");
71+
72+
/// The Zulip custom icon "eye_off".
73+
static const IconData eye_off = IconData(0xf110, fontFamily: "Zulip Icons");
74+
6975
/// The Zulip custom icon "follow".
70-
static const IconData follow = IconData(0xf10f, fontFamily: "Zulip Icons");
76+
static const IconData follow = IconData(0xf111, fontFamily: "Zulip Icons");
7177

7278
/// The Zulip custom icon "format_quote".
73-
static const IconData format_quote = IconData(0xf110, fontFamily: "Zulip Icons");
79+
static const IconData format_quote = IconData(0xf112, fontFamily: "Zulip Icons");
7480

7581
/// The Zulip custom icon "globe".
76-
static const IconData globe = IconData(0xf111, fontFamily: "Zulip Icons");
82+
static const IconData globe = IconData(0xf113, fontFamily: "Zulip Icons");
7783

7884
/// The Zulip custom icon "group_dm".
79-
static const IconData group_dm = IconData(0xf112, fontFamily: "Zulip Icons");
85+
static const IconData group_dm = IconData(0xf114, fontFamily: "Zulip Icons");
8086

8187
/// The Zulip custom icon "hash_italic".
82-
static const IconData hash_italic = IconData(0xf113, fontFamily: "Zulip Icons");
88+
static const IconData hash_italic = IconData(0xf115, fontFamily: "Zulip Icons");
8389

8490
/// The Zulip custom icon "hash_sign".
85-
static const IconData hash_sign = IconData(0xf114, fontFamily: "Zulip Icons");
91+
static const IconData hash_sign = IconData(0xf116, fontFamily: "Zulip Icons");
8692

8793
/// The Zulip custom icon "image".
88-
static const IconData image = IconData(0xf115, fontFamily: "Zulip Icons");
94+
static const IconData image = IconData(0xf117, fontFamily: "Zulip Icons");
8995

9096
/// The Zulip custom icon "inbox".
91-
static const IconData inbox = IconData(0xf116, fontFamily: "Zulip Icons");
97+
static const IconData inbox = IconData(0xf118, fontFamily: "Zulip Icons");
9298

9399
/// The Zulip custom icon "info".
94-
static const IconData info = IconData(0xf117, fontFamily: "Zulip Icons");
100+
static const IconData info = IconData(0xf119, fontFamily: "Zulip Icons");
95101

96102
/// The Zulip custom icon "inherit".
97-
static const IconData inherit = IconData(0xf118, fontFamily: "Zulip Icons");
103+
static const IconData inherit = IconData(0xf11a, fontFamily: "Zulip Icons");
98104

99105
/// The Zulip custom icon "language".
100-
static const IconData language = IconData(0xf119, fontFamily: "Zulip Icons");
106+
static const IconData language = IconData(0xf11b, fontFamily: "Zulip Icons");
101107

102108
/// The Zulip custom icon "lock".
103-
static const IconData lock = IconData(0xf11a, fontFamily: "Zulip Icons");
109+
static const IconData lock = IconData(0xf11c, fontFamily: "Zulip Icons");
104110

105111
/// The Zulip custom icon "menu".
106-
static const IconData menu = IconData(0xf11b, fontFamily: "Zulip Icons");
112+
static const IconData menu = IconData(0xf11d, fontFamily: "Zulip Icons");
107113

108114
/// The Zulip custom icon "message_checked".
109-
static const IconData message_checked = IconData(0xf11c, fontFamily: "Zulip Icons");
115+
static const IconData message_checked = IconData(0xf11e, fontFamily: "Zulip Icons");
110116

111117
/// The Zulip custom icon "message_feed".
112-
static const IconData message_feed = IconData(0xf11d, fontFamily: "Zulip Icons");
118+
static const IconData message_feed = IconData(0xf11f, fontFamily: "Zulip Icons");
113119

114120
/// The Zulip custom icon "mute".
115-
static const IconData mute = IconData(0xf11e, fontFamily: "Zulip Icons");
121+
static const IconData mute = IconData(0xf120, fontFamily: "Zulip Icons");
122+
123+
/// The Zulip custom icon "person".
124+
static const IconData person = IconData(0xf121, fontFamily: "Zulip Icons");
116125

117126
/// The Zulip custom icon "read_receipts".
118-
static const IconData read_receipts = IconData(0xf11f, fontFamily: "Zulip Icons");
127+
static const IconData read_receipts = IconData(0xf122, fontFamily: "Zulip Icons");
119128

120129
/// The Zulip custom icon "send".
121-
static const IconData send = IconData(0xf120, fontFamily: "Zulip Icons");
130+
static const IconData send = IconData(0xf123, fontFamily: "Zulip Icons");
122131

123132
/// The Zulip custom icon "settings".
124-
static const IconData settings = IconData(0xf121, fontFamily: "Zulip Icons");
133+
static const IconData settings = IconData(0xf124, fontFamily: "Zulip Icons");
125134

126135
/// The Zulip custom icon "share".
127-
static const IconData share = IconData(0xf122, fontFamily: "Zulip Icons");
136+
static const IconData share = IconData(0xf125, fontFamily: "Zulip Icons");
128137

129138
/// The Zulip custom icon "share_ios".
130-
static const IconData share_ios = IconData(0xf123, fontFamily: "Zulip Icons");
139+
static const IconData share_ios = IconData(0xf126, fontFamily: "Zulip Icons");
131140

132141
/// The Zulip custom icon "smile".
133-
static const IconData smile = IconData(0xf124, fontFamily: "Zulip Icons");
142+
static const IconData smile = IconData(0xf127, fontFamily: "Zulip Icons");
134143

135144
/// The Zulip custom icon "star".
136-
static const IconData star = IconData(0xf125, fontFamily: "Zulip Icons");
145+
static const IconData star = IconData(0xf128, fontFamily: "Zulip Icons");
137146

138147
/// The Zulip custom icon "star_filled".
139-
static const IconData star_filled = IconData(0xf126, fontFamily: "Zulip Icons");
148+
static const IconData star_filled = IconData(0xf129, fontFamily: "Zulip Icons");
140149

141150
/// The Zulip custom icon "three_person".
142-
static const IconData three_person = IconData(0xf127, fontFamily: "Zulip Icons");
151+
static const IconData three_person = IconData(0xf12a, fontFamily: "Zulip Icons");
143152

144153
/// The Zulip custom icon "topic".
145-
static const IconData topic = IconData(0xf128, fontFamily: "Zulip Icons");
154+
static const IconData topic = IconData(0xf12b, fontFamily: "Zulip Icons");
146155

147156
/// The Zulip custom icon "topics".
148-
static const IconData topics = IconData(0xf129, fontFamily: "Zulip Icons");
157+
static const IconData topics = IconData(0xf12c, fontFamily: "Zulip Icons");
149158

150-
/// The Zulip custom icon "unmute".
151-
static const IconData unmute = IconData(0xf12a, fontFamily: "Zulip Icons");
159+
/// The Zulip custom icon "two_person".
160+
static const IconData two_person = IconData(0xf12d, fontFamily: "Zulip Icons");
152161

153-
/// The Zulip custom icon "user".
154-
static const IconData user = IconData(0xf12b, fontFamily: "Zulip Icons");
162+
/// The Zulip custom icon "unmute".
163+
static const IconData unmute = IconData(0xf12e, fontFamily: "Zulip Icons");
155164

156165
// END GENERATED ICON DATA
157166
}

‎lib/widgets/inbox.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,7 @@ class _AllDmsHeaderItem extends _HeaderItem {
319319

320320
@override String title(ZulipLocalizations zulipLocalizations) =>
321321
zulipLocalizations.recentDmConversationsSectionHeader;
322-
@override IconData get icon => ZulipIcons.user;
322+
@override IconData get icon => ZulipIcons.two_person;
323323

324324
// TODO(design) check if this is the right variable for these
325325
@override Color collapsedIconColor(context) => DesignVariables.of(context).labelMenuButton;

‎lib/widgets/message_list.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1303,7 +1303,7 @@ class DmRecipientHeader extends StatelessWidget {
13031303
child: Icon(
13041304
color: designVariables.title,
13051305
size: 16,
1306-
ZulipIcons.user)),
1306+
ZulipIcons.two_person)),
13071307
Expanded(
13081308
child: Text(title,
13091309
style: recipientHeaderTextStyle(context),

‎test/widgets/home_test.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ void main () {
125125
of: find.byType(ZulipAppBar),
126126
matching: find.text('Channels'))).findsOne();
127127

128-
await tester.tap(find.byIcon(ZulipIcons.user));
128+
await tester.tap(find.byIcon(ZulipIcons.two_person));
129129
await tester.pump();
130130
check(find.descendant(
131131
of: find.byType(ZulipAppBar),

0 commit comments

Comments
 (0)