Merge branches 'develop' and 'rfac/transform' of https://github.com/GetStream/stream-chat-flutter into rfac/transform

 Conflicts:
	packages/stream_chat_flutter/lib/src/deleted_message.dart
	packages/stream_chat_flutter/lib/src/message_widget.dart
This commit is contained in:
Deven Joshi
2021-05-14 12:33:42 +05:30
51 changed files with 1843 additions and 1839 deletions
@@ -121,6 +121,8 @@ class ReactionBubble extends StatelessWidget {
(r) => r.type == reaction.type,
);
final chatThemeData = StreamChatTheme.of(context);
final userId = StreamChat.of(context).user?.id;
return Padding(
padding: const EdgeInsets.symmetric(
horizontal: 4,
@@ -130,24 +132,16 @@ class ReactionBubble extends StatelessWidget {
assetName: reactionIcon.assetName,
width: 16,
height: 16,
color: (!highlightOwnReactions ||
reaction.user?.id == StreamChat.of(context).user?.id)
? StreamChatTheme.of(context).colorTheme.accentBlue
: StreamChatTheme.of(context)
.colorTheme
.black
.withOpacity(.5),
color: (!highlightOwnReactions || reaction.user?.id == userId)
? chatThemeData.colorTheme.accentBlue
: chatThemeData.colorTheme.black.withOpacity(.5),
)
: Icon(
Icons.help_outline_rounded,
size: 16,
color: (!highlightOwnReactions ||
reaction.user?.id == StreamChat.of(context).user?.id)
? StreamChatTheme.of(context).colorTheme.accentBlue
: StreamChatTheme.of(context)
.colorTheme
.black
.withOpacity(.5),
color: (!highlightOwnReactions || reaction.user?.id == userId)
? chatThemeData.colorTheme.accentBlue
: chatThemeData.colorTheme.black.withOpacity(.5),
),
);
}