cwtch.im
/
cwtch-ui
10
11
Fork 17
Code Issues 89 Pull Requests 1 Projects 2 Releases 28 Wiki Activity

Fix Up Quotes

This commit is contained in:
Sarah Jamie Lewis 2023-05-18 11:24:09 -07:00 committed by Gitea
parent 01b5c41208
commit 67a99c903a
2 changed files with 4 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/models/messages/quotedmessage.dart
View File

@ -4,6 +4,7 @@ import 'package:cwtch/config.dart';
import 'package:cwtch/models/message.dart';
import 'package:cwtch/models/messages/malformedmessage.dart';
import 'package:cwtch/widgets/malformedbubble.dart';
import 'package:cwtch/widgets/messageBubbleWidgetHelpers.dart';
import 'package:cwtch/widgets/messagerow.dart';
import 'package:cwtch/widgets/quotedmessage.dart';
import 'package:flutter/widgets.dart';
@ -39,15 +40,7 @@ class QuotedMessage extends Message {
);
var content = message["body"];
var formatMessages = Provider.of<Settings>(bcontext).isExperimentEnabled(FormattingExperiment);
return SelectableLinkify(
text: content + '\u202F',
options: LinkifyOptions(messageFormatting: formatMessages, parseLinks: false, looseUrl: true, defaultToHttps: true),
linkifiers: [UrlLinkifier()],
onOpen: null,
textAlign: TextAlign.left,
style: TextStyle(fontSize: 12.0 * Provider.of<Settings>(context).fontScaling, fontWeight: FontWeight.normal, fontFamily: "Inter", overflow: TextOverflow.ellipsis),
codeStyle: TextStyle(fontSize: 12.0 * Provider.of<Settings>(context).fontScaling, fontWeight: FontWeight.normal, fontFamily: "Inter", overflow: TextOverflow.ellipsis),
textWidthBasis: TextWidthBasis.longestLine);
return compileMessageContentWidget(context, false, content, FocusNode(), formatMessages, false);
} catch (e) {
return MalformedBubble();
}

16
lib/models/messages/textmessage.dart
View File

@ -12,6 +12,7 @@ import 'package:provider/provider.dart';
import '../../settings.dart';
import '../../third_party/linkify/flutter_linkify.dart';
import '../../widgets/messageBubbleWidgetHelpers.dart';
class TextMessage extends Message {
final MessageMetadata metadata;
@ -25,20 +26,7 @@ class TextMessage extends Message {
value: this.metadata,
builder: (bcontext, child) {
var formatMessages = Provider.of<Settings>(bcontext).isExperimentEnabled(FormattingExperiment);
return SelectableLinkify(
text: content + '\u202F',
options: LinkifyOptions(messageFormatting: formatMessages, parseLinks: false, looseUrl: true, defaultToHttps: true),
linkifiers: [UrlLinkifier()],
onOpen: null,
textAlign: TextAlign.left,
style: TextStyle(overflow: TextOverflow.fade, fontFamily: "Inter", fontSize: 12.0 * Provider.of<Settings>(context).fontScaling),
linkStyle: TextStyle(overflow: TextOverflow.fade, fontFamily: "Inter", fontSize: 12.0 * Provider.of<Settings>(context).fontScaling),
codeStyle: TextStyle(
overflow: TextOverflow.ellipsis,
fontFamily: "RobotoMono",
),
textWidthBasis: TextWidthBasis.parent,
);
return compileMessageContentWidget(context, false, content, FocusNode(), formatMessages, false);;
});
}