From c305f7ba238c2e4d6fb157b0bf9da0e8a73a0651 Mon Sep 17 00:00:00 2001 From: Sarah Jamie Lewis Date: Thu, 15 Jun 2023 15:06:14 -0700 Subject: [PATCH] Remove subscript formatting. It is rarely used, and often conflicts with other formatting --- lib/third_party/linkify/uri.dart | 2 +- lib/views/messageview.dart | 32 ++++++++++++++++---------------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/lib/third_party/linkify/uri.dart b/lib/third_party/linkify/uri.dart index c8df7841..be881ef5 100644 --- a/lib/third_party/linkify/uri.dart +++ b/lib/third_party/linkify/uri.dart @@ -121,7 +121,7 @@ class UrlLinkifier extends Linkifier { Formatter(_boldRegex, BoldElement.new), Formatter(_italicRegex, ItalicElement.new), Formatter(_superRegex, SuperElement.new), - Formatter(_subRegex, SubElement.new), + // Formatter(_subRegex, SubElement.new), Formatter(_strikeRegex, StrikeElement.new) ]; diff --git a/lib/views/messageview.dart b/lib/views/messageview.dart index b421f508..f294aa59 100644 --- a/lib/views/messageview.dart +++ b/lib/views/messageview.dart @@ -549,21 +549,21 @@ class _MessageViewState extends State { }); }); - var subscript = IconButton( - icon: Icon(Icons.subscript), - tooltip: AppLocalizations.of(context)!.tooltipSubscript, - onPressed: () { - setState(() { - var ctrlrCompose = Provider.of(context, listen: false).messageDraft.ctrlCompose; - var selected = ctrlrCompose.selection.textInside(ctrlrCompose.text); - var selection = ctrlrCompose.selection; - var start = ctrlrCompose.selection.start; - var end = ctrlrCompose.selection.end; - ctrlrCompose.text = ctrlrCompose.text.replaceRange(start, end, "_" + selected + "_"); - ctrlrCompose.selection = selection.copyWith(baseOffset: selection.start + 1, extentOffset: selection.start + 1); - Provider.of(context, listen: false).messageDraft.ctrlCompose = ctrlrCompose; - }); - }); + // var subscript = IconButton( + // icon: Icon(Icons.subscript), + // tooltip: AppLocalizations.of(context)!.tooltipSubscript, + // onPressed: () { + // setState(() { + // var ctrlrCompose = Provider.of(context, listen: false).messageDraft.ctrlCompose; + // var selected = ctrlrCompose.selection.textInside(ctrlrCompose.text); + // var selection = ctrlrCompose.selection; + // var start = ctrlrCompose.selection.start; + // var end = ctrlrCompose.selection.end; + // ctrlrCompose.text = ctrlrCompose.text.replaceRange(start, end, "_" + selected + "_"); + // ctrlrCompose.selection = selection.copyWith(baseOffset: selection.start + 1, extentOffset: selection.start + 1); + // Provider.of(context, listen: false).messageDraft.ctrlCompose = ctrlrCompose; + // }); + // }); var strikethrough = IconButton( icon: Icon(Icons.format_strikethrough), @@ -596,7 +596,7 @@ class _MessageViewState extends State { var formattingToolbar = Container( decoration: BoxDecoration(color: Provider.of(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( decoration: BoxDecoration(border: Border(top: BorderSide(color: Provider.of(context).theme.defaultButtonActiveColor))),