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

Merge pull request #207 from GetStream/qa3-fixes

Browse Source 
QA3 fixes
This commit is contained in:
Salvatore Giordano
2021-01-12 15:24:07 +01:00
committed by GitHub
parent 04902f6a81 80d8c48826
commit a6be5766dc
7 changed files with 438 additions and 434 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/src/message_widget.dart
+28 -16
View File
@@ -272,6 +272,12 @@ class _MessageWidgetState extends State<MessageWidget> {
widget.message.attachments?.any((element) => element.type == 'giphy') ==
true;
bool get hasNonUrlAttachments =>
widget.message.attachments
?.where((it) => it.ogScrapeUrl == null)
?.isNotEmpty ==
true;
bool get showBottomRow =>
showThreadReplyIndicator ||
showUsername ||
@@ -385,11 +391,8 @@ class _MessageWidgetState extends State<MessageWidget> {
),
shape: widget.shape ??
RoundedRectangleBorder(
side: isOnlyEmoji &&
!(showThreadReplyIndicator ||
showInChannel)
? BorderSide.none
: widget.borderSide ??
side:
widget.borderSide ??
BorderSide(
color: widget
.messageTheme
@@ -412,8 +415,9 @@ class _MessageWidgetState extends State<MessageWidget> {
children: <Widget>[
if (hasQuotedMessage)
_buildQuotedMessage(),
..._parseAttachments(
context),
if (hasNonUrlAttachments)
..._parseAttachments(
context),
if (widget.message.text
.trim()
.isNotEmpty &&
@@ -490,13 +494,21 @@ class _MessageWidgetState extends State<MessageWidget> {
widget.onQuotedMessageTap != null
? () => widget.onQuotedMessageTap(widget.message.quotedMessageId)
: null;
return QuotedMessageWidget(
onTap: onTap,
message: widget.message.quotedMessage,
messageTheme: isMyMessage
? StreamChatTheme.of(context).otherMessageTheme
: StreamChatTheme.of(context).ownMessageTheme,
reverse: widget.reverse,
return Padding(
padding: EdgeInsets.only(
right: 8,
left: 8,
top: 8,
bottom: hasNonUrlAttachments ? 8 : 0,
),
child: QuotedMessageWidget(
onTap: onTap,
message: widget.message.quotedMessage,
messageTheme: isMyMessage
? StreamChatTheme.of(context).otherMessageTheme
: StreamChatTheme.of(context).ownMessageTheme,
reverse: widget.reverse,
),
);
}
@@ -927,7 +939,7 @@ class _MessageWidgetState extends State<MessageWidget> {
? widget.messageTheme.copyWith(
messageText:
widget.messageTheme.messageText.copyWith(
fontSize: 40,
fontSize: 42,
))
: widget.messageTheme,
),
@@ -942,7 +954,7 @@ class _MessageWidgetState extends State<MessageWidget> {
);
}
bool get isOnlyEmoji => textIsOnlyEmoji(widget.message.text);
bool get isOnlyEmoji => widget.message.text.isOnlyEmoji;
Color _getBackgroundColor() {
if (hasQuotedMessage) {