From 4632dc40b9908f28713500a1d6c61ce73212f943 Mon Sep 17 00:00:00 2001
From: Vishesh Handa <me@vhanda.in>
Date: Tue, 25 May 2021 10:16:59 +0200
Subject: [PATCH] Split NoteEditor types into its own file

NoteEditor still hasn't been migrated to null safety
---
 lib/core/notes_folder_config.dart     | 2 +-
 lib/core/org_links_handler.dart       | 1 -
 lib/editors/common_types.dart         | 1 +
 lib/main_autocomplete.dart            | 2 --
 lib/screens/folder_view.dart          | 1 +
 lib/screens/note_editor.dart          | 3 +--
 lib/settings.dart                     | 2 +-
 lib/utils.dart                        | 2 +-
 lib/widgets/new_note_nav_bar.dart     | 2 +-
 lib/widgets/note_editor_selector.dart | 2 +-
 test/notes_folder_config_test.dart    | 2 +-
 11 files changed, 9 insertions(+), 11 deletions(-)
 create mode 100644 lib/editors/common_types.dart

diff --git a/lib/core/notes_folder_config.dart b/lib/core/notes_folder_config.dart
index 0cb990e6..5df0acc0 100644
--- a/lib/core/notes_folder_config.dart
+++ b/lib/core/notes_folder_config.dart
@@ -8,9 +8,9 @@ import 'package:yaml_serializer/yaml_serializer.dart';
 
 import 'package:gitjournal/core/notes_folder_fs.dart';
 import 'package:gitjournal/core/sorting_mode.dart';
+import 'package:gitjournal/editors/common_types.dart';
 import 'package:gitjournal/folder_views/common.dart';
 import 'package:gitjournal/folder_views/standard_view.dart';
-import 'package:gitjournal/screens/note_editor.dart';
 import 'package:gitjournal/settings.dart';
 import 'package:gitjournal/utils/logger.dart';
 
diff --git a/lib/core/org_links_handler.dart b/lib/core/org_links_handler.dart
index 3c3c5d23..c5ebe1cf 100644
--- a/lib/core/org_links_handler.dart
+++ b/lib/core/org_links_handler.dart
@@ -27,7 +27,6 @@ import 'package:path/path.dart';
 import 'package:url_launcher/url_launcher.dart';
 
 import 'package:gitjournal/core/note.dart';
-import 'package:gitjournal/core/notes_folder_fs.dart';
 import 'package:gitjournal/folder_views/common.dart';
 import 'package:gitjournal/utils/link_resolver.dart';
 import 'package:gitjournal/utils/logger.dart';
diff --git a/lib/editors/common_types.dart b/lib/editors/common_types.dart
new file mode 100644
index 00000000..9222b875
--- /dev/null
+++ b/lib/editors/common_types.dart
@@ -0,0 +1 @@
+enum EditorType { Markdown, Raw, Checklist, Journal, Org }
\ No newline at end of file
diff --git a/lib/main_autocomplete.dart b/lib/main_autocomplete.dart
index 156b3b94..1a5c7bd9 100644
--- a/lib/main_autocomplete.dart
+++ b/lib/main_autocomplete.dart
@@ -1,7 +1,5 @@
 // @dart=2.9
 
-import 'dart:ui';
-
 import 'package:flutter/material.dart';
 
 import 'package:gitjournal/editors/autocompletion_widget.dart';
diff --git a/lib/screens/folder_view.dart b/lib/screens/folder_view.dart
index 48e92db9..7284aafb 100644
--- a/lib/screens/folder_view.dart
+++ b/lib/screens/folder_view.dart
@@ -13,6 +13,7 @@ import 'package:gitjournal/core/notes_folder.dart';
 import 'package:gitjournal/core/notes_folder_fs.dart';
 import 'package:gitjournal/core/sorted_notes_folder.dart';
 import 'package:gitjournal/core/sorting_mode.dart';
+import 'package:gitjournal/editors/common_types.dart';
 import 'package:gitjournal/folder_views/common.dart';
 import 'package:gitjournal/folder_views/standard_view.dart';
 import 'package:gitjournal/repository.dart';
diff --git a/lib/screens/note_editor.dart b/lib/screens/note_editor.dart
index bdf751a0..79d18a46 100644
--- a/lib/screens/note_editor.dart
+++ b/lib/screens/note_editor.dart
@@ -30,6 +30,7 @@ import 'package:gitjournal/core/note.dart';
 import 'package:gitjournal/core/notes_folder.dart';
 import 'package:gitjournal/core/notes_folder_fs.dart';
 import 'package:gitjournal/editors/checklist_editor.dart';
+import 'package:gitjournal/editors/common_types.dart';
 import 'package:gitjournal/editors/journal_editor.dart';
 import 'package:gitjournal/editors/markdown_editor.dart';
 import 'package:gitjournal/editors/org_editor.dart';
@@ -98,8 +99,6 @@ class NoteEditor extends StatefulWidget {
   }
 }
 
-enum EditorType { Markdown, Raw, Checklist, Journal, Org }
-
 class NoteEditorState extends State<NoteEditor> with WidgetsBindingObserver {
   Note note;
   EditorType editorType = EditorType.Markdown;
diff --git a/lib/settings.dart b/lib/settings.dart
index 4734a049..43731d43 100644
--- a/lib/settings.dart
+++ b/lib/settings.dart
@@ -27,8 +27,8 @@ import 'package:shared_preferences/shared_preferences.dart';
 import 'package:uuid/uuid.dart';
 
 import 'package:gitjournal/core/sorting_mode.dart';
+import 'package:gitjournal/editors/common_types.dart';
 import 'package:gitjournal/folder_views/common_types.dart';
-import 'package:gitjournal/screens/note_editor.dart';
 
 const DEFAULT_ID = "0";
 const FOLDER_NAME_KEY = "remoteGitRepoPath";
diff --git a/lib/utils.dart b/lib/utils.dart
index 465492b7..5cd7a894 100644
--- a/lib/utils.dart
+++ b/lib/utils.dart
@@ -6,10 +6,10 @@ import 'package:provider/provider.dart';
 import 'package:share/share.dart';
 
 import 'package:gitjournal/core/notes_folder_fs.dart';
-import 'package:gitjournal/screens/note_editor.dart';
 import 'package:gitjournal/settings.dart';
 import 'app.dart';
 import 'core/note.dart';
+import 'editors/common_types.dart';
 import 'repository.dart';
 import 'utils/logger.dart';
 
diff --git a/lib/widgets/new_note_nav_bar.dart b/lib/widgets/new_note_nav_bar.dart
index 4febf1fa..f4ac22b5 100644
--- a/lib/widgets/new_note_nav_bar.dart
+++ b/lib/widgets/new_note_nav_bar.dart
@@ -3,7 +3,7 @@ import 'package:flutter/material.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:function_types/function_types.dart';
 
-import 'package:gitjournal/screens/note_editor.dart';
+import 'package:gitjournal/editors/common_types.dart';
 
 // FIXME: Remove note_editor import!!
 
diff --git a/lib/widgets/note_editor_selector.dart b/lib/widgets/note_editor_selector.dart
index cfe2ebc9..330fbfa1 100644
--- a/lib/widgets/note_editor_selector.dart
+++ b/lib/widgets/note_editor_selector.dart
@@ -22,7 +22,7 @@ import 'package:easy_localization/easy_localization.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 
 import 'package:gitjournal/core/note.dart';
-import 'package:gitjournal/screens/note_editor.dart';
+import 'package:gitjournal/editors/common_types.dart';
 
 class NoteEditorSelector extends StatelessWidget {
   final EditorType currentEditor;
diff --git a/test/notes_folder_config_test.dart b/test/notes_folder_config_test.dart
index 3f5a7ca9..ddca4837 100644
--- a/test/notes_folder_config_test.dart
+++ b/test/notes_folder_config_test.dart
@@ -6,9 +6,9 @@ import 'package:test/test.dart';
 import 'package:gitjournal/core/notes_folder_config.dart';
 import 'package:gitjournal/core/notes_folder_fs.dart';
 import 'package:gitjournal/core/sorting_mode.dart';
+import 'package:gitjournal/editors/common_types.dart';
 import 'package:gitjournal/folder_views/common.dart';
 import 'package:gitjournal/folder_views/standard_view.dart';
-import 'package:gitjournal/screens/note_editor.dart';
 import 'package:gitjournal/settings.dart';
 
 void main() {