From 464b7512e90fa6271b782f2b46d97a9892059ea8 Mon Sep 17 00:00:00 2001
From: Vishesh Handa <me@vhanda.in>
Date: Wed, 4 Dec 2019 14:18:11 +0100
Subject: [PATCH] Move Note and NoteFolder class into a core folder

---
 lib/appstate.dart                                | 4 ++--
 lib/{ => core}/note.dart                         | 2 +-
 lib/{ => core}/note_fileName.dart                | 4 ++--
 lib/{ => core}/note_folder.dart                  | 2 +-
 lib/screens/folder_listing.dart                  | 2 +-
 lib/screens/journal_browsing.dart                | 2 +-
 lib/screens/journal_editor.dart                  | 2 +-
 lib/screens/journal_listing.dart                 | 4 ++--
 lib/state_container.dart                         | 6 +++---
 lib/storage/git_storage.dart                     | 2 +-
 lib/utils.dart                                   | 2 +-
 lib/{datetime_utils.dart => utils/datetime.dart} | 0
 lib/widgets/folder_tree_view.dart                | 2 +-
 lib/widgets/journal_editor_header.dart           | 2 +-
 lib/widgets/journal_list.dart                    | 2 +-
 lib/widgets/notes_list.dart                      | 2 +-
 test/datetime_utils_test.dart                    | 2 +-
 test/note_storage_test.dart                      | 4 ++--
 test/serializers_test.dart                       | 2 +-
 19 files changed, 24 insertions(+), 24 deletions(-)
 rename lib/{ => core}/note.dart (98%)
 rename lib/{ => core}/note_fileName.dart (84%)
 rename lib/{ => core}/note_folder.dart (98%)
 rename lib/{datetime_utils.dart => utils/datetime.dart} (100%)

diff --git a/lib/appstate.dart b/lib/appstate.dart
index 31827c7d..caf156fe 100644
--- a/lib/appstate.dart
+++ b/lib/appstate.dart
@@ -1,7 +1,7 @@
 import 'package:shared_preferences/shared_preferences.dart';
 import 'package:fimber/fimber.dart';
-import 'package:gitjournal/note.dart';
-import 'package:gitjournal/note_folder.dart';
+import 'package:gitjournal/core/note.dart';
+import 'package:gitjournal/core/note_folder.dart';
 
 class AppState {
   //
diff --git a/lib/note.dart b/lib/core/note.dart
similarity index 98%
rename from lib/note.dart
rename to lib/core/note.dart
index eb88d354..6110e3ea 100644
--- a/lib/note.dart
+++ b/lib/core/note.dart
@@ -1,7 +1,7 @@
 import 'dart:io';
 
 import 'package:gitjournal/storage/serializers.dart';
-import 'package:gitjournal/datetime_utils.dart';
+import 'package:gitjournal/utils/datetime.dart';
 
 enum NoteLoadState {
   None,
diff --git a/lib/note_fileName.dart b/lib/core/note_fileName.dart
similarity index 84%
rename from lib/note_fileName.dart
rename to lib/core/note_fileName.dart
index 97f7b678..65e14e96 100644
--- a/lib/note_fileName.dart
+++ b/lib/core/note_fileName.dart
@@ -1,5 +1,5 @@
-import 'package:gitjournal/note.dart';
-import 'package:gitjournal/datetime_utils.dart';
+import 'package:gitjournal/core/note.dart';
+import 'package:gitjournal/utils/datetime.dart';
 import 'package:gitjournal/settings.dart';
 
 String getFileName(Note note) {
diff --git a/lib/note_folder.dart b/lib/core/note_folder.dart
similarity index 98%
rename from lib/note_folder.dart
rename to lib/core/note_folder.dart
index 26280d40..1f2d4860 100644
--- a/lib/note_folder.dart
+++ b/lib/core/note_folder.dart
@@ -1,6 +1,6 @@
 import 'dart:io';
 
-import 'package:gitjournal/note.dart';
+import 'package:gitjournal/core/note.dart';
 import 'package:path/path.dart';
 
 // FIXME: Maybe the parent should be a part of the Note, and the NoteFolder
diff --git a/lib/screens/folder_listing.dart b/lib/screens/folder_listing.dart
index 596fcc51..f53f8929 100644
--- a/lib/screens/folder_listing.dart
+++ b/lib/screens/folder_listing.dart
@@ -4,7 +4,7 @@ import 'package:gitjournal/widgets/app_bar_menu_button.dart';
 import 'package:gitjournal/widgets/app_drawer.dart';
 import 'package:gitjournal/widgets/folder_tree_view.dart';
 import 'package:gitjournal/state_container.dart';
-import 'package:gitjournal/note_folder.dart';
+import 'package:gitjournal/core/note_folder.dart';
 
 import 'journal_listing.dart';
 
diff --git a/lib/screens/journal_browsing.dart b/lib/screens/journal_browsing.dart
index f907c136..a28a29c7 100644
--- a/lib/screens/journal_browsing.dart
+++ b/lib/screens/journal_browsing.dart
@@ -2,7 +2,7 @@ import 'package:fimber/fimber.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_markdown/flutter_markdown.dart';
-import 'package:gitjournal/note.dart';
+import 'package:gitjournal/core/note.dart';
 import 'package:gitjournal/state_container.dart';
 import 'package:gitjournal/utils.dart';
 import 'package:gitjournal/settings.dart';
diff --git a/lib/screens/journal_editor.dart b/lib/screens/journal_editor.dart
index a8c8f7e1..56f8d34c 100644
--- a/lib/screens/journal_editor.dart
+++ b/lib/screens/journal_editor.dart
@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:gitjournal/note.dart';
+import 'package:gitjournal/core/note.dart';
 import 'package:gitjournal/state_container.dart';
 import 'package:gitjournal/widgets/journal_editor_header.dart';
 import 'package:gitjournal/storage/serializers.dart';
diff --git a/lib/screens/journal_listing.dart b/lib/screens/journal_listing.dart
index 992ce68a..66f28462 100644
--- a/lib/screens/journal_listing.dart
+++ b/lib/screens/journal_listing.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
-import 'package:gitjournal/note.dart';
-import 'package:gitjournal/note_folder.dart';
+import 'package:gitjournal/core/note.dart';
+import 'package:gitjournal/core/note_folder.dart';
 import 'package:gitjournal/utils.dart';
 import 'package:gitjournal/apis/git.dart';
 import 'package:gitjournal/screens/journal_editor.dart';
diff --git a/lib/state_container.dart b/lib/state_container.dart
index afb02a5c..2dcd8331 100644
--- a/lib/state_container.dart
+++ b/lib/state_container.dart
@@ -7,9 +7,9 @@ import 'package:flutter/material.dart';
 import 'package:gitjournal/analytics.dart';
 import 'package:gitjournal/apis/git_migration.dart';
 import 'package:gitjournal/appstate.dart';
-import 'package:gitjournal/note.dart';
-import 'package:gitjournal/note_folder.dart';
-import 'package:gitjournal/note_fileName.dart';
+import 'package:gitjournal/core/note.dart';
+import 'package:gitjournal/core/note_folder.dart';
+import 'package:gitjournal/core/note_fileName.dart';
 import 'package:gitjournal/storage/git_storage.dart';
 import 'package:path/path.dart' as p;
 import 'package:shared_preferences/shared_preferences.dart';
diff --git a/lib/storage/git_storage.dart b/lib/storage/git_storage.dart
index c3d07e12..9158aaf2 100644
--- a/lib/storage/git_storage.dart
+++ b/lib/storage/git_storage.dart
@@ -3,7 +3,7 @@ import 'dart:async';
 import 'package:fimber/fimber.dart';
 import 'package:flutter/foundation.dart';
 import 'package:gitjournal/apis/git.dart';
-import 'package:gitjournal/note.dart';
+import 'package:gitjournal/core/note.dart';
 import 'package:gitjournal/settings.dart';
 import 'package:path/path.dart' as p;
 
diff --git a/lib/utils.dart b/lib/utils.dart
index 26bdf750..a22fce0a 100644
--- a/lib/utils.dart
+++ b/lib/utils.dart
@@ -6,7 +6,7 @@ import 'package:package_info/package_info.dart';
 import 'package:flushbar/flushbar.dart';
 
 import 'app.dart';
-import 'note.dart';
+import 'core/note.dart';
 import 'state_container.dart';
 
 Future<String> getVersionString() async {
diff --git a/lib/datetime_utils.dart b/lib/utils/datetime.dart
similarity index 100%
rename from lib/datetime_utils.dart
rename to lib/utils/datetime.dart
diff --git a/lib/widgets/folder_tree_view.dart b/lib/widgets/folder_tree_view.dart
index d034681d..bab65860 100644
--- a/lib/widgets/folder_tree_view.dart
+++ b/lib/widgets/folder_tree_view.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 
-import 'package:gitjournal/note_folder.dart';
+import 'package:gitjournal/core/note_folder.dart';
 
 typedef void FolderSelectedCallback(NoteFolder folder);
 
diff --git a/lib/widgets/journal_editor_header.dart b/lib/widgets/journal_editor_header.dart
index 9bc986f8..a3baee4e 100644
--- a/lib/widgets/journal_editor_header.dart
+++ b/lib/widgets/journal_editor_header.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:intl/intl.dart';
-import 'package:gitjournal/note.dart';
+import 'package:gitjournal/core/note.dart';
 
 class JournalEditorHeader extends StatelessWidget {
   final Note note;
diff --git a/lib/widgets/journal_list.dart b/lib/widgets/journal_list.dart
index cca868d3..38a3f62b 100644
--- a/lib/widgets/journal_list.dart
+++ b/lib/widgets/journal_list.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:intl/intl.dart';
-import 'package:gitjournal/note.dart';
+import 'package:gitjournal/core/note.dart';
 import 'package:gitjournal/state_container.dart';
 import 'package:gitjournal/utils.dart';
 import 'package:gitjournal/utils/markdown.dart';
diff --git a/lib/widgets/notes_list.dart b/lib/widgets/notes_list.dart
index 235393de..dfc5f537 100644
--- a/lib/widgets/notes_list.dart
+++ b/lib/widgets/notes_list.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
-import 'package:gitjournal/note.dart';
+import 'package:gitjournal/core/note.dart';
 import 'package:gitjournal/utils/markdown.dart';
 import 'package:flutter_staggered_grid_view/flutter_staggered_grid_view.dart';
 
diff --git a/test/datetime_utils_test.dart b/test/datetime_utils_test.dart
index eb950882..64f2542e 100644
--- a/test/datetime_utils_test.dart
+++ b/test/datetime_utils_test.dart
@@ -1,4 +1,4 @@
-import 'package:gitjournal/datetime_utils.dart';
+import 'package:gitjournal/utils/datetime.dart';
 import 'package:test/test.dart';
 
 void main() {
diff --git a/test/note_storage_test.dart b/test/note_storage_test.dart
index e37fee39..1d80f572 100644
--- a/test/note_storage_test.dart
+++ b/test/note_storage_test.dart
@@ -1,8 +1,8 @@
 import 'dart:collection';
 import 'dart:io';
 
-import 'package:gitjournal/datetime_utils.dart';
-import 'package:gitjournal/note.dart';
+import 'package:gitjournal/utils/datetime.dart';
+import 'package:gitjournal/core/note.dart';
 import 'package:gitjournal/storage/serializers.dart';
 import 'package:path/path.dart' as p;
 import 'package:test/test.dart';
diff --git a/test/serializers_test.dart b/test/serializers_test.dart
index 55735314..9f7fbeca 100644
--- a/test/serializers_test.dart
+++ b/test/serializers_test.dart
@@ -1,7 +1,7 @@
 import 'dart:collection';
 
 import 'package:gitjournal/storage/serializers.dart';
-import 'package:gitjournal/datetime_utils.dart';
+import 'package:gitjournal/utils/datetime.dart';
 import 'package:test/test.dart';
 
 DateTime nowWithoutMicro() {