Fixed editor content not loading without front matter data

CHANGELOG.md

@@ -12,6 +12,10 @@ Also I decided to drop support for syncing notes directly via the app because th
 
 I recommend using an external data directory and a third-party sync app for Android like [Syncthing](https://syncthing.net/), Nextcloud Sync or FolderSync for other cloud services.
 
+## 0.3.1
+
+- Fixed editor content not loading without front matter data
+
 ## 0.3.0
 
 - Fully reworked editor with syntax highlighting and a new keyboard toolbar to help with common Markdown operations

README.md

@@ -48,6 +48,10 @@ I recommend using an external data directory and a third-party sync app for Andr
 
 ## Changelog
 
+### 0.3.1
+
+- Fixed editor content not loading without front matter data
+
 ### 0.3.0
 
 - Fully reworked editor with syntax highlighting and a new keyboard toolbar to help with common Markdown operations

lib/page/edit.dart

@@ -31,7 +31,8 @@ class EditPage extends StatefulWidget {
 class _EditPageState extends State<EditPage> {
   NotesStore get store => widget.store;
   RichCodeEditingController _rec;
-  NotelessSyntaxHighlighter _syntaxHighlighterBase;
+  NotelessSyntaxHighlighter _syntaxHighlighterBase =
+      NotelessSyntaxHighlighter();
 
   GlobalKey _richTextFieldState = GlobalKey();
 
@@ -57,15 +58,13 @@ class _EditPageState extends State<EditPage> {
   }
 
   _loadContent() async {
-    String content = note.file.readAsStringSync();
+    /*  String content = note.file.readAsStringSync();
 
-    var doc = fm.parse(content);
+    var doc = fm.parse(content); */
+    final content = await PersistentStore.readContent(note.file);
 
-    _syntaxHighlighterBase = NotelessSyntaxHighlighter(
-/*       accentColor: Theme.of(context).accentColor, */
-        );
     _rec = RichCodeEditingController(_syntaxHighlighterBase,
-        text: doc.content.trimLeft());
+        text: content.trimLeft());
 
     _rec.addListener(() {
       if (_rec.text == currentData) return;
@@ -106,6 +105,7 @@ class _EditPageState extends State<EditPage> {
         });
       }
     }
+    if (mounted) setState(() {});
   }
 
   GlobalKey<ScaffoldState> _scaffold = GlobalKey();

lib/store/persistent.dart

@@ -8,11 +8,24 @@ import 'package:front_matter/front_matter.dart' as fm;
 import 'package:app/model/note.dart';
 
 class PersistentStore {
+  static Future<String> readContent(File file) async {
+    if (!file.existsSync()) return null;
+
+    String fileContent = await file.readAsString();
+
+    if (fileContent.trimLeft().startsWith('---')) {
+      var doc = fm.parse(fileContent);
+      if (doc.content != null) return doc.content.trimLeft();
+    }
+
+    return fileContent.trimLeft();
+  }
+
   static Future saveNote(Note note, [String content]) async {
     // print('PersistentStore.saveNote');
 
     if (content == null) {
-      content = fm.parse(note.file.readAsStringSync()).content;
+      content = await readContent(note.file);
     }
 
     String header = '---\n';
@@ -36,7 +49,9 @@ class PersistentStore {
 
     header += toYamlString(data);
 
-    header += '\n---\n\n';
+    if (!header.endsWith('\n')) header += '\n';
+
+    header += '---\n\n';
 
     // print(header);
 

pubspec.yaml

@@ -11,7 +11,7 @@ description: A markdown note-taking app for mobile devices.
 # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
 # Read more about iOS versioning at
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
-version: 0.3.0+30
+version: 0.3.1+31
 
 environment:
   sdk: ">=2.5.0 <3.0.0"