add fixes and version bump

Sorunome · Sorunome · commit 3ec6471d5cd7 · 2021-08-08T18:58:01.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## [0.3.1] - 8th Aug 2021
+- Fix link colour in inline code blocks
+- Fix long code blocks causing language autodetection to take long
+
 ## [0.3.0] - 11th Apr 2021
 - Update matrix: URI schemes
 - Fix small rendering bug with flutter 2
diff --git a/lib/code_block.dart b/lib/code_block.dart
@@ -41,7 +41,11 @@ class _CodeBlockState extends State<CodeBlock> {
   void initState() {
     super.initState();
     if (widget.language == null) {
-      final hashKey = sha1.convert(utf8.encode(widget.code)).toString();
+      // the first 250 chars should be enough to detect the code language, hopefully
+      final codeFragment = widget.code.length > 250
+          ? widget.code.substring(0, 250)
+          : widget.code;
+      final hashKey = sha1.convert(utf8.encode(codeFragment)).toString();
       if (_detectionMap[hashKey] != null) {
         language = _detectionMap[hashKey];
       } else {
@@ -52,7 +56,7 @@ class _CodeBlockState extends State<CodeBlock> {
               return lang;
             }
           }
-          return _autodetectLanguage(widget.code);
+          return _autodetectLanguage(codeFragment);
         }();
         _futureDetectionMap[hashKey].then((String lang) async {
           _detectionMap[hashKey] = lang;
@@ -94,16 +98,16 @@ class _CodeBlockState extends State<CodeBlock> {
               BoxConstraints(maxHeight: widget.maxLines == 1 ? 20 : 250),
           child: Scrollbar(
             isAlwaysShown: true,
-            controller: _horizontalScrollController,
+            controller: _verticalScrollController,
             child: SingleChildScrollView(
-              scrollDirection: Axis.horizontal,
-              controller: _horizontalScrollController,
+              scrollDirection: Axis.vertical,
+              controller: _verticalScrollController,
               child: Scrollbar(
                 isAlwaysShown: true,
-                controller: _verticalScrollController,
+                controller: _horizontalScrollController,
                 child: SingleChildScrollView(
-                  scrollDirection: Axis.vertical,
-                  controller: _verticalScrollController,
+                  scrollDirection: Axis.horizontal,
+                  controller: _horizontalScrollController,
                   child: HighlightView(
                     widget.code.replaceAll(RegExp(r'\n$'), ''),
                     language: language,
diff --git a/lib/rich_text_parser.dart b/lib/rich_text_parser.dart
@@ -728,6 +728,7 @@ class HtmlRichTextParser extends StatelessWidget {
             ));
             nextContext.linkStyle = parseContext.linkStyle.merge(TextStyle(
               fontFamily: 'monospace',
+              color: monokaiTheme['root'].color,
               backgroundColor: monokaiTheme['root'].backgroundColor,
             ));
             break;
@@ -894,9 +895,8 @@ class HtmlRichTextParser extends StatelessWidget {
                     RegExp(r"^[@#!+][^:]+:[^\/]+$").firstMatch(identifier) !=
                         null;
               } else {
-                final match =
-                    RegExp(r"^matrix:(r|roomid|u)\/([^\/]+)$")
-                        .firstMatch(urlLower.split('?').first.split('#').first);
+                final match = RegExp(r"^matrix:(r|roomid|u)\/([^\/]+)$")
+                    .firstMatch(urlLower.split('?').first.split('#').first);
                 isPill = match != null;
                 if (isPill) {
                   identifier = {
diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: flutter_matrix_html
 description: A Flutter widget for rendering static matrix html tags as Flutter widgets. (Will render over 70 different html tags!)
-version: 0.3.0
+version: 0.3.1
 homepage: https://github.com/Sorunome/flutter_matrix_html
 
 environment:
