Fix Up Quotes
This commit is contained in:
parent
01b5c41208
commit
67a99c903a
|
@ -4,6 +4,7 @@ import 'package:cwtch/config.dart';
|
||||||
import 'package:cwtch/models/message.dart';
|
import 'package:cwtch/models/message.dart';
|
||||||
import 'package:cwtch/models/messages/malformedmessage.dart';
|
import 'package:cwtch/models/messages/malformedmessage.dart';
|
||||||
import 'package:cwtch/widgets/malformedbubble.dart';
|
import 'package:cwtch/widgets/malformedbubble.dart';
|
||||||
|
import 'package:cwtch/widgets/messageBubbleWidgetHelpers.dart';
|
||||||
import 'package:cwtch/widgets/messagerow.dart';
|
import 'package:cwtch/widgets/messagerow.dart';
|
||||||
import 'package:cwtch/widgets/quotedmessage.dart';
|
import 'package:cwtch/widgets/quotedmessage.dart';
|
||||||
import 'package:flutter/widgets.dart';
|
import 'package:flutter/widgets.dart';
|
||||||
|
@ -39,15 +40,7 @@ class QuotedMessage extends Message {
|
||||||
);
|
);
|
||||||
var content = message["body"];
|
var content = message["body"];
|
||||||
var formatMessages = Provider.of<Settings>(bcontext).isExperimentEnabled(FormattingExperiment);
|
var formatMessages = Provider.of<Settings>(bcontext).isExperimentEnabled(FormattingExperiment);
|
||||||
return SelectableLinkify(
|
return compileMessageContentWidget(context, false, content, FocusNode(), formatMessages, false);
|
||||||
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);
|
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
return MalformedBubble();
|
return MalformedBubble();
|
||||||
}
|
}
|
||||||
|
|
|
@ -12,6 +12,7 @@ import 'package:provider/provider.dart';
|
||||||
|
|
||||||
import '../../settings.dart';
|
import '../../settings.dart';
|
||||||
import '../../third_party/linkify/flutter_linkify.dart';
|
import '../../third_party/linkify/flutter_linkify.dart';
|
||||||
|
import '../../widgets/messageBubbleWidgetHelpers.dart';
|
||||||
|
|
||||||
class TextMessage extends Message {
|
class TextMessage extends Message {
|
||||||
final MessageMetadata metadata;
|
final MessageMetadata metadata;
|
||||||
|
@ -25,20 +26,7 @@ class TextMessage extends Message {
|
||||||
value: this.metadata,
|
value: this.metadata,
|
||||||
builder: (bcontext, child) {
|
builder: (bcontext, child) {
|
||||||
var formatMessages = Provider.of<Settings>(bcontext).isExperimentEnabled(FormattingExperiment);
|
var formatMessages = Provider.of<Settings>(bcontext).isExperimentEnabled(FormattingExperiment);
|
||||||
return SelectableLinkify(
|
return compileMessageContentWidget(context, false, content, FocusNode(), formatMessages, false);;
|
||||||
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,
|
|
||||||
);
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue