Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions assets/Icon_LOL_reaction.svg

This file was deleted.

3 changes: 0 additions & 3 deletions assets/Icon_love_reaction.svg

This file was deleted.

3 changes: 0 additions & 3 deletions assets/Icon_thumbs_down_reaction.svg

This file was deleted.

3 changes: 0 additions & 3 deletions assets/Icon_thumbs_up_reaction.svg

This file was deleted.

3 changes: 0 additions & 3 deletions assets/Icon_wut_reaction.svg

This file was deleted.

3 changes: 0 additions & 3 deletions assets/icon_edit.svg

This file was deleted.

5 changes: 0 additions & 5 deletions assets/icon_user_minus.svg

This file was deleted.

Binary file added fonts/stream-icons.ttf
Binary file not shown.
13 changes: 6 additions & 7 deletions lib/src/channel_bottom_sheet.dart
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:flutter_svg/flutter_svg.dart';
import 'package:line_awesome_icons/line_awesome_icons.dart';
import 'package:stream_chat/stream_chat.dart';
import 'package:stream_chat_flutter/src/stream_icons.dart';
import 'package:stream_chat_flutter/src/utils.dart';

import 'channel_info.dart';
Expand Down Expand Up @@ -75,7 +74,7 @@ class ChannelBottomSheet extends StatelessWidget {
builder: (context, snapshot) {
return ListTile(
leading: Icon(
LineAwesomeIcons.volume_off,
StreamIcons.mute,
size: 22,
color: StreamChatTheme.of(context).primaryIconTheme.color,
),
Expand All @@ -95,10 +94,10 @@ class ChannelBottomSheet extends StatelessWidget {
Divider(),
if (channel.isGroup && !channel.isDistinct)
ListTile(
leading: SvgPicture.asset(
'assets/icon_user_minus.svg',
package: 'stream_chat_flutter',
width: 22,
leading: Icon(
StreamIcons.user_minus,
size: 22,
color: Colors.black,
),
title: Text('Leave Group'),
onTap: () async {
Expand Down
12 changes: 2 additions & 10 deletions lib/src/channel_list_view.dart
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@ import 'dart:convert';
import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
import 'package:flutter_slidable/flutter_slidable.dart';
import 'package:flutter_svg/flutter_svg.dart';
import 'package:line_awesome_icons/line_awesome_icons.dart';
import 'package:stream_chat/stream_chat.dart';
import 'package:stream_chat_flutter/src/channels_bloc.dart';
import 'package:stream_chat_flutter/src/utils.dart';
Expand Down Expand Up @@ -362,7 +360,7 @@ class _ChannelListViewState extends State<ChannelListView>
),
IconSlideAction(
color: backgroundColor,
icon: LineAwesomeIcons.volume_off,
icon: StreamIcons.mute,
onTap: () async {
if (!channel.isMuted) {
await channel.mute();
Expand All @@ -374,13 +372,7 @@ class _ChannelListViewState extends State<ChannelListView>
if (channel.isGroup && !channel.isDistinct)
IconSlideAction(
color: backgroundColor,
iconWidget: SvgPicture.asset(
'assets/icon_user_minus.svg',
package: 'stream_chat_flutter',
color:
StreamChatTheme.of(context).primaryIconTheme.color,
width: 22,
),
icon: StreamIcons.user_minus,
onTap: () async {
final confirm = await showConfirmationDialog(
context,
Expand Down
7 changes: 3 additions & 4 deletions lib/src/channel_preview.dart
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import 'package:flutter/material.dart';
import 'package:flutter/widgets.dart';
import 'package:jiffy/jiffy.dart';
import 'package:line_awesome_icons/line_awesome_icons.dart';
import 'package:stream_chat/stream_chat.dart';
import 'package:stream_chat_flutter/src/unread_indicator.dart';

Expand Down Expand Up @@ -145,11 +144,11 @@ class ChannelPreview extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.end,
children: <Widget>[
Icon(
LineAwesomeIcons.volume_off,
size: 15,
StreamIcons.mute,
size: 16,
),
Text(
'Channel is muted',
' Channel is muted',
style: StreamChatTheme.of(context)
.channelPreviewTheme
.subtitle
Expand Down
15 changes: 6 additions & 9 deletions lib/src/message_actions_modal.dart
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import 'dart:ui';

import 'package:flutter/material.dart';
import 'package:flutter_svg/flutter_svg.dart';
import 'package:stream_chat/stream_chat.dart';
import 'package:stream_chat_flutter/src/reaction_picker.dart';
import 'package:stream_chat_flutter/src/stream_channel.dart';
import 'package:stream_chat_flutter/src/stream_icons.dart';

import 'message_input.dart';
import 'message_widget.dart';
Expand Down Expand Up @@ -129,7 +129,7 @@ class MessageActionsModal extends StatelessWidget {
Theme.of(context).textTheme.headline6.copyWith(color: Colors.red),
),
leading: Icon(
Icons.delete_outline,
StreamIcons.delete,
color: Colors.red,
),
onTap: () {
Expand All @@ -148,12 +148,9 @@ class MessageActionsModal extends StatelessWidget {
'Edit message',
style: Theme.of(context).textTheme.headline6,
),
leading: SvgPicture.asset(
'assets/icon_edit.svg',
alignment: Alignment.center,
package: 'stream_chat_flutter',
leading: Icon(
StreamIcons.edit,
color: StreamChatTheme.of(context).primaryIconTheme.color,
width: 24,
),
onTap: () async {
Navigator.pop(context);
Expand Down Expand Up @@ -255,11 +252,11 @@ class MessageActionsModal extends StatelessWidget {
Widget _buildReplyButton(BuildContext context) {
return ListTile(
title: Text(
'Start a thread',
'Thread reply',
style: Theme.of(context).textTheme.headline6,
),
leading: Icon(
Icons.reply,
StreamIcons.Thread_Reply,
color: StreamChatTheme.of(context).primaryIconTheme.color,
),
onTap: () {
Expand Down
12 changes: 6 additions & 6 deletions lib/src/reaction_asset.dart
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
class ReactionAsset {
import 'package:flutter/material.dart';

class ReactionIcon {
final String type;
final String svgAsset;
final String package;
final IconData iconData;

ReactionAsset({
ReactionIcon({
this.type,
this.svgAsset,
this.package,
this.iconData,
});
}
10 changes: 4 additions & 6 deletions lib/src/reaction_bubble.dart
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import 'dart:math';

import 'package:flutter/material.dart';
import 'package:flutter_svg/svg.dart';
import 'package:stream_chat_flutter/stream_chat_flutter.dart';

class ReactionBubble extends StatelessWidget {
Expand All @@ -22,7 +21,7 @@ class ReactionBubble extends StatelessWidget {

@override
Widget build(BuildContext context) {
final reactionAssets = StreamChatTheme.of(context).reactionAssets;
final reactionAssets = StreamChatTheme.of(context).reactionIcons;
return Transform(
transform: Matrix4.rotationY(reverse ? pi : 0),
alignment: Alignment.center,
Expand Down Expand Up @@ -55,10 +54,9 @@ class ReactionBubble extends StatelessWidget {
);
}

return SvgPicture.asset(
reactionAsset.svgAsset,
package: reactionAsset.package,
height: 16,
return Icon(
reactionAsset.iconData,
size: 16,
color: StreamChatTheme.of(context).accentColor,
);
}).toList(),
Expand Down
14 changes: 6 additions & 8 deletions lib/src/reaction_picker.dart
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import 'package:flutter/material.dart';
import 'package:flutter_svg/flutter_svg.dart';

import '../stream_chat_flutter.dart';

Expand All @@ -23,7 +22,7 @@ class ReactionPicker extends StatelessWidget {

@override
Widget build(BuildContext context) {
final reactionAssets = StreamChatTheme.of(context).reactionAssets;
final reactionAssets = StreamChatTheme.of(context).reactionIcons;
return Material(
color: messageTheme.ownReactionsBackgroundColor,
clipBehavior: Clip.hardEdge,
Expand All @@ -34,15 +33,14 @@ class ReactionPicker extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.center,
mainAxisSize: MainAxisSize.min,
children: reactionAssets.map((reactionAsset) {
children: reactionAssets.map((reactionIcon) {
final ownReactionIndex = message.ownReactions?.indexWhere(
(reaction) => reaction.type == reactionAsset.type) ??
(reaction) => reaction.type == reactionIcon.type) ??
-1;
return IconButton(
iconSize: 24,
icon: SvgPicture.asset(
reactionAsset.svgAsset,
package: reactionAsset.package,
icon: Icon(
reactionIcon.iconData,
color: ownReactionIndex != -1
? StreamChatTheme.of(context).accentColor
: Theme.of(context).iconTheme.color,
Expand All @@ -56,7 +54,7 @@ class ReactionPicker extends StatelessWidget {
} else {
sendReaction(
context,
reactionAsset.type,
reactionIcon.type,
);
}
},
Expand Down
Loading