swith to event aggregations and render message edits and reactions

This commit is contained in:
Sorunome
2020-08-12 09:30:31 +00:00
committed by Christian Pauly
parent 2db8016f58
commit 81a6530ed8
11 changed files with 514 additions and 152 deletions

View File

@ -8,23 +8,29 @@ import 'matrix.dart';
class ReplyContent extends StatelessWidget {
final Event replyEvent;
final bool lightText;
final Timeline timeline;
const ReplyContent(this.replyEvent, {this.lightText = false, Key key})
const ReplyContent(this.replyEvent,
{this.lightText = false, Key key, this.timeline})
: super(key: key);
@override
Widget build(BuildContext context) {
Widget replyBody;
if (replyEvent != null &&
final displayEvent = replyEvent != null && timeline != null
? replyEvent.getDisplayEvent(timeline)
: replyEvent;
if (displayEvent != null &&
Matrix.of(context).renderHtml &&
[EventTypes.Message, EventTypes.Encrypted].contains(replyEvent.type) &&
[EventTypes.Message, EventTypes.Encrypted]
.contains(displayEvent.type) &&
[MessageTypes.Text, MessageTypes.Notice, MessageTypes.Emote]
.contains(replyEvent.messageType) &&
!replyEvent.redacted &&
replyEvent.content['format'] == 'org.matrix.custom.html' &&
replyEvent.content['formatted_body'] is String) {
String html = replyEvent.content['formatted_body'];
if (replyEvent.messageType == MessageTypes.Emote) {
.contains(displayEvent.messageType) &&
!displayEvent.redacted &&
displayEvent.content['format'] == 'org.matrix.custom.html' &&
displayEvent.content['formatted_body'] is String) {
String html = displayEvent.content['formatted_body'];
if (displayEvent.messageType == MessageTypes.Emote) {
html = '* $html';
}
replyBody = HtmlMessage(
@ -36,11 +42,11 @@ class ReplyContent extends StatelessWidget {
fontSize: DefaultTextStyle.of(context).style.fontSize,
),
maxLines: 1,
room: replyEvent.room,
room: displayEvent.room,
);
} else {
replyBody = Text(
replyEvent?.getLocalizedBody(
displayEvent?.getLocalizedBody(
L10n.of(context),
withSenderNamePrefix: false,
hideReply: true,
@ -71,7 +77,7 @@ class ReplyContent extends StatelessWidget {
mainAxisAlignment: MainAxisAlignment.center,
children: <Widget>[
Text(
(replyEvent?.sender?.calcDisplayname() ?? '') + ':',
(displayEvent?.sender?.calcDisplayname() ?? '') + ':',
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: TextStyle(