GitLab/fluffychat
2
0
Fork 0
mirror of https://gitlab.com/famedly/fluffychat.git synced 2025-05-28 18:37:40 +02:00
Code Issues Projects Releases Wiki Activity

fix: Cause a re-render of the message widget once the member state is fully loaded

Browse Source
This commit is contained in:
Sorunome 2021-08-16 18:13:31 +02:00
parent 43d00d6208
commit efe6c7c0d3
No known key found for this signature in database
GPG Key ID: B19471D07FC9BE9C
1 changed files with 57 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

91
lib/widgets/event_content/message.dart
View File

@ -14,7 +14,7 @@ import 'message_reactions.dart';
import 'state_message.dart'; import 'state_message.dart';
import 'verification_request_content.dart'; import 'verification_request_content.dart';
class Message extends StatelessWidget { class Message extends StatefulWidget {
final Event event; final Event event;
final Event nextEvent; final Event nextEvent;
final void Function(Event) onSelect; final void Function(Event) onSelect;
@ -35,29 +35,47 @@ class Message extends StatelessWidget {
this.selected, this.selected,
this.timeline}); this.timeline});
@override
_MessageState createState() => _MessageState();
}
class _MessageState extends State<Message> {
/// Indicates wheither the user may use a mouse instead /// Indicates wheither the user may use a mouse instead
/// of touchscreen. /// of touchscreen.
static bool useMouse = false; static bool useMouse = false;
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
// if the sender isn't in-memory yet we want to queue a re-rendering of the widget for
// when it is in-memory, for nicer displaying
if (widget.event.room
.getState(EventTypes.RoomMember, widget.event.senderId) ==
null) {
widget.event.room.requestUser(widget.event.senderId).then((_) {
WidgetsBinding.instance.addPostFrameCallback((_) {
setState(() => null);
});
});
}
if (![EventTypes.Message, EventTypes.Sticker, EventTypes.Encrypted] if (![EventTypes.Message, EventTypes.Sticker, EventTypes.Encrypted]
.contains(event.type)) { .contains(widget.event.type)) {
return StateMessage(event, unfold: unfold); return StateMessage(widget.event, unfold: widget.unfold);
} }
if (event.type == EventTypes.Message && if (widget.event.type == EventTypes.Message &&
event.messageType == EventTypes.KeyVerificationRequest) { widget.event.messageType == EventTypes.KeyVerificationRequest) {
return VerificationRequestContent(event: event, timeline: timeline); return VerificationRequestContent(
event: widget.event, timeline: widget.timeline);
} }
final client = Matrix.of(context).client; final client = Matrix.of(context).client;
final ownMessage = event.senderId == client.userID; final ownMessage = widget.event.senderId == client.userID;
final alignment = ownMessage ? Alignment.topRight : Alignment.topLeft; final alignment = ownMessage ? Alignment.topRight : Alignment.topLeft;
var color = Theme.of(context).secondaryHeaderColor; var color = Theme.of(context).secondaryHeaderColor;
final sameSender = nextEvent != null && final sameSender = widget.nextEvent != null &&
[EventTypes.Message, EventTypes.Sticker].contains(nextEvent.type) [EventTypes.Message, EventTypes.Sticker]
? nextEvent.sender.id == event.sender.id .contains(widget.nextEvent.type)
? widget.nextEvent.sender.id == widget.event.sender.id
: false; : false;
var textColor = ownMessage var textColor = ownMessage
? Colors.white ? Colors.white
@ -67,9 +85,9 @@ class Message extends StatelessWidget {
final rowMainAxisAlignment = final rowMainAxisAlignment =
ownMessage ? MainAxisAlignment.end : MainAxisAlignment.start; ownMessage ? MainAxisAlignment.end : MainAxisAlignment.start;
final displayEvent = event.getDisplayEvent(timeline); final displayEvent = widget.event.getDisplayEvent(widget.timeline);
if (event.showThumbnail) { if (widget.event.showThumbnail) {
color = Theme.of(context).scaffoldBackgroundColor; color = Theme.of(context).scaffoldBackgroundColor;
textColor = Theme.of(context).textTheme.bodyText2.color; textColor = Theme.of(context).textTheme.bodyText2.color;
} else if (ownMessage) { } else if (ownMessage) {
@ -88,10 +106,12 @@ class Message extends StatelessWidget {
borderRadius: BorderRadius.circular(AppConfig.borderRadius), borderRadius: BorderRadius.circular(AppConfig.borderRadius),
child: InkWell( child: InkWell(
onHover: (b) => useMouse = true, onHover: (b) => useMouse = true,
onTap: !useMouse && longPressSelect onTap: !useMouse && widget.longPressSelect
? () => null ? () => null
: () => onSelect(event), : () => widget.onSelect(widget.event),
onLongPress: !longPressSelect ? null : () => onSelect(event), onLongPress: !widget.longPressSelect
? null
: () => widget.onSelect(widget.event),
borderRadius: BorderRadius.circular(AppConfig.borderRadius), borderRadius: BorderRadius.circular(AppConfig.borderRadius),
child: Container( child: Container(
padding: padding:
@ -104,29 +124,30 @@ class Message extends StatelessWidget {
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
if (event.relationshipType == RelationshipTypes.reply) if (widget.event.relationshipType ==
RelationshipTypes.reply)
FutureBuilder<Event>( FutureBuilder<Event>(
future: event.getReplyEvent(timeline), future: widget.event.getReplyEvent(widget.timeline),
builder: (BuildContext context, snapshot) { builder: (BuildContext context, snapshot) {
final replyEvent = snapshot.hasData final replyEvent = snapshot.hasData
? snapshot.data ? snapshot.data
: Event( : Event(
eventId: event.relationshipEventId, eventId: widget.event.relationshipEventId,
content: { content: {
'msgtype': 'm.text', 'msgtype': 'm.text',
'body': '...' 'body': '...'
}, },
senderId: event.senderId, senderId: widget.event.senderId,
type: 'm.room.message', type: 'm.room.message',
room: event.room, room: widget.event.room,
roomId: event.roomId, roomId: widget.event.roomId,
status: 1, status: 1,
originServerTs: DateTime.now(), originServerTs: DateTime.now(),
); );
return InkWell( return InkWell(
onTap: () { onTap: () {
if (scrollToEventId != null) { if (widget.scrollToEventId != null) {
scrollToEventId(replyEvent.eventId); widget.scrollToEventId(replyEvent.eventId);
} }
}, },
child: AbsorbPointer( child: AbsorbPointer(
@ -134,7 +155,7 @@ class Message extends StatelessWidget {
margin: EdgeInsets.symmetric(vertical: 4.0), margin: EdgeInsets.symmetric(vertical: 4.0),
child: ReplyContent(replyEvent, child: ReplyContent(replyEvent,
lightText: ownMessage, lightText: ownMessage,
timeline: timeline), timeline: widget.timeline),
), ),
), ),
); );
@ -148,10 +169,11 @@ class Message extends StatelessWidget {
Opacity( Opacity(
opacity: 0, opacity: 0,
child: _MetaRow( child: _MetaRow(
event, // meta information should be from the unedited event widget
.event, // meta information should be from the unedited event
ownMessage, ownMessage,
textColor, textColor,
timeline, widget.timeline,
displayEvent, displayEvent,
), ),
), ),
@ -162,10 +184,10 @@ class Message extends StatelessWidget {
right: ownMessage ? 0 : null, right: ownMessage ? 0 : null,
left: !ownMessage ? 0 : null, left: !ownMessage ? 0 : null,
child: _MetaRow( child: _MetaRow(
event, widget.event,
ownMessage, ownMessage,
textColor, textColor,
timeline, widget.timeline,
displayEvent, displayEvent,
), ),
), ),
@ -180,9 +202,9 @@ class Message extends StatelessWidget {
final avatarOrSizedBox = sameSender final avatarOrSizedBox = sameSender
? SizedBox(width: Avatar.defaultSize) ? SizedBox(width: Avatar.defaultSize)
: Avatar( : Avatar(
event.sender.avatarUrl, widget.event.sender.avatarUrl,
event.sender.calcDisplayname(), widget.event.sender.calcDisplayname(),
onTap: () => onAvatarTab(event), onTap: () => widget.onAvatarTab(widget.event),
); );
if (ownMessage) { if (ownMessage) {
rowChildren.add(avatarOrSizedBox); rowChildren.add(avatarOrSizedBox);
@ -195,7 +217,8 @@ class Message extends StatelessWidget {
children: rowChildren, children: rowChildren,
); );
Widget container; Widget container;
if (event.hasAggregatedEvents(timeline, RelationshipTypes.reaction)) { if (widget.event
.hasAggregatedEvents(widget.timeline, RelationshipTypes.reaction)) {
container = Column( container = Column(
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
crossAxisAlignment: crossAxisAlignment:
@ -208,7 +231,7 @@ class Message extends StatelessWidget {
left: (ownMessage ? 0 : Avatar.defaultSize) + 12.0, left: (ownMessage ? 0 : Avatar.defaultSize) + 12.0,
right: (ownMessage ? Avatar.defaultSize : 0) + 12.0, right: (ownMessage ? Avatar.defaultSize : 0) + 12.0,
), ),
child: MessageReactions(event, timeline), child: MessageReactions(widget.event, widget.timeline),
), ),
], ],
); );
@ -218,7 +241,7 @@ class Message extends StatelessWidget {
return Center( return Center(
child: Container( child: Container(
color: selected color: widget.selected
? Theme.of(context).primaryColor.withAlpha(100) ? Theme.of(context).primaryColor.withAlpha(100)
: Theme.of(context).primaryColor.withAlpha(0), : Theme.of(context).primaryColor.withAlpha(0),
constraints: BoxConstraints(maxWidth: FluffyThemes.columnWidth * 2.5), constraints: BoxConstraints(maxWidth: FluffyThemes.columnWidth * 2.5),