Skip to content

Commit 82a57d0

Browse files
committed
fixup! TW-2074 Update bubble style and alignement
1 parent 86733ab commit 82a57d0

File tree

2 files changed

+13
-16
lines changed

2 files changed

+13
-16
lines changed

lib/pages/chat/events/message/message_content_with_timestamp_builder.dart

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -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
}

lib/pages/chat/events/message/message_style.dart

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,5 +146,12 @@ class MessageStyle {
146146
static const double pushpinIconSize = 14.0;
147147

148148
static const double paddingAllPushpin = 0;
149-
static const Color borderColorReceivedBubbleMobile = Color(0xFFEBEDF0);
149+
static const Color borderColorReceivedBubble = Color(0xFFEBEDF0);
150+
static MainAxisAlignment messageAlignment(
151+
Event event,
152+
BuildContext context,
153+
) =>
154+
responsiveUtils.isMobile(context) && event.isOwnMessage
155+
? MainAxisAlignment.end
156+
: MainAxisAlignment.start;
150157
}

0 commit comments

Comments
 (0)