more cleanup

lib/themes/day.dart

@@ -1,7 +1,4 @@
-// GENERATED CODE - DO NOT MODIFY BY HAND
-
 import 'package:flutter/material.dart';
-import 'package:flutter/painting.dart';
 
 const TextTheme dayText = TextTheme(
   titleLarge: TextStyle(color: Color(0xff333333)),
@@ -53,7 +50,16 @@ const dayTheme = {
       TextStyle(color: Color(0xffbd2c00), backgroundColor: Color(0xffffecec)),
   'number': TextStyle(color: Color(0xff005cc5)),
   'string': TextStyle(color: Color(0xff032f62)),
-  'tag-hash': TextStyle(color: Colors.pinkAccent, fontStyle: FontStyle.italic, fontWeight: FontWeight.bold),
+  'tag-hash': TextStyle(
-  'tag-plus': TextStyle(color: Colors.cyan, fontStyle: FontStyle.italic, fontWeight: FontWeight.bold),
+      color: Colors.pinkAccent,
-  'tag-at': TextStyle(color: Colors.orange, fontStyle: FontStyle.italic, fontWeight: FontWeight.bold),
+      fontStyle: FontStyle.italic,
+      fontWeight: FontWeight.bold),
+  'tag-plus': TextStyle(
+      color: Colors.cyan,
+      fontStyle: FontStyle.italic,
+      fontWeight: FontWeight.bold),
+  'tag-at': TextStyle(
+      color: Colors.orange,
+      fontStyle: FontStyle.italic,
+      fontWeight: FontWeight.bold),
 };

lib/themes/markdown.dart

@@ -1,5 +1,4 @@
-import 'package:highlight/src/mode.dart';
+import 'package:highlight/highlight.dart';
-import 'package:highlight/src/common_modes.dart';
 
 final markdown = Mode(refs: {}, aliases: [
   "md",
@@ -59,9 +58,16 @@ final markdown = Mode(refs: {}, aliases: [
   ]),
 
   // Custom Tag Highlighting
-  Mode(className: "tag-hash", begin: "(?<=\\s|^)#[a-zA-Z0-9_]+", relevance: 10), // Magenta
+  Mode(
-  Mode(className: "tag-plus", begin: "(?<=\\s|^)\\+[a-zA-Z0-9_]+", relevance: 10), // Cyan
+      className: "tag-hash",
-  Mode(className: "tag-at", begin: "(?<=\\s|^)@[a-zA-Z0-9_]+", relevance: 10), // Yellow
+      begin: "(?<=\\s|^)#[a-zA-Z0-9_]+",
-
+      relevance: 10), // Magenta
-
+  Mode(
+      className: "tag-plus",
+      begin: "(?<=\\s|^)\\+[a-zA-Z0-9_]+",
+      relevance: 10), // Cyan
+  Mode(
+      className: "tag-at",
+      begin: "(?<=\\s|^)@[a-zA-Z0-9_]+",
+      relevance: 10), // Yellow
 ]);

lib/themes/night.dart

@@ -1,7 +1,4 @@
-// GENERATED CODE - DO NOT MODIFY BY HAND
-
 import 'package:flutter/material.dart';
-import 'package:flutter/painting.dart';
 
 const TextTheme nightText = TextTheme(
   titleLarge: TextStyle(color: Color(0xffc5c8c6)),
@@ -53,7 +50,16 @@ const nightTheme = {
       TextStyle(backgroundColor: Color(0xFF121212), color: Color(0xffc5c8c6)),
   'emphasis': TextStyle(fontStyle: FontStyle.italic),
   'strong': TextStyle(fontWeight: FontWeight.bold),
-  'tag-hash': TextStyle(color: Colors.pinkAccent, fontStyle: FontStyle.italic, fontWeight: FontWeight.bold),
+  'tag-hash': TextStyle(
-  'tag-plus': TextStyle(color: Colors.cyan, fontStyle: FontStyle.italic, fontWeight: FontWeight.bold),
+      color: Colors.pinkAccent,
-  'tag-at': TextStyle(color: Colors.orange, fontStyle: FontStyle.italic, fontWeight: FontWeight.bold),
+      fontStyle: FontStyle.italic,
+      fontWeight: FontWeight.bold),
+  'tag-plus': TextStyle(
+      color: Colors.cyan,
+      fontStyle: FontStyle.italic,
+      fontWeight: FontWeight.bold),
+  'tag-at': TextStyle(
+      color: Colors.orange,
+      fontStyle: FontStyle.italic,
+      fontWeight: FontWeight.bold),
 };

pubspec.lock

@@ -217,7 +217,7 @@ packages:
     source: hosted
     version: "6.2.1"
   highlight:
-    dependency: transitive
+    dependency: "direct main"
     description:
       name: highlight
       sha256: "5353a83ffe3e3eca7df0abfb72dcf3fa66cc56b953728e7113ad4ad88497cf21"

pubspec.yaml

@@ -45,6 +45,7 @@ dependencies:
   path_provider: ^2.1.5
   permission_handler: ^11.4.0
   shared_preferences: ^2.5.2
+  highlight: ^0.7.0
 
 dev_dependencies:
   flutter_test: