Refactoring modal alignment logic

packages/stream_chat_flutter/lib/src/message_actions_modal/message_actions_modal.dart

@@ -98,15 +98,11 @@ class _MessageActionsModalState extends State<MessageActionsModal> {
 
   Widget _showMessageOptionsModal() {
     final mediaQueryData = MediaQuery.of(context);
-    final size = mediaQueryData.size;
     final user = StreamChat.of(context).currentUser;
     final orientation = mediaQueryData.orientation;
 
-    final roughMaxSize = size.width * 2 / 3;
     final fontSize = widget.messageTheme.messageTextStyle?.fontSize;
     final streamChatThemeData = StreamChatTheme.of(context);
-    final numberOfReactions =
-        StreamChatConfiguration.of(context).reactionIcons.length;
 
     final channel = StreamChannel.of(context).channel;
 
@@ -125,13 +121,11 @@ class _MessageActionsModalState extends State<MessageActionsModal> {
                   builder: (context, constraints) {
                     return Align(
                       alignment: Alignment(
-                        calculateReactionsHorizontalAlignmentValue(
+                        calculateReactionsHorizontalAlignment(
                           user,
                           widget.message,
                           constraints,
-                          roughMaxSize,
                           fontSize,
-                          numberOfReactions,
                           orientation,
                         ),
                         0,

packages/stream_chat_flutter/lib/src/message_widget/reactions/message_reactions_modal.dart

@@ -40,17 +40,13 @@ class StreamMessageReactionsModal extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final size = MediaQuery.of(context).size;
     final user = StreamChat.of(context).currentUser;
     final _userPermissions = StreamChannel.of(context).channel.ownCapabilities;
     final orientation = MediaQuery.of(context).orientation;
 
     final hasReactionPermission =
         _userPermissions.contains(PermissionType.sendReaction);
-    final roughMaxSize = size.width * 2 / 3;
     final fontSize = messageTheme.messageTextStyle?.fontSize;
-    final numberOfReactions =
-        StreamChatConfiguration.of(context).reactionIcons.length;
 
     final child = Center(
       child: SingleChildScrollView(
@@ -66,13 +62,11 @@ class StreamMessageReactionsModal extends StatelessWidget {
                   builder: (context, constraints) {
                     return Align(
                       alignment: Alignment(
-                        calculateReactionsHorizontalAlignmentValue(
+                        calculateReactionsHorizontalAlignment(
                           user,
                           message,
                           constraints,
-                          roughMaxSize,
                           fontSize,
-                          numberOfReactions,
                           orientation,
                         ),
                         0,

packages/stream_chat_flutter/lib/src/message_widget/reactions/reactions_align.dart

@@ -2,129 +2,47 @@ import 'package:flutter/material.dart';
 import 'package:stream_chat_flutter/stream_chat_flutter.dart';
 
 /// This method calculates the align that the modal of reactions should have.
-/// THis is an approximation based on the size of the message and the
+/// This is an approximation based on the size of the message and the
 /// available space in the screen.
-double calculateReactionsHorizontalAlignmentValue(
+double calculateReactionsHorizontalAlignment(
   User? user,
   Message message,
   BoxConstraints constraints,
-  double maxSize,
   double? fontSize,
-  int reactionsCount,
   Orientation orientation,
 ) {
-  final shiftFactor = reactionsCount < 5 ? (5 - reactionsCount) * 0.1 : 0.0;
   final maxWidth = constraints.maxWidth;
-  final maxHeight = constraints.maxHeight;
 
   final roughSentenceSize = message.roughMessageSize(fontSize);
-  print('roughSentenceSize: $roughSentenceSize');
-  print('maxSize: $maxSize');
   final hasAttachments = message.attachments.isNotEmpty;
   final isReply = message.quotedMessageId != null;
   final isAttachment = hasAttachments && !isReply;
-  final divFactor = isAttachment
-      ? 1
-      : (roughSentenceSize == 0 ? 1 : (roughSentenceSize / maxSize));
 
-  if (orientation == Orientation.portrait) {
-    return _portraitAlign(
-      user,
-      message,
-      maxWidth,
-      maxHeight,
-      shiftFactor,
-      divFactor,
-      isAttachment,
-    );
-  } else {
-    return _landScapeAlign(
-      user,
-      message,
-      maxWidth,
-      maxHeight,
-      shiftFactor,
-      divFactor,
-      isAttachment,
-    );
-  }
-}
+  // divFactor is the percentage of the available space that the message takes.
+  // When the divFactor is bigger than 0.5 that means that the messages is
+  // bigger than 50% of the available space and the modal should have an offset
+  // in the direction that the message grows. When the divFactor is smaller
+  // than 0.5 then the offset should be to he side opposite of the message
+  // growth.
+  // In resume, when divFactor > 0.5 then result > 0, when divFactor < 0.5
+  // then result < 0.
+  var divFactor = 0.5;
 
-double _portraitAlign(
-  User? user,
-  Message message,
-  double maxWidth,
-  double maxHeight,
-  double shiftFactor,
-  num divFactor,
-  bool isAttachment,
-) {
-  var result = 0.0;
-
-  // This is an empiric value. This number tries to approximate all the
-  // offset necessary for the position of reaction look the best way
-  // possible.
-  const constant = 1300;
-
-  print('is attachment: $isAttachment');
-  print('shiftFactor: $shiftFactor');
-  print('divFactor: $divFactor');
-
-  if (user?.id == message.user?.id) {
-    if (divFactor >= 1.0 || isAttachment) {
-      result = shiftFactor - maxWidth / constant;
-    } else {
-      // Small messages, it is simpler to align then.
-      result = 1.2 - divFactor;
-    }
-  } else {
-    if (divFactor >= 1.0 || isAttachment) {
-      result = shiftFactor + maxWidth / constant;
-    } else {
-      result = -(1.2 - divFactor);
-    }
-  }
-
-  return _capResult(result);
-}
-
-double _landScapeAlign(
-  User? user,
-  Message message,
-  double maxWidth,
-  double maxHeight,
-  double shiftFactor,
-  num divFactor,
-  bool isAttachment,
-) {
-  var result = 0.0;
-
-  print('is attachment: $isAttachment');
-  print('shiftFactor: $shiftFactor');
-  print('divFactor: $divFactor');
-
-  /*
-   This is an empiric value. This number tries to approximate all the
-   offset necessary for the position of reaction look the best way
-   possible.
-  */
+  // When in portrait, attachments normally take 75% of the screen, when in
+  // landscape, attachments normally take 50% of the screen. 
   if (isAttachment) {
-    result = 0;
-  } else if (user?.id == message.user?.id) {
-    if (divFactor >= 1.3) {
-      result = 0;
+    if (orientation == Orientation.portrait) {
+      divFactor = 0.75;
     } else {
-      // Small messages, it is simpler to align then.
-      result = 1 - divFactor * 0.6;
+      divFactor = 0.5;
     }
   } else {
-    if (divFactor >= 1.3) {
-      result = 0;
-    } else {
-      result = -(1 - divFactor * 0.6);
-    }
+    divFactor = roughSentenceSize == 0 ? 0.5 : (roughSentenceSize / maxWidth);
   }
 
+  final signal = user?.id == message.user?.id ? 1 : -1;
+  final result = signal * (1 - divFactor * 2.0);
+
   return _capResult(result);
 }
 

packages/stream_chat_flutter/lib/src/utils/extensions.dart

@@ -384,9 +384,9 @@ extension MessageX on Message {
 
     // Quoted message have a smaller font, so it is necessary to reduce the
     // size of the multiplier to count for the smaller font.
-    var multiplier = 1.2;
+    var multiplier = 0.55;
     if (quotedMessage != null) {
-      multiplier = 1;
+      multiplier = 0.45;
     }
 
     return messageTextLength * (fontSize ?? 1) * multiplier;