Merge branch 'master' into feature/new-ui

This commit is contained in:
Salvatore Giordano
2020-11-11 12:09:16 +01:00
4 changed files with 21 additions and 9 deletions
+5 -1
View File
@@ -24,7 +24,11 @@ class MessageText extends StatelessWidget {
final text = _replaceMentions(message.text);
return MarkdownBody(
data: text,
onTapLink: (text, link, title) {
onTapLink: (
String link,
String href,
String title,
) {
if (link.startsWith('@')) {
final mentionedUser = message.mentionedUsers.firstWhere(
(u) => '@${u.name.replaceAll(' ', '')}' == link,
+4 -1
View File
@@ -24,6 +24,9 @@ class UserAvatar extends StatelessWidget {
@override
Widget build(BuildContext context) {
final hasImage = user.extraData?.containsKey('image') == true &&
user.extraData['image'] != null &&
user.extraData['image'] != '';
return GestureDetector(
onTap: onTap != null
? () {
@@ -49,7 +52,7 @@ class UserAvatar extends StatelessWidget {
decoration: BoxDecoration(
color: StreamChatTheme.of(context).accentColor,
),
child: user.extraData?.containsKey('image') ?? false
child: hasImage
? CachedNetworkImage(
imageUrl: user.extraData['image'],
errorWidget: (_, __, ___) {