talksik/stream-chat-flutter
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into feature/notifications

Browse Source 
# Conflicts:
#	CHANGELOG.md
#	README.md
#	pubspec.yaml
This commit is contained in:
Salvatore Giordano
2020-04-16 09:36:49 +02:00
parent b7ad70f6cd a46935ec80
commit 0f06a4923a
2 changed files with 68 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/src/message_input.dart
+52 -62
View File
@@ -280,37 +280,33 @@ class _MessageInputState extends State<MessageInput> {
],
color: StreamChatTheme.of(context).primaryColor,
),
child: Flex(
mainAxisSize: MainAxisSize.min,
direction: Axis.vertical,
children: <Widget>[
ListView(
padding: const EdgeInsets.all(0),
shrinkWrap: true,
children: commands
.map((c) => ListTile(
title: Text.rich(
TextSpan(
text: '${c.name}',
style: TextStyle(fontWeight: FontWeight.bold),
children: [
TextSpan(
text: ' ${c.args}',
style: TextStyle(
fontWeight: FontWeight.w300,
),
),
],
child: ListView(
padding: const EdgeInsets.all(0),
shrinkWrap: true,
children: commands
.map(
(c) => ListTile(
title: Text.rich(
TextSpan(
text: '${c.name}',
style: TextStyle(fontWeight: FontWeight.bold),
children: [
TextSpan(
text: ' ${c.args}',
style: TextStyle(
fontWeight: FontWeight.w300,
),
),
subtitle: Text(c.description),
onTap: () {
_setCommand(c);
},
))
.toList(),
),
],
],
),
),
subtitle: Text(c.description),
onTap: () {
_setCommand(c);
},
),
)
.toList(),
),
),
),
@@ -351,41 +347,35 @@ class _MessageInputState extends State<MessageInput> {
],
color: StreamChatTheme.of(context).primaryColor,
),
child: Flex(
mainAxisSize: MainAxisSize.min,
direction: Axis.vertical,
children: <Widget>[
ListView(
padding: const EdgeInsets.all(0),
shrinkWrap: true,
children: members
.map((m) => ListTile(
leading: UserAvatar(
user: m.user,
child: ListView(
padding: const EdgeInsets.all(0),
shrinkWrap: true,
children: members
.map((m) => ListTile(
leading: UserAvatar(
user: m.user,
),
title: Text('${m.user.name}'),
onTap: () {
_mentionedUsers.add(m.user);
splits[splits.length - 1] = m.user.name;
final rejoin = splits.join('@');
_textController.value = TextEditingValue(
text: rejoin +
_textController.text
.substring(_textController.selection.start),
selection: TextSelection.collapsed(
offset: rejoin.length,
),
title: Text('${m.user.name}'),
onTap: () {
_mentionedUsers.add(m.user);
);
splits[splits.length - 1] = m.user.name;
final rejoin = splits.join('@');
_textController.value = TextEditingValue(
text: rejoin +
_textController.text.substring(
_textController.selection.start),
selection: TextSelection.collapsed(
offset: rejoin.length,
),
);
_mentionsOverlay?.remove();
_mentionsOverlay = null;
},
))
.toList(),
),
],
_mentionsOverlay?.remove();
_mentionsOverlay = null;
},
))
.toList(),
),
),
),
lib/src/message_widget.dart
+16
View File
@@ -1023,6 +1023,22 @@ class _MessageWidgetState extends State<MessageWidget>
);
}
Widget _buildErrorImage(Attachment attachment) {
return Center(
child: Container(
width: 200,
height: 140,
color: Color(0xffd0021B).withOpacity(.1),
child: Center(
child: Icon(
Icons.error_outline,
color: Colors.white,
),
),
),
);
}
Widget _buildVideo(
Attachment attachment,
) {