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

Merge pull request 'Remove subscript formatting.' (#687) from 1.12-rc into trunk
continuous-integration/drone/push Build is passing Details 

Reviewed-on: #687
Reviewed-by: Dan Ballard <dan@openprivacy.ca>
This commit is contained in:
Sarah Jamie Lewis 2023-06-16 01:52:16 +00:00
parent 49fcbdf9aa c305f7ba23
commit cc4403261e
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/third_party/linkify/uri.dart vendored
View File

@ -121,7 +121,7 @@ class UrlLinkifier extends Linkifier {
Formatter(_boldRegex, BoldElement.new), Formatter(_boldRegex, BoldElement.new),
Formatter(_italicRegex, ItalicElement.new), Formatter(_italicRegex, ItalicElement.new),
Formatter(_superRegex, SuperElement.new), Formatter(_superRegex, SuperElement.new),
Formatter(_subRegex, SubElement.new), // Formatter(_subRegex, SubElement.new),
Formatter(_strikeRegex, StrikeElement.new) Formatter(_strikeRegex, StrikeElement.new)
]; ];

32
lib/views/messageview.dart
View File

@ -549,21 +549,21 @@ class _MessageViewState extends State<MessageView> {
}); });
}); });
var subscript = IconButton( // var subscript = IconButton(
icon: Icon(Icons.subscript), // icon: Icon(Icons.subscript),
tooltip: AppLocalizations.of(context)!.tooltipSubscript, // tooltip: AppLocalizations.of(context)!.tooltipSubscript,
onPressed: () { // onPressed: () {
setState(() { // setState(() {
var ctrlrCompose = Provider.of<ContactInfoState>(context, listen: false).messageDraft.ctrlCompose; // var ctrlrCompose = Provider.of<ContactInfoState>(context, listen: false).messageDraft.ctrlCompose;
var selected = ctrlrCompose.selection.textInside(ctrlrCompose.text); // var selected = ctrlrCompose.selection.textInside(ctrlrCompose.text);
var selection = ctrlrCompose.selection; // var selection = ctrlrCompose.selection;
var start = ctrlrCompose.selection.start; // var start = ctrlrCompose.selection.start;
var end = ctrlrCompose.selection.end; // var end = ctrlrCompose.selection.end;
ctrlrCompose.text = ctrlrCompose.text.replaceRange(start, end, "_" + selected + "_"); // ctrlrCompose.text = ctrlrCompose.text.replaceRange(start, end, "_" + selected + "_");
ctrlrCompose.selection = selection.copyWith(baseOffset: selection.start + 1, extentOffset: selection.start + 1); // ctrlrCompose.selection = selection.copyWith(baseOffset: selection.start + 1, extentOffset: selection.start + 1);
Provider.of<ContactInfoState>(context, listen: false).messageDraft.ctrlCompose = ctrlrCompose; // Provider.of<ContactInfoState>(context, listen: false).messageDraft.ctrlCompose = ctrlrCompose;
}); // });
}); // });
var strikethrough = IconButton( var strikethrough = IconButton(
icon: Icon(Icons.format_strikethrough), icon: Icon(Icons.format_strikethrough),
@ -596,7 +596,7 @@ class _MessageViewState extends State<MessageView> {
var formattingToolbar = Container( var formattingToolbar = Container(
decoration: BoxDecoration(color: Provider.of<Settings>(context).theme.defaultButtonActiveColor), decoration: BoxDecoration(color: Provider.of<Settings>(context).theme.defaultButtonActiveColor),
child: Row(mainAxisAlignment: MainAxisAlignment.start, children: [bold, italic, code, superscript, subscript, strikethrough, vline, preview])); child: Row(mainAxisAlignment: MainAxisAlignment.start, children: [bold, italic, code, superscript, strikethrough, vline, preview]));
var textField = Container( var textField = Container(
decoration: BoxDecoration(border: Border(top: BorderSide(color: Provider.of<Settings>(context).theme.defaultButtonActiveColor))), decoration: BoxDecoration(border: Border(top: BorderSide(color: Provider.of<Settings>(context).theme.defaultButtonActiveColor))),