Migrate away from flutter_markdown

CodeDoctorDE · CodeDoctorDE · commit f579f3505250 · 2025-05-12T21:23:01.000+02:00
diff --git a/app/android/Gemfile.lock b/app/android/Gemfile.lock
@@ -158,7 +158,7 @@ GEM
     httpclient (2.9.0)
       mutex_m
     jmespath (1.6.2)
-    json (2.11.3)
+    json (2.12.0)
     jwt (2.10.1)
       base64
     logger (1.7.0)
diff --git a/app/android/gradle/wrapper/gradle-wrapper.properties b/app/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=20f1b1176237254a6fc204d8434196fa11a4cfb387567519c61556e8710aed78
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
+distributionSha256Sum=61ad310d3c7d3e5da131b76bbf22b5a4c0786e9d892dae8c1658d4b484de3caa
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/app/android/settings.gradle b/app/android/settings.gradle
@@ -18,7 +18,7 @@ pluginManagement {
 
 plugins {
     id "dev.flutter.flutter-plugin-loader" version "1.0.0"
-    id "com.android.application" version '8.9.1' apply false
+    id "com.android.application" version '8.10.0' apply false
     id "org.jetbrains.kotlin.android" version "2.1.0" apply false
 }
 
diff --git a/app/lib/pages/game/dialog.dart b/app/lib/pages/game/dialog.dart
@@ -3,8 +3,8 @@ import 'dart:ui';
 import 'package:collection/collection.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:markdown_widget/markdown_widget.dart';
 import 'package:setonix/src/generated/i18n/app_localizations.dart';
-import 'package:flutter_markdown/flutter_markdown.dart';
 import 'package:markdown/markdown.dart' as md;
 import 'package:material_leap/material_leap.dart';
 import 'package:phosphor_flutter/phosphor_flutter.dart';
@@ -109,13 +109,16 @@ class GameDialogOverlay extends StatelessWidget {
                           final component = dialog.components[cIndex];
                           switch (component) {
                             case GameDialogMarkdownComponent():
-                              return MarkdownBody(
-                                extensionSet: md.ExtensionSet(
-                                  md.ExtensionSet.gitHubWeb.blockSyntaxes,
-                                  <md.InlineSyntax>[
-                                    md.EmojiSyntax(),
-                                    ...md.ExtensionSet.gitHubWeb.inlineSyntaxes
-                                  ],
+                              return MarkdownWidget(
+                                markdownGenerator: MarkdownGenerator(
+                                  extensionSet: md.ExtensionSet(
+                                    md.ExtensionSet.gitHubWeb.blockSyntaxes,
+                                    <md.InlineSyntax>[
+                                      md.EmojiSyntax(),
+                                      ...md
+                                          .ExtensionSet.gitHubWeb.inlineSyntaxes
+                                    ],
+                                  ),
                                 ),
                                 data: component.content,
                               );
diff --git a/app/lib/pages/game/note.dart b/app/lib/pages/game/note.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:markdown_widget/markdown_widget.dart';
 import 'package:setonix/src/generated/i18n/app_localizations.dart';
-import 'package:flutter_markdown/flutter_markdown.dart';
 import 'package:markdown/markdown.dart' as md;
 import 'package:material_leap/material_leap.dart';
 import 'package:phosphor_flutter/phosphor_flutter.dart';
@@ -122,13 +122,15 @@ class _GameNoteDialogState extends State<GameNoteDialog> {
                     constraints: BoxConstraints(
                       minHeight: _expanded ? 400 : 200,
                     ),
-                    child: Markdown(
-                        extensionSet: md.ExtensionSet(
-                          md.ExtensionSet.gitHubWeb.blockSyntaxes,
-                          <md.InlineSyntax>[
-                            md.EmojiSyntax(),
-                            ...md.ExtensionSet.gitHubWeb.inlineSyntaxes
-                          ],
+                    child: MarkdownWidget(
+                        markdownGenerator: MarkdownGenerator(
+                          extensionSet: md.ExtensionSet(
+                            md.ExtensionSet.gitHubWeb.blockSyntaxes,
+                            <md.InlineSyntax>[
+                              md.EmojiSyntax(),
+                              ...md.ExtensionSet.gitHubWeb.inlineSyntaxes
+                            ],
+                          ),
                         ),
                         shrinkWrap: true,
                         data: _contentController.text),
diff --git a/app/pubspec.lock b/app/pubspec.lock
@@ -452,6 +452,14 @@ packages:
     description: flutter
     source: sdk
     version: "0.0.0"
+  flutter_highlight:
+    dependency: transitive
+    description:
+      name: flutter_highlight
+      sha256: "7b96333867aa07e122e245c033b8ad622e4e3a42a1a2372cbb098a2541d8782c"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.7.0"
   flutter_lints:
     dependency: "direct dev"
     description:
@@ -473,14 +481,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.0.5"
-  flutter_markdown:
-    dependency: "direct main"
-    description:
-      name: flutter_markdown
-      sha256: "08fb8315236099ff8e90cb87bb2b935e0a724a3af1623000a9cec930468e0f27"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.7.7+1"
   flutter_rust_bridge:
     dependency: transitive
     description:
@@ -592,6 +592,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.3.2"
+  highlight:
+    dependency: transitive
+    description:
+      name: highlight
+      sha256: "5353a83ffe3e3eca7df0abfb72dcf3fa66cc56b953728e7113ad4ad88497cf21"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.7.0"
   http:
     dependency: "direct main"
     description:
@@ -736,6 +744,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "7.3.0"
+  markdown_widget:
+    dependency: "direct main"
+    description:
+      name: markdown_widget
+      sha256: b52c13d3ee4d0e60c812e15b0593f142a3b8a2003cde1babb271d001a1dbdc1c
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.3.2+8"
   matcher:
     dependency: transitive
     description:
@@ -1069,6 +1085,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.2.0"
+  scroll_to_index:
+    dependency: transitive
+    description:
+      name: scroll_to_index
+      sha256: b707546e7500d9f070d63e5acf74fd437ec7eeeb68d3412ef7b0afada0b4f176
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.0.1"
   sembast:
     dependency: transitive
     description:
@@ -1417,6 +1441,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.1.4"
+  visibility_detector:
+    dependency: transitive
+    description:
+      name: visibility_detector
+      sha256: dd5cc11e13494f432d15939c3aa8ae76844c42b723398643ce9addb88a5ed420
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.4.0+2"
   vm_service:
     dependency: transitive
     description:
diff --git a/app/pubspec.yaml b/app/pubspec.yaml
@@ -90,7 +90,7 @@ dependencies:
   # Serialization
   dart_mappable: ^4.2.2
   archive: ^4.0.2
-  flutter_markdown: ^0.7.3+1
+  markdown_widget: ^2.3.2+8
   markdown: ^7.2.2
   bloc_concurrency: ^0.3.0
   idb_shim: ^2.6.1+7
diff --git a/docs/package.json b/docs/package.json
@@ -15,7 +15,7 @@
     "@astrojs/starlight": "^0.34.3",
     "@phosphor-icons/react": "^2.1.7",
     "@types/react": "^19.1.3",
-    "@types/react-dom": "^19.1.3",
+    "@types/react-dom": "^19.1.4",
     "astro": "^5.7.12",
     "react": "^19.1.0",
     "react-dom": "^19.1.0",
diff --git a/docs/pnpm-lock.yaml b/docs/pnpm-lock.yaml
diff --git a/metadata/en-US/changelogs/5.txt b/metadata/en-US/changelogs/5.txt
@@ -8,6 +8,7 @@
 * Add swamp multiplayer support
 * Add scroll sensitivity setting
 * Add remaining empty indicator to editor tabs
+* Migrate away from flutter_markdown
 * Upgrade to flutter 3.29
 * Update to agb 8.9
 
diff --git a/plugin/pubspec.lock b/plugin/pubspec.lock
@@ -334,8 +334,8 @@ packages:
     dependency: transitive
     description:
       path: "packages/lw_file_system_api"
-      ref: fcac45caf2dc178a1d81c0f0b633fbe8210a81a5
-      resolved-ref: fcac45caf2dc178a1d81c0f0b633fbe8210a81a5
+      ref: "2ecf53489240f055c841d7c8f92fe374cc6a27ae"
+      resolved-ref: "2ecf53489240f055c841d7c8f92fe374cc6a27ae"
       url: "https://github.com/LinwoodDev/dart_pkgs.git"
     source: git
     version: "1.0.0"
diff --git a/plugin/rust/Cargo.lock b/plugin/rust/Cargo.lock
diff --git a/server/pubspec.lock b/server/pubspec.lock

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ pluginManagement {`
`18`	`18`
`19`	`19`	`plugins {`
`20`	`20`	`id "dev.flutter.flutter-plugin-loader" version "1.0.0"`
`21`		`- id "com.android.application" version '8.9.1' apply false`
	`21`	`+ id "com.android.application" version '8.10.0' apply false`
`22`	`22`	`id "org.jetbrains.kotlin.android" version "2.1.0" apply false`
`23`	`23`	`}`
`24`	`24`