Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions lib/pages/chat/chat_event_list.dart
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,7 @@ class ChatEventList extends StatelessWidget {
previousEvent: previousEvent,
wallpaperMode: hasWallpaper,
scrollController: controller.scrollController,
controller: controller,
colors: colors,
isCollapsed: isCollapsed,
onExpand: canExpand
Expand Down
8 changes: 6 additions & 2 deletions lib/pages/chat/events/message.dart
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import 'package:swipe_to_action/swipe_to_action.dart';

import 'package:fluffychat/config/themes.dart';
import 'package:fluffychat/l10n/l10n.dart';
import 'package:fluffychat/pages/chat/chat.dart';
import 'package:fluffychat/pages/chat/events/room_creation_state_event.dart';
import 'package:fluffychat/utils/adaptive_bottom_sheet.dart';
import 'package:fluffychat/utils/date_time_extension.dart';
Expand Down Expand Up @@ -43,6 +44,7 @@ class Message extends StatelessWidget {
final void Function()? resetAnimateIn;
final bool wallpaperMode;
final ScrollController scrollController;
final ChatController controller;
final List<Color> colors;
final void Function()? onExpand;
final bool isCollapsed;
Expand All @@ -67,6 +69,7 @@ class Message extends StatelessWidget {
this.wallpaperMode = false,
required this.onMention,
required this.scrollController,
required this.controller,
required this.colors,
this.onExpand,
this.isCollapsed = false,
Expand Down Expand Up @@ -852,7 +855,8 @@ class Message extends StatelessWidget {
AnimatedSize(
duration: FluffyThemes.animationDuration,
curve: FluffyThemes.animationCurve,
alignment: Alignment.bottomCenter,
alignment:
ownMessage ? Alignment.bottomRight : Alignment.bottomLeft,
child: !showReceiptsRow
? const SizedBox.shrink()
: Padding(
Expand All @@ -861,7 +865,7 @@ class Message extends StatelessWidget {
left: (ownMessage ? 0 : Avatar.defaultSize) + 12.0,
right: ownMessage ? 0 : 12.0,
),
child: MessageReactions(event, timeline),
child: MessageReactions(event, timeline, controller),
),
),
if (displayReadMarker)
Expand Down
Loading