From 3c2cf1f6e51f1b68fbf19935c099dc56fb6158d0 Mon Sep 17 00:00:00 2001 From: Christian Pauly Date: Sat, 9 May 2020 13:40:55 +0000 Subject: [PATCH] Fix #55 --- lib/components/list_items/message.dart | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/components/list_items/message.dart b/lib/components/list_items/message.dart index 350caae..71b760b 100644 --- a/lib/components/list_items/message.dart +++ b/lib/components/list_items/message.dart @@ -41,8 +41,8 @@ class Message extends StatelessWidget { final bool ownMessage = event.senderId == client.userID; Alignment alignment = ownMessage ? Alignment.topRight : Alignment.topLeft; Color color = Theme.of(context).secondaryHeaderColor; - final bool sameSender = nextEvent != null && - [EventTypes.Message, EventTypes.Sticker].contains(nextEvent.type) + final bool isImage = [EventTypes.Message, EventTypes.Sticker].contains(nextEvent.type); + final bool sameSender = nextEvent != null && isImage ? nextEvent.sender.id == event.sender.id : false; BubbleNip nip = sameSender @@ -56,7 +56,7 @@ class Message extends StatelessWidget { MainAxisAlignment rowMainAxisAlignment = ownMessage ? MainAxisAlignment.end : MainAxisAlignment.start; - if (event.showThumbnail) { + if (isImage && event.showThumbnail) { color = Theme.of(context).scaffoldBackgroundColor.withOpacity(0.66); textColor = Theme.of(context).textTheme.bodyText2.color; } else if (ownMessage) {