[ReactionBubble] Add masked spacing

Signed-off-by: Sahil Kumar <[email protected]>

lib/src/message_reactions_modal.dart

@@ -232,6 +232,7 @@ class MessageReactionsModal extends StatelessWidget {
                     flipTail: !reverse,
                     borderColor: messageTheme.reactionsBorderColor,
                     backgroundColor: messageTheme.reactionsBackgroundColor,
+                    maskColor: messageTheme.reactionsMaskColor,
                     highlightOwnReactions: false,
                   ),
                 ),

lib/src/message_widget.dart

@@ -447,6 +447,9 @@ class _MessageWidgetState extends State<MessageWidget> {
                                                   StreamChatTheme.of(context)
                                                       .colorTheme
                                                       .white,
+                                                  StreamChatTheme.of(context)
+                                                      .colorTheme
+                                                      .white,
                                                 ),
                                               ),
                                             ),
@@ -694,6 +697,7 @@ class _MessageWidgetState extends State<MessageWidget> {
                 flipTail: widget.reverse,
                 backgroundColor: widget.messageTheme.reactionsBackgroundColor,
                 borderColor: widget.messageTheme.reactionsBorderColor,
+                maskColor: widget.messageTheme.reactionsMaskColor,
                 reactions: reactionsList,
               ),
             )

lib/src/reaction_bubble.dart

@@ -12,6 +12,7 @@ class ReactionBubble extends StatelessWidget {
     @required this.reactions,
     @required this.borderColor,
     @required this.backgroundColor,
+    @required this.maskColor,
     this.reverse = false,
     this.flipTail = false,
     this.highlightOwnReactions = true,
@@ -20,6 +21,7 @@ class ReactionBubble extends StatelessWidget {
   final List<Reaction> reactions;
   final Color borderColor;
   final Color backgroundColor;
+  final Color maskColor;
   final bool reverse;
   final bool flipTail;
   final bool highlightOwnReactions;
@@ -38,51 +40,58 @@ class ReactionBubble extends StatelessWidget {
           Transform.translate(
             offset: Offset(reverse ? offset : -offset, 0),
             child: Container(
-              padding: EdgeInsets.symmetric(
+              padding: const EdgeInsets.all(2),
-                vertical: 4,
-                horizontal: totalReactions > 1 ? 4 : 0,
-              ),
               decoration: BoxDecoration(
-                border: Border.all(
+                color: maskColor,
-                  color: borderColor,
-                ),
-                color: backgroundColor,
                 borderRadius: BorderRadius.all(Radius.circular(14)),
               ),
-              child: LayoutBuilder(
+              child: Container(
-                builder: (context, constraints) {
+                padding: EdgeInsets.symmetric(
-                  return Flex(
+                  vertical: 4,
-                    direction: Axis.horizontal,
+                  horizontal: totalReactions > 1 ? 4 : 0,
-                    mainAxisSize: MainAxisSize.min,
+                ),
-                    children: [
+                decoration: BoxDecoration(
-                      if (constraints.maxWidth < double.infinity)
+                  border: Border.all(
-                        ...reactions
+                    color: borderColor,
-                            .take((constraints.maxWidth) ~/ 22)
+                  ),
-                            .map((reaction) {
+                  color: backgroundColor,
-                          return _buildReaction(
+                  borderRadius: BorderRadius.all(Radius.circular(14)),
-                            reactionIcons,
+                ),
-                            reaction,
+                child: LayoutBuilder(
-                            context,
+                  builder: (context, constraints) {
-                          );
+                    return Flex(
-                        }).toList(),
+                      direction: Axis.horizontal,
-                      if (constraints.maxWidth == double.infinity)
+                      mainAxisSize: MainAxisSize.min,
-                        ...reactions.map((reaction) {
+                      children: [
-                          return _buildReaction(
+                        if (constraints.maxWidth < double.infinity)
-                            reactionIcons,
+                          ...reactions
-                            reaction,
+                              .take((constraints.maxWidth) ~/ 22)
-                            context,
+                              .map((reaction) {
-                          );
+                            return _buildReaction(
-                        }).toList(),
+                              reactionIcons,
-                    ],
+                              reaction,
-                  );
+                              context,
-                },
+                            );
+                          }).toList(),
+                        if (constraints.maxWidth == double.infinity)
+                          ...reactions.map((reaction) {
+                            return _buildReaction(
+                              reactionIcons,
+                              reaction,
+                              context,
+                            );
+                          }).toList(),
+                      ],
+                    );
+                  },
+                ),
               ),
             ),
           ),
           Positioned(
-            bottom: 0,
+            bottom: 2,
-            left: reverse ? null : 11,
+            left: reverse ? null : 13,
-            right: !reverse ? null : 11,
+            right: !reverse ? null : 13,
             child: _buildReactionsTail(context),
           ),
         ],
@@ -136,6 +145,7 @@ class ReactionBubble extends StatelessWidget {
       painter: ReactionBubblePainter(
         backgroundColor,
         borderColor,
+        maskColor,
       ),
     );
     return Transform(
@@ -149,14 +159,20 @@ class ReactionBubble extends StatelessWidget {
 class ReactionBubblePainter extends CustomPainter {
   final Color color;
   final Color borderColor;
+  final Color maskColor;
 
   ReactionBubblePainter(
     this.color,
     this.borderColor,
+    this.maskColor,
   );
 
   @override
   void paint(Canvas canvas, Size size) {
+    _drawOvalMask(size, canvas);
+
+    _drawMask(size, canvas);
+
     _drawOval(size, canvas);
 
     _drawOvalBorder(size, canvas);
@@ -166,6 +182,21 @@ class ReactionBubblePainter extends CustomPainter {
     _drawBorder(size, canvas);
   }
 
+  void _drawOvalMask(Size size, Canvas canvas) {
+    final paint = Paint()
+      ..color = maskColor
+      ..style = PaintingStyle.fill;
+
+    final path = Path();
+    path.addOval(
+      Rect.fromCircle(
+        center: Offset(4, 3),
+        radius: 4,
+      ),
+    );
+    canvas.drawPath(path, paint);
+  }
+
   void _drawOvalBorder(Size size, Canvas canvas) {
     final paint = Paint()
       ..color = borderColor
@@ -236,6 +267,27 @@ class ReactionBubblePainter extends CustomPainter {
     canvas.drawPath(path, paint);
   }
 
+  void _drawMask(Size size, Canvas canvas) {
+    final paint = Paint()
+      ..color = maskColor
+      ..strokeWidth = 1
+      ..style = PaintingStyle.fill;
+
+    final dy = -2.2;
+    final startAngle = 1.1;
+    final sweepAngle = 1.2;
+    final path = Path();
+    path.addArc(
+      Rect.fromCircle(
+        center: Offset(1, dy),
+        radius: 6,
+      ),
+      -pi * startAngle,
+      -pi / sweepAngle,
+    );
+    canvas.drawPath(path, paint);
+  }
+
   @override
   bool shouldRepaint(CustomPainter oldDelegate) {
     return true;

lib/src/stream_chat_theme.dart

@@ -234,6 +234,7 @@ class StreamChatThemeData {
         messageBackgroundColor: colorTheme.greyGainsboro,
         reactionsBackgroundColor: colorTheme.white,
         reactionsBorderColor: colorTheme.greyWhisper,
+        reactionsMaskColor: colorTheme.whiteSnow,
         messageBorderColor: colorTheme.greyGainsboro,
         avatarTheme: AvatarTheme(
           borderRadius: BorderRadius.circular(20),
@@ -249,6 +250,7 @@ class StreamChatThemeData {
       otherMessageTheme: MessageTheme(
         reactionsBackgroundColor: colorTheme.greyGainsboro,
         reactionsBorderColor: colorTheme.white,
+        reactionsMaskColor: colorTheme.whiteSnow,
         messageText: textTheme.body,
         createdAt: textTheme.footnote.copyWith(color: colorTheme.grey),
         replies: textTheme.footnoteBold.copyWith(color: accentColor),
@@ -710,6 +712,7 @@ class MessageTheme {
   final Color messageBorderColor;
   final Color reactionsBackgroundColor;
   final Color reactionsBorderColor;
+  final Color reactionsMaskColor;
   final AvatarTheme avatarTheme;
 
   const MessageTheme({
@@ -721,6 +724,7 @@ class MessageTheme {
     this.messageBorderColor,
     this.reactionsBackgroundColor,
     this.reactionsBorderColor,
+    this.reactionsMaskColor,
     this.avatarTheme,
     this.createdAt,
   });
@@ -736,6 +740,7 @@ class MessageTheme {
     AvatarTheme avatarTheme,
     Color reactionsBackgroundColor,
     Color reactionsBorderColor,
+    Color reactionsMaskColor,
   }) =>
       MessageTheme(
         messageText: messageText ?? this.messageText,
@@ -750,6 +755,7 @@ class MessageTheme {
         reactionsBackgroundColor:
             reactionsBackgroundColor ?? this.reactionsBackgroundColor,
         reactionsBorderColor: reactionsBorderColor ?? this.reactionsBorderColor,
+        reactionsMaskColor: reactionsMaskColor ?? this.reactionsMaskColor,
       );
 
   MessageTheme merge(MessageTheme other) {
@@ -767,6 +773,7 @@ class MessageTheme {
       avatarTheme: avatarTheme?.merge(other.avatarTheme) ?? other.avatarTheme,
       reactionsBackgroundColor: other.reactionsBackgroundColor,
       reactionsBorderColor: other.reactionsBorderColor,
+      reactionsMaskColor: other.reactionsMaskColor,
     );
   }
 }