@@ -74,12 +74,9 @@ class MessageContentWithTimestampBuilder extends StatelessWidget {
7474
7575 return Row (
7676 mainAxisSize: MainAxisSize .min,
77- mainAxisAlignment: responsiveUtils.isMobile (context) && event.isOwnMessage
78- ? MainAxisAlignment .end
79- : MainAxisAlignment .start,
77+ mainAxisAlignment: MessageStyle .messageAlignment (event, context),
8078 crossAxisAlignment: CrossAxisAlignment .end,
8179 children: [
82- if (event.isOwnMessage) _menuActionsRowBuilder (context),
8380 TwakeContextMenuArea (
8481 builder: menuChildren != null
8582 ? (context) => menuChildren! .call (context)
@@ -111,16 +108,10 @@ class MessageContentWithTimestampBuilder extends StatelessWidget {
111108 borderRadius: MessageStyle .bubbleBorderRadius,
112109 color: event.isOwnMessage
113110 ? LinagoraRefColors .material ().primary[95 ]
114- : responsiveUtils.isMobile (context)
115- ? LinagoraSysColors .material ().onPrimary
116- : Theme .of (context)
117- .colorScheme
118- .surfaceContainerHighest,
119- border: ! event.isOwnMessage &&
120- responsiveUtils.isMobile (context)
111+ : LinagoraSysColors .material ().onPrimary,
112+ border: ! event.isOwnMessage
121113 ? Border .all (
122- color: MessageStyle
123- .borderColorReceivedBubbleMobile,
114+ color: MessageStyle .borderColorReceivedBubble,
124115 )
125116 : null ,
126117 ),
@@ -215,8 +206,7 @@ class MessageContentWithTimestampBuilder extends StatelessWidget {
215206 ),
216207 ),
217208 ),
218- if (! event.isOwnMessage && event.status.isAvailable)
219- _menuActionsRowBuilder (context),
209+ if (event.status.isAvailable) _menuActionsRowBuilder (context),
220210 ],
221211 );
222212 }
0 commit comments