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

fix: fixed null sometimes popping up

Browse Source
This commit is contained in:
Deven Joshi
2021-01-06 17:00:56 +05:30
parent a8c60a8482
commit 1927a632e0
2 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/src/channel_preview.dart
+8 -4
View File
@@ -269,14 +269,18 @@ class ChannelPreview extends StatelessWidget {
var textList = text.split(' '); var textList = text.split(' ');
List<TextSpan> resList = []; List<TextSpan> resList = [];
for (var e in textList) { for (var e in textList) {
if (mentions.any((element) => '@${element.name}' == e)) { if (mentions != null &&
mentions.isNotEmpty &&
mentions.any((element) => '@${element.name}' == e)) {
resList.add(TextSpan( resList.add(TextSpan(
text: '$e ', text: '$e ',
style: mentionsTextStyle, style: mentionsTextStyle,
)); ));
} else if (attachments } else if (attachments != null &&
.where((e) => e.title != null) attachments.isNotEmpty &&
.any((element) => element.title == e)) { attachments
.where((e) => e.title != null)
.any((element) => element.title == e)) {
resList.add(TextSpan( resList.add(TextSpan(
text: '$e ', text: '$e ',
style: normalTextStyle.copyWith(fontStyle: FontStyle.italic), style: normalTextStyle.copyWith(fontStyle: FontStyle.italic),
lib/src/message_search_item.dart
+8 -4
View File
@@ -165,14 +165,18 @@ class MessageSearchItem extends StatelessWidget {
var textList = text.split(' '); var textList = text.split(' ');
List<TextSpan> resList = []; List<TextSpan> resList = [];
for (var e in textList) { for (var e in textList) {
if (mentions.any((element) => '@${element.name}' == e)) { if (mentions != null &&
mentions.isNotEmpty &&
mentions.any((element) => '@${element.name}' == e)) {
resList.add(TextSpan( resList.add(TextSpan(
text: '$e ', text: '$e ',
style: mentionsTextStyle, style: mentionsTextStyle,
)); ));
} else if (attachments } else if (attachments != null &&
.where((e) => e.title != null) attachments.isNotEmpty &&
.any((element) => element.title == e)) { attachments
.where((e) => e.title != null)
.any((element) => element.title == e)) {
resList.add(TextSpan( resList.add(TextSpan(
text: '$e ', text: '$e ',
style: normalTextStyle.copyWith(fontStyle: FontStyle.italic), style: normalTextStyle.copyWith(fontStyle: FontStyle.italic),