Skip to content

Commit 73ab3bf

Browse files
renefloorrenefloor
committed
Simplify icon set
1 parent 4428a96 commit 73ab3bf

100 files changed

Lines changed: 345 additions & 338 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎melos.yaml‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,11 @@ command:
9191
stream_chat_persistence: ^10.0.0-beta.13
9292
streaming_shared_preferences: ^2.0.0
9393
svg_icon_widget: ^0.0.1
94-
# TODO: Replace with hosted version before merging PR
95-
stream_core_flutter: ^0.1.0
94+
stream_core_flutter:
95+
git:
96+
url: https://github.com/GetStream/stream-core-flutter.git
97+
ref: 60f8906175e6c931d8db3ed3f6ce41f7c9ae7176
98+
path: packages/stream_core_flutter
9699
synchronized: ^3.1.0+1
97100
thumblr: ^0.0.4
98101
url_launcher: ^6.3.0

‎packages/stream_chat_flutter/lib/src/attachment/attachment_upload_state_builder.dart‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ class _PreparingState extends StatelessWidget {
125125
alignment: Alignment.topRight,
126126
child: _IconButton(
127127
icon: Icon(
128-
context.streamIcons.xmark20,
128+
context.streamIcons.xmark,
129129
color: StreamChatTheme.of(context).colorTheme.barsBg,
130130
),
131131
onPressed: () => channel.cancelAttachmentUpload(attachmentId),
@@ -165,7 +165,7 @@ class _InProgressState extends StatelessWidget {
165165
alignment: Alignment.topRight,
166166
child: _IconButton(
167167
icon: Icon(
168-
context.streamIcons.xmark20,
168+
context.streamIcons.xmark,
169169
color: StreamChatTheme.of(context).colorTheme.barsBg,
170170
),
171171
onPressed: () => channel.cancelAttachmentUpload(attachmentId),
@@ -204,7 +204,7 @@ class _FailedState extends StatelessWidget {
204204
children: [
205205
_IconButton(
206206
icon: Icon(
207-
context.streamIcons.retry20,
207+
context.streamIcons.retry,
208208
color: theme.colorTheme.barsBg,
209209
),
210210
onPressed: () {
@@ -248,7 +248,7 @@ class _SuccessState extends StatelessWidget {
248248
maxRadius: 10,
249249
child: Icon(
250250
size: 16,
251-
context.streamIcons.checkmark16,
251+
context.streamIcons.checkmark,
252252
color: StreamChatTheme.of(context).colorTheme.barsBg,
253253
),
254254
),

‎packages/stream_chat_flutter/lib/src/attachment/file_attachment.dart‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ class _Trailing extends StatelessWidget {
222222

223223
if (message.state.isCompleted) {
224224
return IconButton(
225-
icon: Icon(context.streamIcons.arrowDown20),
225+
icon: Icon(context.streamIcons.arrowDown),
226226
color: theme.colorTheme.textHighEmphasis,
227227
visualDensity: VisualDensity.compact,
228228
onPressed: () async {
@@ -243,7 +243,7 @@ class _Trailing extends StatelessWidget {
243243
padding: const EdgeInsets.all(8),
244244
child: _TrailingButton(
245245
icon: Icon(
246-
context.streamIcons.xmark20,
246+
context.streamIcons.xmark,
247247
color: theme.colorTheme.barsBg,
248248
),
249249
fillColor: theme.colorTheme.overlayDark,
@@ -254,7 +254,7 @@ class _Trailing extends StatelessWidget {
254254
padding: const EdgeInsets.all(8),
255255
child: _TrailingButton(
256256
icon: Icon(
257-
context.streamIcons.xmark20,
257+
context.streamIcons.xmark,
258258
color: theme.colorTheme.barsBg,
259259
),
260260
fillColor: theme.colorTheme.overlayDark,
@@ -267,7 +267,7 @@ class _Trailing extends StatelessWidget {
267267
backgroundColor: theme.colorTheme.accentPrimary,
268268
maxRadius: 12,
269269
child: Icon(
270-
context.streamIcons.checkmark20,
270+
context.streamIcons.checkmark,
271271
color: theme.colorTheme.barsBg,
272272
),
273273
),
@@ -276,7 +276,7 @@ class _Trailing extends StatelessWidget {
276276
padding: const EdgeInsets.all(8),
277277
child: _TrailingButton(
278278
icon: Icon(
279-
context.streamIcons.retry20,
279+
context.streamIcons.retry,
280280
color: theme.colorTheme.barsBg,
281281
),
282282
fillColor: theme.colorTheme.overlayDark,

‎packages/stream_chat_flutter/lib/src/attachment/link_preview_attachment.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ class DefaultStreamLinkPreviewAttachment extends StatelessWidget {
149149
mainAxisSize: .min,
150150
spacing: spacing.xxs,
151151
children: [
152-
Icon(icons.link12, size: 12),
152+
Icon(icons.link, size: 12),
153153
Expanded(
154154
child: Text(
155155
titleLink,

‎packages/stream_chat_flutter/lib/src/attachment/video_attachment.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ class DefaultStreamVideoAttachment extends StatelessWidget {
118118
child: Padding(
119119
padding: const EdgeInsets.all(12),
120120
child: Icon(
121-
context.streamIcons.playFill20,
121+
context.streamIcons.playFill,
122122
color: context.streamColorScheme.textOnAccent,
123123
),
124124
),

‎packages/stream_chat_flutter/lib/src/attachment/voice_recording_attachment.dart‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -362,10 +362,10 @@ class AudioControlButton extends StatelessWidget {
362362
size: size,
363363
themeStyle: themeStyle,
364364
icon: switch (state) {
365-
TrackState.loading => icons.playFill20,
366-
TrackState.idle => icons.playFill20,
367-
TrackState.playing => icons.pauseFill20,
368-
TrackState.paused => icons.playFill20,
365+
TrackState.loading => icons.playFill,
366+
TrackState.idle => icons.playFill,
367+
TrackState.playing => icons.pauseFill,
368+
TrackState.paused => icons.playFill,
369369
},
370370
onTap: switch (state) {
371371
TrackState.loading => null,

‎packages/stream_chat_flutter/lib/src/attachment_actions_modal/attachment_actions_modal.dart‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ class AttachmentActionsModal extends StatelessWidget {
112112
context,
113113
context.translations.replyLabel,
114114
Icon(
115-
context.streamIcons.reply20,
115+
context.streamIcons.reply,
116116
size: 24,
117117
color: theme.colorTheme.textLowEmphasis,
118118
),
@@ -123,7 +123,7 @@ class AttachmentActionsModal extends StatelessWidget {
123123
context,
124124
context.translations.showInChatLabel,
125125
Icon(
126-
context.streamIcons.eyeFill20,
126+
context.streamIcons.eyeFill,
127127
size: 24,
128128
color: theme.colorTheme.textHighEmphasis,
129129
),
@@ -136,7 +136,7 @@ class AttachmentActionsModal extends StatelessWidget {
136136
? context.translations.saveVideoLabel
137137
: context.translations.saveImageLabel,
138138
Icon(
139-
context.streamIcons.save20,
139+
context.streamIcons.save,
140140
size: 24,
141141
color: theme.colorTheme.textLowEmphasis,
142142
),
@@ -196,7 +196,7 @@ class AttachmentActionsModal extends StatelessWidget {
196196
context,
197197
context.translations.deleteLabel.sentenceCase,
198198
Icon(
199-
context.streamIcons.delete20,
199+
context.streamIcons.delete,
200200
size: 24,
201201
color: theme.colorTheme.accentError,
202202
),
@@ -329,7 +329,7 @@ class AttachmentActionsModal extends StatelessWidget {
329329
height: 100,
330330
width: 100,
331331
child: Icon(
332-
context.streamIcons.exclamationCircleFill20,
332+
context.streamIcons.exclamationCircleFill,
333333
color: theme.colorTheme.disabled,
334334
),
335335
)
@@ -339,7 +339,7 @@ class AttachmentActionsModal extends StatelessWidget {
339339
height: 160,
340340
width: 160,
341341
child: Icon(
342-
context.streamIcons.checkmark20,
342+
context.streamIcons.checkmark,
343343
color: theme.colorTheme.disabled,
344344
),
345345
)

‎packages/stream_chat_flutter/lib/src/bottom_sheets/edit_message_sheet.dart‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ class _EditMessageSheetState extends State<EditMessageSheet> {
9090
Padding(
9191
padding: const EdgeInsets.all(8),
9292
child: Icon(
93-
context.streamIcons.edit20,
93+
context.streamIcons.edit,
9494
color: streamChatThemeData.colorTheme.disabled,
9595
),
9696
),
@@ -101,7 +101,7 @@ class _EditMessageSheetState extends State<EditMessageSheet> {
101101
IconButton(
102102
visualDensity: VisualDensity.compact,
103103
icon: Icon(
104-
context.streamIcons.xmark16,
104+
context.streamIcons.xmark,
105105
color: streamChatThemeData.colorTheme.textLowEmphasis,
106106
),
107107
onPressed: Navigator.of(context).pop,

‎packages/stream_chat_flutter/lib/src/bottom_sheets/error_alert_sheet.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class ErrorAlertSheet extends StatelessWidget {
2626
height: 26,
2727
),
2828
Icon(
29-
context.streamIcons.exclamationCircleFill20,
29+
context.streamIcons.exclamationCircleFill,
3030
color: _streamChatTheme.colorTheme.accentError,
3131
size: 24,
3232
),

‎packages/stream_chat_flutter/lib/src/bottom_sheets/stream_channel_info_bottom_sheet.dart‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ class StreamChannelInfoBottomSheet extends StatelessWidget {
121121
leading: Padding(
122122
padding: const EdgeInsets.symmetric(horizontal: 16),
123123
child: Icon(
124-
context.streamIcons.user20,
124+
context.streamIcons.user,
125125
color: colorTheme.textLowEmphasis,
126126
),
127127
),
@@ -134,7 +134,7 @@ class StreamChannelInfoBottomSheet extends StatelessWidget {
134134
leading: Padding(
135135
padding: const EdgeInsets.symmetric(horizontal: 16),
136136
child: Icon(
137-
context.streamIcons.userRemove20,
137+
context.streamIcons.userRemove,
138138
color: colorTheme.textLowEmphasis,
139139
),
140140
),
@@ -145,7 +145,7 @@ class StreamChannelInfoBottomSheet extends StatelessWidget {
145145
leading: Padding(
146146
padding: const EdgeInsets.symmetric(horizontal: 16),
147147
child: Icon(
148-
context.streamIcons.delete20,
148+
context.streamIcons.delete,
149149
color: colorTheme.accentError,
150150
),
151151
),
@@ -157,7 +157,7 @@ class StreamChannelInfoBottomSheet extends StatelessWidget {
157157
leading: Padding(
158158
padding: const EdgeInsets.symmetric(horizontal: 16),
159159
child: Icon(
160-
context.streamIcons.xmark20,
160+
context.streamIcons.xmark,
161161
color: colorTheme.textLowEmphasis,
162162
),
163163
),

0 commit comments

Comments
 (0)