|
|
|
@ -117,7 +117,10 @@ class Message extends StatelessWidget {
|
|
|
|
|
: Theme.of(context).colorScheme.primaryContainer;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
final rowChildren = <Widget>[
|
|
|
|
|
final row = Row(
|
|
|
|
|
crossAxisAlignment: CrossAxisAlignment.start,
|
|
|
|
|
mainAxisAlignment: rowMainAxisAlignment,
|
|
|
|
|
children: [
|
|
|
|
|
sameSender || ownMessage
|
|
|
|
|
? SizedBox(
|
|
|
|
|
width: Avatar.defaultSize,
|
|
|
|
@ -141,7 +144,8 @@ class Message extends StatelessWidget {
|
|
|
|
|
: FutureBuilder<User?>(
|
|
|
|
|
future: event.fetchSenderUser(),
|
|
|
|
|
builder: (context, snapshot) {
|
|
|
|
|
final user = snapshot.data ?? event.senderFromMemoryOrFallback;
|
|
|
|
|
final user =
|
|
|
|
|
snapshot.data ?? event.senderFromMemoryOrFallback;
|
|
|
|
|
return Avatar(
|
|
|
|
|
mxContent: user.avatarUrl,
|
|
|
|
|
name: user.calcDisplayname(),
|
|
|
|
@ -187,13 +191,6 @@ class Message extends StatelessWidget {
|
|
|
|
|
color: noBubble ? Colors.transparent : color,
|
|
|
|
|
borderRadius: borderRadius,
|
|
|
|
|
clipBehavior: Clip.antiAlias,
|
|
|
|
|
child: InkWell(
|
|
|
|
|
onHover: (b) => useMouse = true,
|
|
|
|
|
onTap: !useMouse && longPressSelect
|
|
|
|
|
? () {}
|
|
|
|
|
: () => onSelect!(event),
|
|
|
|
|
onLongPress: !longPressSelect ? null : () => onSelect!(event),
|
|
|
|
|
borderRadius: borderRadius,
|
|
|
|
|
child: Container(
|
|
|
|
|
decoration: BoxDecoration(
|
|
|
|
|
borderRadius:
|
|
|
|
@ -292,15 +289,10 @@ class Message extends StatelessWidget {
|
|
|
|
|
),
|
|
|
|
|
),
|
|
|
|
|
),
|
|
|
|
|
),
|
|
|
|
|
],
|
|
|
|
|
),
|
|
|
|
|
),
|
|
|
|
|
];
|
|
|
|
|
final row = Row(
|
|
|
|
|
crossAxisAlignment: CrossAxisAlignment.start,
|
|
|
|
|
mainAxisAlignment: rowMainAxisAlignment,
|
|
|
|
|
children: rowChildren,
|
|
|
|
|
],
|
|
|
|
|
);
|
|
|
|
|
Widget container;
|
|
|
|
|
if (event.hasAggregatedEvents(timeline, RelationshipTypes.reaction) ||
|
|
|
|
@ -400,12 +392,19 @@ class Message extends StatelessWidget {
|
|
|
|
|
direction: SwipeDirection.endToStart,
|
|
|
|
|
onSwipe: onSwipe,
|
|
|
|
|
child: Center(
|
|
|
|
|
child: MouseRegion(
|
|
|
|
|
onEnter: (_) => useMouse = true,
|
|
|
|
|
onExit: (_) => useMouse = false,
|
|
|
|
|
child: InkWell(
|
|
|
|
|
onTap: longPressSelect || useMouse ? () => onSelect!(event) : null,
|
|
|
|
|
onLongPress: () => onSelect!(event),
|
|
|
|
|
child: Container(
|
|
|
|
|
color: selected
|
|
|
|
|
? Theme.of(context).primaryColor.withAlpha(100)
|
|
|
|
|
: Theme.of(context).primaryColor.withAlpha(0),
|
|
|
|
|
constraints:
|
|
|
|
|
const BoxConstraints(maxWidth: FluffyThemes.columnWidth * 2.5),
|
|
|
|
|
constraints: const BoxConstraints(
|
|
|
|
|
maxWidth: FluffyThemes.columnWidth * 2.5,
|
|
|
|
|
),
|
|
|
|
|
padding: const EdgeInsets.symmetric(
|
|
|
|
|
horizontal: 8.0,
|
|
|
|
|
vertical: 4.0,
|
|
|
|
@ -413,6 +412,8 @@ class Message extends StatelessWidget {
|
|
|
|
|
child: container,
|
|
|
|
|
),
|
|
|
|
|
),
|
|
|
|
|
),
|
|
|
|
|
),
|
|
|
|
|
);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|