From f1f86780f078afa3c5811ea2ce850da9652c4617 Mon Sep 17 00:00:00 2001 From: ggurdin <46800240+ggurdin@users.noreply.github.com> Date: Wed, 23 Jul 2025 15:11:20 -0400 Subject: [PATCH] Reaction spacing (#3546) * chore: fix mis-alignment for messages with emoji reactions * remove testing border * reaction spacing --- .../widgets/message_selection_positioner.dart | 2 +- .../toolbar/widgets/over_message_overlay.dart | 5 ----- .../toolbar/widgets/overlay_center_content.dart | 16 ++++++++++++---- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/lib/pangea/toolbar/widgets/message_selection_positioner.dart b/lib/pangea/toolbar/widgets/message_selection_positioner.dart index ab3ec0448..7f9a24d4f 100644 --- a/lib/pangea/toolbar/widgets/message_selection_positioner.dart +++ b/lib/pangea/toolbar/widgets/message_selection_positioner.dart @@ -151,7 +151,7 @@ class MessageSelectionPositionerState extends State return reactionsEvents.where((e) => !e.redacted).isNotEmpty; } - double get reactionsHeight => hasReactions ? 32.0 : 0.0; + double get reactionsHeight => hasReactions ? 28.0 : 0.0; bool get ownMessage => widget.event.senderId == widget.event.room.client.userID; diff --git a/lib/pangea/toolbar/widgets/over_message_overlay.dart b/lib/pangea/toolbar/widgets/over_message_overlay.dart index f61152096..06cb2371c 100644 --- a/lib/pangea/toolbar/widgets/over_message_overlay.dart +++ b/lib/pangea/toolbar/widgets/over_message_overlay.dart @@ -83,11 +83,6 @@ class OverMessageOverlay extends StatelessWidget { width: controller.mediaQuery!.size.width - controller.columnWidth - (controller.showDetails ? FluffyThemes.columnWidth : 0), - decoration: BoxDecoration( - border: Border.all( - color: Colors.green, - ), - ), ), ], ), diff --git a/lib/pangea/toolbar/widgets/overlay_center_content.dart b/lib/pangea/toolbar/widgets/overlay_center_content.dart index 3c28384a4..ba088c97b 100644 --- a/lib/pangea/toolbar/widgets/overlay_center_content.dart +++ b/lib/pangea/toolbar/widgets/overlay_center_content.dart @@ -2,6 +2,7 @@ import 'package:flutter/material.dart'; import 'package:matrix/matrix.dart'; +import 'package:fluffychat/config/themes.dart'; import 'package:fluffychat/pages/chat/chat.dart'; import 'package:fluffychat/pages/chat/events/message_reactions.dart'; import 'package:fluffychat/pangea/toolbar/enums/reading_assistance_mode_enum.dart'; @@ -49,6 +50,7 @@ class OverlayCenterContent extends StatelessWidget { @override Widget build(BuildContext context) { + final ownMessage = event.senderId == event.room.client.userID; return IgnorePointer( ignoring: !isTransitionAnimation && readingAssistanceMode != ReadingAssistanceMode.practiceMode, @@ -83,10 +85,16 @@ class OverlayCenterContent extends StatelessWidget { ), ), if (hasReactions) - Padding( - padding: const EdgeInsets.all(4), - child: SizedBox( - height: 20, + AnimatedSize( + duration: FluffyThemes.animationDuration, + curve: FluffyThemes.animationCurve, + alignment: Alignment.bottomCenter, + child: Padding( + padding: EdgeInsets.only( + top: 4.0, + left: 4.0, + right: ownMessage ? 0 : 12.0, + ), child: MessageReactions( event, chatController.timeline!,