Use import_sorter

flutter pub run import_sorter:main --no-comments

The code feels much cleaner

lib/analytics.dart

@@ -1,9 +1,10 @@
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 
+import 'package:firebase_analytics/firebase_analytics.dart';
+
 import 'package:gitjournal/app.dart';
 import 'package:gitjournal/error_reporting.dart';
-import 'package:firebase_analytics/firebase_analytics.dart';
 import 'package:gitjournal/utils/logger.dart';
 
 Analytics getAnalytics() {

lib/apis/git_migration.dart

@@ -2,11 +2,12 @@ import 'dart:async';
 import 'dart:io';
 
 import 'package:flutter/foundation.dart';
+
 import 'package:git_bindings/git_bindings.dart';
+import 'package:path/path.dart' as p;
 
 import 'package:gitjournal/settings.dart';
 import 'package:gitjournal/utils/logger.dart';
-import 'package:path/path.dart' as p;
 
 //
 // FIXME: This isn't ideal as we are skipping all the edits / deletes

lib/apis/github.dart

@@ -3,6 +3,7 @@ import 'dart:convert';
 import 'dart:io';
 
 import 'package:flutter/services.dart';
+
 import 'package:http/http.dart' as http;
 import 'package:url_launcher/url_launcher.dart';
 

lib/apis/gitlab.dart

@@ -4,6 +4,7 @@ import 'dart:io';
 import 'dart:math';
 
 import 'package:flutter/services.dart';
+
 import 'package:http/http.dart' as http;
 import 'package:url_launcher/url_launcher.dart';
 

lib/app.dart

@@ -1,42 +1,37 @@
 import 'dart:async';
 import 'dart:io';
 
-import 'package:device_info/device_info.dart';
-import 'package:firebase_analytics/observer.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter/foundation.dart' as foundation;
+import 'package:flutter/material.dart';
+
+import 'package:dart_git/git.dart';
+import 'package:device_info/device_info.dart';
+import 'package:dynamic_theme/dynamic_theme.dart';
+import 'package:easy_localization/easy_localization.dart';
+import 'package:easy_localization_loader/easy_localization_loader.dart';
+import 'package:firebase_analytics/observer.dart';
+import 'package:flutter_sentry/flutter_sentry.dart';
+import 'package:path/path.dart' as p;
+import 'package:path_provider/path_provider.dart';
+import 'package:provider/provider.dart';
+import 'package:quick_actions/quick_actions.dart';
+import 'package:receive_sharing_intent/receive_sharing_intent.dart';
+import 'package:shared_preferences/shared_preferences.dart';
 
 import 'package:gitjournal/analytics.dart';
+import 'package:gitjournal/appstate.dart';
 import 'package:gitjournal/iap.dart';
 import 'package:gitjournal/screens/filesystem_screen.dart';
 import 'package:gitjournal/screens/folder_listing.dart';
-import 'package:gitjournal/screens/tag_listing.dart';
 import 'package:gitjournal/screens/note_editor.dart';
 import 'package:gitjournal/screens/purchase_screen.dart';
 import 'package:gitjournal/screens/purchase_thankyou_screen.dart';
-import 'package:gitjournal/utils.dart';
+import 'package:gitjournal/screens/tag_listing.dart';
-import 'package:gitjournal/utils/logger.dart';
-import 'package:provider/provider.dart';
-import 'package:path/path.dart' as p;
-import 'package:flutter_sentry/flutter_sentry.dart';
-
-import 'package:easy_localization/easy_localization.dart';
-import 'package:easy_localization_loader/easy_localization_loader.dart';
-
-import 'package:dart_git/git.dart';
-
-import 'package:quick_actions/quick_actions.dart';
-import 'package:receive_sharing_intent/receive_sharing_intent.dart';
-
 import 'package:gitjournal/settings.dart';
 import 'package:gitjournal/state_container.dart';
-import 'package:gitjournal/appstate.dart';
 import 'package:gitjournal/themes.dart';
-
+import 'package:gitjournal/utils.dart';
-import 'package:shared_preferences/shared_preferences.dart';
+import 'package:gitjournal/utils/logger.dart';
-import 'package:dynamic_theme/dynamic_theme.dart';
-import 'package:path_provider/path_provider.dart';
-
 import 'screens/home_screen.dart';
 import 'screens/onboarding_screens.dart';
 import 'screens/settings_screen.dart';

lib/core/checklist.dart

@@ -1,9 +1,9 @@
 import 'dart:convert';
 
-import 'package:gitjournal/error_reporting.dart';
 import 'package:meta/meta.dart';
 
 import 'package:gitjournal/core/note.dart';
+import 'package:gitjournal/error_reporting.dart';
 
 class ChecklistItem {
   bool checked;

lib/core/git_repo.dart

@@ -3,6 +3,7 @@ import 'dart:io';
 
 import 'package:flutter/foundation.dart';
 
+import 'package:dart_git/git.dart' as git;
 import 'package:git_bindings/git_bindings.dart';
 
 import 'package:gitjournal/core/note.dart';
@@ -11,8 +12,6 @@ import 'package:gitjournal/core/notes_folder_fs.dart';
 import 'package:gitjournal/settings.dart';
 import 'package:gitjournal/utils/logger.dart';
 
-import 'package:dart_git/git.dart' as git;
-
 class NoteRepoResult {
   bool error;
   String noteFilePath;

lib/core/link.dart

@@ -1,5 +1,5 @@
-import 'package:meta/meta.dart';
 import 'package:markdown/markdown.dart' as md;
+import 'package:meta/meta.dart';
 
 class Link {
   String term;

lib/core/links_loader.dart

@@ -1,11 +1,11 @@
 import 'dart:io';
 import 'dart:isolate';
 
-import 'package:gitjournal/core/link.dart';
-import 'package:synchronized/synchronized.dart';
-import 'package:path/path.dart' as p;
-
 import 'package:markdown/markdown.dart' as md;
+import 'package:path/path.dart' as p;
+import 'package:synchronized/synchronized.dart';
+
+import 'package:gitjournal/core/link.dart';
 
 class LinksLoader {
   Isolate _isolate;

lib/core/md_yaml_doc.dart

@@ -1,4 +1,5 @@
 import 'dart:collection';
+
 import 'package:collection/collection.dart';
 
 Function _deepEq = const DeepCollectionEquality().equals;

lib/core/md_yaml_doc_codec.dart

@@ -2,8 +2,8 @@ import 'dart:collection';
 
 import 'package:yaml/yaml.dart';
 import 'package:yaml_serializer/yaml_serializer.dart';
-import 'package:gitjournal/utils/logger.dart';
 
+import 'package:gitjournal/utils/logger.dart';
 import 'md_yaml_doc.dart';
 
 class MarkdownYAMLCodec {

lib/core/note.dart

@@ -1,19 +1,17 @@
 import 'dart:io';
 
-import 'package:gitjournal/core/md_yaml_doc_loader.dart';
+import 'package:path/path.dart' as p;
+import 'package:uuid/uuid.dart';
+
 import 'package:gitjournal/core/links_loader.dart';
+import 'package:gitjournal/core/md_yaml_doc_loader.dart';
 import 'package:gitjournal/core/note_notifier.dart';
 import 'package:gitjournal/core/notes_folder_fs.dart';
 import 'package:gitjournal/error_reporting.dart';
 import 'package:gitjournal/settings.dart';
-import 'package:gitjournal/utils/markdown.dart';
-import 'package:gitjournal/utils/logger.dart';
 import 'package:gitjournal/utils/datetime.dart';
-
+import 'package:gitjournal/utils/logger.dart';
-import 'package:path/path.dart' as p;
+import 'package:gitjournal/utils/markdown.dart';
-
-import 'package:uuid/uuid.dart';
-
 import 'link.dart';
 import 'md_yaml_doc.dart';
 import 'md_yaml_doc_codec.dart';

lib/core/note_notifier.dart

@@ -1,5 +1,5 @@
-import 'package:flutter/material.dart';
 import 'package:flutter/foundation.dart';
+import 'package:flutter/material.dart';
 
 import 'note.dart';
 

lib/core/note_serializer.dart

@@ -1,9 +1,9 @@
-import 'package:gitjournal/utils/datetime.dart';
-import 'package:gitjournal/settings.dart';
 import 'package:flutter_emoji/flutter_emoji.dart';
-import 'package:gitjournal/utils/logger.dart';
 import 'package:yaml/yaml.dart';
 
+import 'package:gitjournal/settings.dart';
+import 'package:gitjournal/utils/datetime.dart';
+import 'package:gitjournal/utils/logger.dart';
 import 'md_yaml_doc.dart';
 import 'note.dart';
 

lib/core/notes_cache.dart

@@ -2,13 +2,14 @@ import 'dart:convert';
 import 'dart:io';
 
 import 'package:flutter/material.dart';
-import 'package:gitjournal/error_reporting.dart';
+
-import 'package:path/path.dart' as p;
 import 'package:collection/collection.dart';
+import 'package:path/path.dart' as p;
 
 import 'package:gitjournal/core/note.dart';
 import 'package:gitjournal/core/notes_folder_fs.dart';
 import 'package:gitjournal/core/sorting_mode.dart';
+import 'package:gitjournal/error_reporting.dart';
 import 'package:gitjournal/utils/logger.dart';
 
 class NotesCache {

lib/core/notes_folder_config.dart

@@ -1,5 +1,11 @@
 import 'dart:io';
 
+import 'package:equatable/equatable.dart';
+import 'package:meta/meta.dart';
+import 'package:path/path.dart' as p;
+import 'package:yaml/yaml.dart';
+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/folder_views/common.dart';
@@ -8,13 +14,6 @@ import 'package:gitjournal/screens/note_editor.dart';
 import 'package:gitjournal/settings.dart';
 import 'package:gitjournal/utils/logger.dart';
 
-import 'package:meta/meta.dart';
-import 'package:path/path.dart' as p;
-
-import 'package:yaml/yaml.dart';
-import 'package:yaml_serializer/yaml_serializer.dart';
-import 'package:equatable/equatable.dart';
-
 @immutable
 class NotesFolderConfig extends Equatable {
   static const FILENAME = ".gitjournal.yaml";

lib/core/notes_folder_fs.dart

@@ -1,14 +1,13 @@
 import 'dart:io';
 
 import 'package:easy_localization/easy_localization.dart';
-import 'package:gitjournal/features.dart';
+import 'package:meta/meta.dart';
-import 'package:gitjournal/utils/logger.dart';
-
 import 'package:path/path.dart' as p;
 import 'package:path/path.dart';
 import 'package:synchronized/synchronized.dart';
-import 'package:meta/meta.dart';
 
+import 'package:gitjournal/features.dart';
+import 'package:gitjournal/utils/logger.dart';
 import 'note.dart';
 import 'notes_folder.dart';
 import 'notes_folder_notifier.dart';

lib/core/notes_folder_notifier.dart

@@ -1,7 +1,7 @@
-import 'package:flutter/material.dart';
 import 'package:flutter/foundation.dart';
-import 'package:gitjournal/core/notes_folder_fs.dart';
+import 'package:flutter/material.dart';
 
+import 'package:gitjournal/core/notes_folder_fs.dart';
 import 'note.dart';
 import 'notes_folder.dart';
 

lib/core/sorted_notes_folder.dart

@@ -1,9 +1,9 @@
 import 'dart:math';
 
 import 'package:flutter/material.dart';
+
 import 'package:gitjournal/core/sorting_mode.dart';
 import 'package:gitjournal/utils/logger.dart';
-
 import 'note.dart';
 import 'notes_folder.dart';
 import 'notes_folder_notifier.dart';

lib/editors/checklist_editor.dart

@@ -1,11 +1,12 @@
 import 'dart:async';
 import 'dart:io';
 
-import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
-import 'package:gitjournal/core/checklist.dart';
 
+import 'package:easy_localization/easy_localization.dart';
+
+import 'package:gitjournal/core/checklist.dart';
 import 'package:gitjournal/core/note.dart';
 import 'package:gitjournal/editors/common.dart';
 import 'package:gitjournal/editors/note_title_editor.dart';

lib/editors/common.dart

@@ -1,16 +1,17 @@
 import 'dart:io';
 
-import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
+
+import 'package:easy_localization/easy_localization.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
+import 'package:image_picker/image_picker.dart';
+import 'package:share/share.dart';
+
 import 'package:gitjournal/core/note.dart';
 import 'package:gitjournal/core/notes_folder_fs.dart';
 import 'package:gitjournal/error_reporting.dart';
 import 'package:gitjournal/widgets/pro_overlay.dart';
-import 'package:share/share.dart';
-
-import 'package:image_picker/image_picker.dart';
 
 typedef NoteCallback = void Function(Note);
 

lib/editors/journal_editor.dart

@@ -1,4 +1,5 @@
 import 'dart:io';
+
 import 'package:flutter/material.dart';
 
 import 'package:gitjournal/core/note.dart';

lib/editors/markdown_editor.dart

@@ -1,4 +1,5 @@
 import 'dart:io';
+
 import 'package:flutter/material.dart';
 
 import 'package:gitjournal/core/note.dart';

lib/editors/raw_editor.dart

@@ -1,8 +1,9 @@
 import 'dart:io';
+
 import 'package:flutter/material.dart';
 
-import 'package:gitjournal/core/note.dart';
 import 'package:gitjournal/core/md_yaml_doc_codec.dart';
+import 'package:gitjournal/core/note.dart';
 import 'package:gitjournal/editors/common.dart';
 import 'package:gitjournal/widgets/editor_scroll_view.dart';
 

lib/error_reporting.dart

@@ -1,16 +1,17 @@
 import 'dart:async';
 import 'dart:io';
 
-import 'package:device_info/device_info.dart';
 import 'package:flutter/foundation.dart';
+
+import 'package:device_info/device_info.dart';
 import 'package:flutter_crashlytics/flutter_crashlytics.dart';
-import 'package:gitjournal/app.dart';
-import 'package:gitjournal/settings.dart';
-import 'package:gitjournal/utils/logger.dart';
 import 'package:package_info/package_info.dart';
 import 'package:sentry/sentry.dart';
 
 import 'package:gitjournal/.env.dart';
+import 'package:gitjournal/app.dart';
+import 'package:gitjournal/settings.dart';
+import 'package:gitjournal/utils/logger.dart';
 
 SentryClient _sentryClient;
 Future<SentryClient> _initSentry() async {

lib/folder_views/card_view.dart

@@ -1,6 +1,8 @@
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
+
 import 'package:flutter_staggered_grid_view/flutter_staggered_grid_view.dart';
+
 import 'package:gitjournal/core/notes_folder.dart';
 import 'package:gitjournal/folder_views/note_tile.dart';
 

lib/folder_views/common.dart

@@ -1,5 +1,7 @@
 import 'package:flutter/material.dart';
 
+import 'package:provider/provider.dart';
+
 import 'package:gitjournal/core/note.dart';
 import 'package:gitjournal/core/notes_folder.dart';
 import 'package:gitjournal/folder_views/card_view.dart';
@@ -9,8 +11,6 @@ import 'package:gitjournal/screens/note_editor.dart';
 import 'package:gitjournal/state_container.dart';
 import 'package:gitjournal/utils.dart';
 import 'package:gitjournal/utils/logger.dart';
-import 'package:provider/provider.dart';
-
 import 'standard_view.dart';
 
 enum FolderViewType {

lib/folder_views/grid_view.dart

@@ -1,5 +1,6 @@
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
+
 import 'package:gitjournal/core/notes_folder.dart';
 import 'package:gitjournal/folder_views/card_view.dart';
 import 'package:gitjournal/folder_views/note_tile.dart';

lib/folder_views/journal_view.dart

@@ -1,12 +1,12 @@
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
-import 'package:gitjournal/folder_views/list_view.dart';
 
 import 'package:intl/intl.dart';
 
-import 'package:gitjournal/core/sorting_mode.dart';
 import 'package:gitjournal/core/note.dart';
 import 'package:gitjournal/core/notes_folder.dart';
+import 'package:gitjournal/core/sorting_mode.dart';
+import 'package:gitjournal/folder_views/list_view.dart';
 
 class JournalView extends StatelessWidget {
   final NoteSelectedFunction noteSelectedFunction;

lib/folder_views/note_tile.dart

@@ -1,6 +1,7 @@
 import 'dart:convert';
 
 import 'package:flutter/material.dart';
+
 import 'package:gitjournal/core/note.dart';
 import 'package:gitjournal/utils/markdown.dart';
 

lib/folder_views/standard_view.dart

@@ -1,12 +1,12 @@
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
-import 'package:gitjournal/core/sorting_mode.dart';
-import 'package:gitjournal/folder_views/list_view.dart';
 
 import 'package:intl/intl.dart';
 
 import 'package:gitjournal/core/note.dart';
 import 'package:gitjournal/core/notes_folder.dart';
+import 'package:gitjournal/core/sorting_mode.dart';
+import 'package:gitjournal/folder_views/list_view.dart';
 
 enum StandardViewHeader {
   TitleOrFileName,

lib/iap.dart

@@ -1,12 +1,12 @@
 import 'dart:convert';
 import 'dart:io' show Platform;
 
-import 'package:gitjournal/app.dart';
-import 'package:gitjournal/utils/logger.dart';
-import 'package:in_app_purchase/in_app_purchase.dart';
 import 'package:http/http.dart' as http;
+import 'package:in_app_purchase/in_app_purchase.dart';
 
+import 'package:gitjournal/app.dart';
 import 'package:gitjournal/settings.dart';
+import 'package:gitjournal/utils/logger.dart';
 
 class InAppPurchases {
   static Future<void> confirmProPurchaseBoot() async {

lib/main.dart

@@ -1,13 +1,13 @@
 import 'dart:async';
 import 'dart:isolate';
 
-import 'package:flutter/material.dart';
 import 'package:flutter/foundation.dart' as foundation;
+import 'package:flutter/material.dart';
 
-import 'package:gitjournal/error_reporting.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 
 import 'package:gitjournal/app.dart';
+import 'package:gitjournal/error_reporting.dart';
 import 'package:gitjournal/settings.dart';
 
 void main() async {

lib/screens/debug_screen.dart

@@ -1,5 +1,7 @@
 import 'package:flutter/material.dart';
+
 import 'package:easy_localization/easy_localization.dart';
+
 import 'package:gitjournal/settings.dart';
 import 'package:gitjournal/utils/logger.dart';
 

lib/screens/filesystem_screen.dart

@@ -1,13 +1,14 @@
-import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
+
+import 'package:easy_localization/easy_localization.dart';
 import 'package:function_types/function_types.dart';
-import 'package:gitjournal/state_container.dart';
-import 'package:gitjournal/widgets/rename_dialog.dart';
 import 'package:provider/provider.dart';
 
 import 'package:gitjournal/core/note.dart';
 import 'package:gitjournal/core/notes_folder_fs.dart';
+import 'package:gitjournal/state_container.dart';
 import 'package:gitjournal/widgets/app_drawer.dart';
+import 'package:gitjournal/widgets/rename_dialog.dart';
 
 class FileSystemScreen extends StatefulWidget {
   @override

lib/screens/folder_listing.dart

@@ -1,14 +1,14 @@
-import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
+
+import 'package:easy_localization/easy_localization.dart';
 import 'package:provider/provider.dart';
 
+import 'package:gitjournal/core/notes_folder_fs.dart';
+import 'package:gitjournal/state_container.dart';
 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/widgets/rename_dialog.dart';
-import 'package:gitjournal/state_container.dart';
-import 'package:gitjournal/core/notes_folder_fs.dart';
-
 import 'folder_view.dart';
 
 class FolderListingScreen extends StatefulWidget {

lib/screens/folder_view.dart

@@ -2,24 +2,23 @@ import 'package:flutter/material.dart';
 
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:git_bindings/git_bindings.dart';
+import 'package:provider/provider.dart';
 
 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/folder_views/common.dart';
 import 'package:gitjournal/folder_views/standard_view.dart';
 import 'package:gitjournal/screens/note_editor.dart';
 import 'package:gitjournal/screens/settings_screen.dart';
 import 'package:gitjournal/settings.dart';
 import 'package:gitjournal/state_container.dart';
 import 'package:gitjournal/utils.dart';
-import 'package:gitjournal/widgets/app_drawer.dart';
 import 'package:gitjournal/widgets/app_bar_menu_button.dart';
+import 'package:gitjournal/widgets/app_drawer.dart';
 import 'package:gitjournal/widgets/note_search_delegate.dart';
 import 'package:gitjournal/widgets/sync_button.dart';
-import 'package:gitjournal/folder_views/common.dart';
-
-import 'package:provider/provider.dart';
 
 enum DropDownChoices {
   SortingOptions,

lib/screens/home_screen.dart

@@ -1,11 +1,11 @@
 import 'package:flutter/material.dart';
+
+import 'package:intl/date_symbol_data_local.dart';
+import 'package:provider/provider.dart';
+
 import 'package:gitjournal/core/flattened_notes_folder.dart';
 import 'package:gitjournal/core/notes_folder.dart';
-import 'package:provider/provider.dart';
-import 'package:intl/date_symbol_data_local.dart';
-
 import 'package:gitjournal/core/notes_folder_fs.dart';
-
 import 'folder_view.dart';
 
 class HomeScreen extends StatefulWidget {

lib/screens/note_editor.dart

@@ -1,17 +1,19 @@
 import 'dart:io';
 
-import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
-import 'package:collection/collection.dart';
 import 'package:flutter/services.dart';
 
-import 'package:gitjournal/core/note.dart';
+import 'package:collection/collection.dart';
+import 'package:easy_localization/easy_localization.dart';
+import 'package:provider/provider.dart';
+
 import 'package:gitjournal/core/md_yaml_doc.dart';
+import 'package:gitjournal/core/note.dart';
 import 'package:gitjournal/core/notes_folder_fs.dart';
+import 'package:gitjournal/editors/checklist_editor.dart';
 import 'package:gitjournal/editors/journal_editor.dart';
 import 'package:gitjournal/editors/markdown_editor.dart';
 import 'package:gitjournal/editors/raw_editor.dart';
-import 'package:gitjournal/editors/checklist_editor.dart';
 import 'package:gitjournal/error_reporting.dart';
 import 'package:gitjournal/state_container.dart';
 import 'package:gitjournal/utils.dart';
@@ -20,7 +22,6 @@ import 'package:gitjournal/widgets/folder_selection_dialog.dart';
 import 'package:gitjournal/widgets/note_editor_selector.dart';
 import 'package:gitjournal/widgets/note_tag_editor.dart';
 import 'package:gitjournal/widgets/rename_dialog.dart';
-import 'package:provider/provider.dart';
 
 class ShowUndoSnackbar {}
 

lib/screens/onboarding_screens.dart

@@ -1,6 +1,7 @@
+import 'package:flutter/material.dart';
+
 import 'package:auto_size_text/auto_size_text.dart';
 import 'package:dots_indicator/dots_indicator.dart';
-import 'package:flutter/material.dart';
 import 'package:function_types/function_types.dart';
 
 class OnBoardingScreen extends StatefulWidget {

lib/screens/settings_editors.dart

@@ -1,9 +1,11 @@
-import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
-import 'package:gitjournal/screens/settings_screen.dart';
+
-import 'package:gitjournal/settings.dart';
+import 'package:easy_localization/easy_localization.dart';
-import 'package:gitjournal/screens/settings_widgets.dart';
+
 import 'package:gitjournal/core/notes_folder_fs.dart';
+import 'package:gitjournal/screens/settings_screen.dart';
+import 'package:gitjournal/screens/settings_widgets.dart';
+import 'package:gitjournal/settings.dart';
 import 'package:gitjournal/widgets/folder_selection_dialog.dart';
 import 'package:gitjournal/widgets/pro_overlay.dart';
 

lib/screens/settings_experimental.dart

@@ -1,5 +1,7 @@
 import 'package:flutter/material.dart';
+
 import 'package:easy_localization/easy_localization.dart';
+
 import 'package:gitjournal/settings.dart';
 
 class ExperimentalSettingsScreen extends StatefulWidget {

lib/screens/settings_git_remote.dart

@@ -1,20 +1,20 @@
 import 'dart:io';
 
-import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 
+import 'package:easy_localization/easy_localization.dart';
 import 'package:git_bindings/git_bindings.dart';
-import 'package:gitjournal/setup/screens.dart';
+import 'package:path/path.dart' as p;
-import 'package:gitjournal/setup/sshkey.dart';
+import 'package:provider/provider.dart';
+
 import 'package:gitjournal/screens/settings_widgets.dart';
 import 'package:gitjournal/settings.dart';
+import 'package:gitjournal/setup/screens.dart';
+import 'package:gitjournal/setup/sshkey.dart';
 import 'package:gitjournal/state_container.dart';
 import 'package:gitjournal/utils.dart';
 import 'package:gitjournal/utils/logger.dart';
-import 'package:provider/provider.dart';
-
-import 'package:path/path.dart' as p;
 
 class GitRemoteSettingsScreen extends StatefulWidget {
   @override

lib/screens/settings_images.dart

@@ -1,11 +1,13 @@
-import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
-import 'package:gitjournal/settings.dart';
+
-import 'package:gitjournal/screens/settings_widgets.dart';
+import 'package:easy_localization/easy_localization.dart';
+import 'package:provider/provider.dart';
+
 import 'package:gitjournal/core/notes_folder_fs.dart';
+import 'package:gitjournal/screens/settings_widgets.dart';
+import 'package:gitjournal/settings.dart';
 import 'package:gitjournal/widgets/folder_selection_dialog.dart';
 import 'package:gitjournal/widgets/pro_overlay.dart';
-import 'package:provider/provider.dart';
 
 class SettingsImagesScreen extends StatefulWidget {
   @override

lib/screens/settings_note_metadata.dart

@@ -1,9 +1,11 @@
-import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
+
+import 'package:easy_localization/easy_localization.dart';
+
+import 'package:gitjournal/core/md_yaml_doc_codec.dart';
+import 'package:gitjournal/screens/settings_widgets.dart';
 import 'package:gitjournal/settings.dart';
 import 'package:gitjournal/utils/datetime.dart';
-import 'package:gitjournal/screens/settings_widgets.dart';
-import 'package:gitjournal/core/md_yaml_doc_codec.dart';
 import 'package:gitjournal/widgets/pro_overlay.dart';
 
 class NoteMetadataSettingsScreen extends StatefulWidget {

lib/screens/settings_screen.dart

@@ -1,23 +1,23 @@
 import 'package:flutter/material.dart';
+
+import 'package:dynamic_theme/dynamic_theme.dart';
 import 'package:easy_localization/easy_localization.dart';
+import 'package:provider/provider.dart';
+import 'package:url_launcher/url_launcher.dart';
 
 import 'package:gitjournal/core/notes_folder_fs.dart';
 import 'package:gitjournal/screens/debug_screen.dart';
 import 'package:gitjournal/screens/settings_editors.dart';
 import 'package:gitjournal/screens/settings_experimental.dart';
+import 'package:gitjournal/screens/settings_git_remote.dart';
 import 'package:gitjournal/screens/settings_images.dart';
+import 'package:gitjournal/screens/settings_note_metadata.dart';
+import 'package:gitjournal/screens/settings_widgets.dart';
 import 'package:gitjournal/settings.dart';
 import 'package:gitjournal/state_container.dart';
 import 'package:gitjournal/utils.dart';
-import 'package:gitjournal/screens/settings_widgets.dart';
-import 'package:gitjournal/screens/settings_git_remote.dart';
-import 'package:gitjournal/screens/settings_note_metadata.dart';
-
-import 'package:dynamic_theme/dynamic_theme.dart';
 import 'package:gitjournal/widgets/folder_selection_dialog.dart';
 import 'package:gitjournal/widgets/pro_overlay.dart';
-import 'package:provider/provider.dart';
-import 'package:url_launcher/url_launcher.dart';
 
 class SettingsScreen extends StatelessWidget {
   @override

lib/screens/tag_listing.dart

@@ -1,7 +1,11 @@
 import 'dart:collection';
 
 import 'package:flutter/material.dart';
+
 import 'package:easy_localization/easy_localization.dart';
+import 'package:font_awesome_flutter/font_awesome_flutter.dart';
+import 'package:provider/provider.dart';
+
 import 'package:gitjournal/core/flattened_notes_folder.dart';
 import 'package:gitjournal/core/note.dart';
 import 'package:gitjournal/core/note_serializer.dart';
@@ -10,8 +14,6 @@ import 'package:gitjournal/screens/folder_view.dart';
 import 'package:gitjournal/widgets/app_bar_menu_button.dart';
 import 'package:gitjournal/widgets/app_drawer.dart';
 import 'package:gitjournal/widgets/pro_overlay.dart';
-import 'package:provider/provider.dart';
-import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 
 class TagListingScreen extends StatelessWidget {
   @override

lib/settings.dart

@@ -1,9 +1,9 @@
+import 'package:shared_preferences/shared_preferences.dart';
+import 'package:uuid/uuid.dart';
+
+import 'package:gitjournal/core/sorting_mode.dart';
 import 'package:gitjournal/folder_views/common.dart';
 import 'package:gitjournal/screens/note_editor.dart';
-import 'package:shared_preferences/shared_preferences.dart';
-import 'package:gitjournal/core/sorting_mode.dart';
-
-import 'package:uuid/uuid.dart';
 
 class Settings {
   static List<Function> changeObservers = [];

lib/setup/autoconfigure.dart

@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
+
 import 'package:function_types/function_types.dart';
 
 import 'package:gitjournal/analytics.dart';
@@ -7,7 +8,6 @@ import 'package:gitjournal/apis/githost_factory.dart';
 import 'package:gitjournal/error_reporting.dart';
 import 'package:gitjournal/settings.dart';
 import 'package:gitjournal/utils/logger.dart';
-
 import 'button.dart';
 import 'error.dart';
 import 'loading.dart';

lib/setup/button.dart

@@ -1,5 +1,7 @@
 import 'package:flutter/material.dart';
+
 import 'package:function_types/function_types.dart';
+
 import 'package:gitjournal/analytics.dart';
 import 'package:gitjournal/utils/logger.dart';
 

lib/setup/clone_url.dart

@@ -1,9 +1,10 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
-import 'package:git_url_parse2/git_url_parse2.dart';
-import 'package:function_types/function_types.dart';
-import 'package:gitjournal/apis/githost_factory.dart';
 
+import 'package:function_types/function_types.dart';
+import 'package:git_url_parse2/git_url_parse2.dart';
+
+import 'package:gitjournal/apis/githost_factory.dart';
 import 'button.dart';
 
 class GitCloneUrlPage extends StatefulWidget {

lib/setup/repo_selector.dart

@@ -1,12 +1,12 @@
 import 'package:flutter/material.dart';
+
 import 'package:function_types/function_types.dart';
+import 'package:intl/intl.dart';
 
 import 'package:gitjournal/analytics.dart';
 import 'package:gitjournal/apis/githost_factory.dart';
 import 'package:gitjournal/error_reporting.dart';
 import 'package:gitjournal/utils/logger.dart';
-import 'package:intl/intl.dart';
-
 import 'button.dart';
 import 'error.dart';
 import 'loading.dart';

lib/setup/screens.dart

@@ -1,25 +1,23 @@
 import 'dart:io';
 
-import 'package:dots_indicator/dots_indicator.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 
+import 'package:dots_indicator/dots_indicator.dart';
 import 'package:function_types/function_types.dart';
 import 'package:git_bindings/git_bindings.dart';
-
-import 'package:gitjournal/analytics.dart';
-import 'package:gitjournal/apis/githost_factory.dart';
-import 'package:gitjournal/error_reporting.dart';
-import 'package:gitjournal/setup/repo_selector.dart';
-import 'package:gitjournal/state_container.dart';
-import 'package:gitjournal/utils.dart';
-import 'package:gitjournal/settings.dart';
-import 'package:gitjournal/utils/logger.dart';
-
 import 'package:path/path.dart' as p;
 import 'package:provider/provider.dart';
 import 'package:url_launcher/url_launcher.dart';
 
+import 'package:gitjournal/analytics.dart';
+import 'package:gitjournal/apis/githost_factory.dart';
+import 'package:gitjournal/error_reporting.dart';
+import 'package:gitjournal/settings.dart';
+import 'package:gitjournal/setup/repo_selector.dart';
+import 'package:gitjournal/state_container.dart';
+import 'package:gitjournal/utils.dart';
+import 'package:gitjournal/utils/logger.dart';
 import 'autoconfigure.dart';
 import 'button.dart';
 import 'clone_url.dart';

lib/setup/sshkey.dart

@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+
 import 'package:function_types/function_types.dart';
 
 import 'button.dart';

lib/ssh/keygen.dart

@@ -1,9 +1,9 @@
 import 'package:git_bindings/git_bindings.dart';
+import 'package:meta/meta.dart';
+
 import 'package:gitjournal/ssh/rsa_key_pair.dart';
 import 'package:gitjournal/utils/logger.dart';
 
-import 'package:meta/meta.dart';
-
 Future<String> generateSSHKeys({@required String comment}) async {
   try {
     var keyPair = await RsaKeyPair.generateAsync();

lib/ssh/main_keygen.dart

@@ -1,4 +1,5 @@
 import 'dart:io';
+
 import 'package:gitjournal/ssh/rsa_key_pair.dart';
 
 void main() {

lib/ssh/rsa_key_pair.dart

@@ -3,17 +3,17 @@ import 'dart:convert';
 import 'dart:math';
 import 'dart:typed_data';
 
-import 'package:gitjournal/error_reporting.dart';
+import 'package:isolate/isolate_runner.dart';
-import 'package:gitjournal/ssh/binary_length_value.dart';
+import 'package:meta/meta.dart';
-import 'package:gitjournal/utils/logger.dart';
+import 'package:ssh_key/ssh_key.dart' as ssh_key;
 import 'package:steel_crypt/PointyCastleN/key_generators/rsa_key_generator.dart';
 import 'package:steel_crypt/PointyCastleN/pointycastle.dart';
 import 'package:steel_crypt/PointyCastleN/random/fortuna_random.dart';
 import 'package:steel_crypt/steel_crypt.dart';
-import 'package:meta/meta.dart';
 
-import 'package:ssh_key/ssh_key.dart' as ssh_key;
+import 'package:gitjournal/error_reporting.dart';
-import 'package:isolate/isolate_runner.dart';
+import 'package:gitjournal/ssh/binary_length_value.dart';
+import 'package:gitjournal/utils/logger.dart';
 
 class RsaKeyPair {
   RSAPublicKey publicKey;

lib/state_container.dart

@@ -3,24 +3,24 @@ import 'dart:io';
 
 import 'package:flutter/foundation.dart';
 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/core/note.dart';
-import 'package:gitjournal/core/notes_cache.dart';
-import 'package:gitjournal/core/notes_folder.dart';
-import 'package:gitjournal/core/notes_folder_fs.dart';
-import 'package:gitjournal/core/git_repo.dart';
-import 'package:gitjournal/error_reporting.dart';
-import 'package:gitjournal/features.dart';
-import 'package:gitjournal/settings.dart';
-import 'package:gitjournal/utils/logger.dart';
 
 import 'package:path/path.dart' as p;
 import 'package:shared_preferences/shared_preferences.dart';
 import 'package:synchronized/synchronized.dart';
 
+import 'package:gitjournal/analytics.dart';
+import 'package:gitjournal/apis/git_migration.dart';
+import 'package:gitjournal/appstate.dart';
+import 'package:gitjournal/core/git_repo.dart';
+import 'package:gitjournal/core/note.dart';
+import 'package:gitjournal/core/notes_cache.dart';
+import 'package:gitjournal/core/notes_folder.dart';
+import 'package:gitjournal/core/notes_folder_fs.dart';
+import 'package:gitjournal/error_reporting.dart';
+import 'package:gitjournal/features.dart';
+import 'package:gitjournal/settings.dart';
+import 'package:gitjournal/utils/logger.dart';
+
 class StateContainer with ChangeNotifier {
   final AppState appState;
 

lib/utils.dart

@@ -1,9 +1,10 @@
 import 'package:flutter/material.dart';
+
+import 'package:package_info/package_info.dart';
+
 import 'package:gitjournal/core/notes_folder_fs.dart';
 import 'package:gitjournal/screens/note_editor.dart';
 import 'package:gitjournal/settings.dart';
-import 'package:package_info/package_info.dart';
-
 import 'app.dart';
 import 'core/note.dart';
 import 'state_container.dart';

lib/utils/datetime.dart

@@ -1,7 +1,9 @@
 import 'dart:core';
-import 'package:gitjournal/utils/logger.dart';
+
 import 'package:intl/intl.dart';
 
+import 'package:gitjournal/utils/logger.dart';
+
 final _simpleDateFormat = DateFormat("yyyy-MM-dd-HH-mm-ss");
 final _iso8601DateFormat = DateFormat("yyyy-MM-ddTHH:mm:ss");
 

lib/utils/logger.dart

@@ -1,11 +1,12 @@
 import 'dart:convert';
 import 'dart:io';
 
+import 'package:flutter/foundation.dart' as foundation;
+
 import 'package:fimber/fimber.dart';
 import 'package:meta/meta.dart';
-import 'package:flutter/foundation.dart' as foundation;
-import 'package:path_provider/path_provider.dart';
 import 'package:path/path.dart' as p;
+import 'package:path_provider/path_provider.dart';
 
 class Log {
   static String logFolderPath;

lib/widgets/app_drawer.dart

@@ -1,19 +1,20 @@
 import 'dart:io';
 
 import 'package:flutter/material.dart';
+
 import 'package:flutter_email_sender/flutter_email_sender.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
-import 'package:gitjournal/features.dart';
-import 'package:gitjournal/settings.dart';
-import 'package:gitjournal/utils/logger.dart';
 import 'package:launch_review/launch_review.dart';
 import 'package:provider/provider.dart';
 import 'package:share/share.dart';
 import 'package:url_launcher/url_launcher.dart';
 
 import 'package:gitjournal/analytics.dart';
+import 'package:gitjournal/features.dart';
+import 'package:gitjournal/settings.dart';
 import 'package:gitjournal/state_container.dart';
 import 'package:gitjournal/utils.dart';
+import 'package:gitjournal/utils/logger.dart';
 
 class AppDrawer extends StatelessWidget {
   @override

lib/widgets/folder_selection_dialog.dart

@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+
 import 'package:provider/provider.dart';
 
 import 'package:gitjournal/core/notes_folder_fs.dart';

lib/widgets/journal_editor_header.dart

@@ -1,5 +1,7 @@
 import 'package:flutter/material.dart';
+
 import 'package:intl/intl.dart';
+
 import 'package:gitjournal/core/note.dart';
 
 class JournalEditorHeader extends StatelessWidget {

lib/widgets/katex_widget.dart

@@ -4,10 +4,10 @@ import 'dart:io';
 
 import 'package:flutter/material.dart';
 
-import 'package:flutter_webview_plugin/flutter_webview_plugin.dart';
-import 'package:path/path.dart' as p;
-import 'package:mutex/mutex.dart';
 import 'package:crypto/crypto.dart';
+import 'package:flutter_webview_plugin/flutter_webview_plugin.dart';
+import 'package:mutex/mutex.dart';
+import 'package:path/path.dart' as p;
 
 class KatexWidget extends StatefulWidget {
   final String input;

lib/widgets/note_editor_selector.dart

@@ -1,6 +1,8 @@
 import 'package:flutter/material.dart';
+
 import 'package:font_awesome_flutter/fa_icon.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
+
 import 'package:gitjournal/core/note.dart';
 import 'package:gitjournal/screens/note_editor.dart';
 

lib/widgets/note_search_delegate.dart

@@ -2,11 +2,10 @@ import 'package:flutter/material.dart';
 
 import 'package:gitjournal/core/note.dart';
 import 'package:gitjournal/core/virtual_notes_folder.dart';
+import 'package:gitjournal/folder_views/common.dart';
 import 'package:gitjournal/folder_views/standard_view.dart';
 import 'package:gitjournal/themes.dart';
 
-import 'package:gitjournal/folder_views/common.dart';
-
 class NoteSearchDelegate extends SearchDelegate<Note> {
   final List<Note> notes;
   final FolderViewType viewType;

lib/widgets/note_tag_editor.dart

@@ -1,5 +1,6 @@
-import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
+
+import 'package:easy_localization/easy_localization.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 
 class NoteTagEditor extends StatefulWidget {

lib/widgets/note_viewer.dart

@@ -1,11 +1,14 @@
 import 'dart:io';
 
-import 'package:cached_network_image/cached_network_image.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 
+import 'package:cached_network_image/cached_network_image.dart';
 import 'package:flutter_markdown/flutter_markdown.dart';
 import 'package:markdown/markdown.dart' as md;
+import 'package:path/path.dart' as p;
+import 'package:provider/provider.dart';
+import 'package:url_launcher/url_launcher.dart';
 
 import 'package:gitjournal/core/note.dart';
 import 'package:gitjournal/core/notes_folder_fs.dart';
@@ -16,10 +19,6 @@ import 'package:gitjournal/utils/logger.dart';
 import 'package:gitjournal/widgets/editor_scroll_view.dart';
 import 'package:gitjournal/widgets/notes_backlinks.dart';
 
-import 'package:provider/provider.dart';
-import 'package:url_launcher/url_launcher.dart';
-import 'package:path/path.dart' as p;
-
 class NoteViewer extends StatelessWidget {
   final Note note;
   const NoteViewer({Key key, @required this.note}) : super(key: key);

lib/widgets/notes_backlinks.dart

@@ -1,15 +1,15 @@
-import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
-import 'package:gitjournal/core/link.dart';
+
-import 'package:gitjournal/utils/logger.dart';
+import 'package:easy_localization/easy_localization.dart';
-import 'package:gitjournal/widgets/pro_overlay.dart';
 import 'package:path/path.dart' as p;
 
-import 'package:gitjournal/folder_views/common.dart';
+import 'package:gitjournal/core/link.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/logger.dart';
+import 'package:gitjournal/widgets/pro_overlay.dart';
 
 class NoteBacklinkRenderer extends StatefulWidget {
   final Note note;

lib/widgets/pro_overlay.dart

@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+
 import 'package:easy_localization/easy_localization.dart';
 
 import 'package:gitjournal/settings.dart';

lib/widgets/purchase_slider.dart

@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+
 import 'package:equatable/equatable.dart';
 
 class PaymentInfo extends Equatable {

lib/widgets/purchase_widget.dart

@@ -3,16 +3,16 @@ import 'dart:async';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 
-import 'package:gitjournal/analytics.dart';
+import 'package:purchases_flutter/purchases_flutter.dart';
+
 import 'package:gitjournal/.env.dart';
+import 'package:gitjournal/analytics.dart';
 import 'package:gitjournal/error_reporting.dart';
 import 'package:gitjournal/iap.dart';
 import 'package:gitjournal/settings.dart';
 import 'package:gitjournal/utils/logger.dart';
 import 'package:gitjournal/widgets/purchase_slider.dart';
 
-import 'package:purchases_flutter/purchases_flutter.dart';
-
 class PurchaseButton extends StatelessWidget {
   final Package package;
 

lib/widgets/rename_dialog.dart

@@ -1,9 +1,10 @@
 import 'dart:io';
 
-import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
-import 'package:path/path.dart';
+
+import 'package:easy_localization/easy_localization.dart';
 import 'package:path/path.dart' as p;
+import 'package:path/path.dart';
 
 class RenameDialog extends StatefulWidget {
   final String oldPath;

lib/widgets/sync_button.dart

@@ -1,14 +1,15 @@
 import 'dart:async';
 
 import 'package:flutter/material.dart';
+
+import 'package:badges/badges.dart';
 import 'package:connectivity/connectivity.dart';
 import 'package:git_bindings/git_bindings.dart';
-import 'package:badges/badges.dart';
+import 'package:provider/provider.dart';
 
 import 'package:gitjournal/appstate.dart';
 import 'package:gitjournal/state_container.dart';
 import 'package:gitjournal/utils.dart';
-import 'package:provider/provider.dart';
 
 class SyncButton extends StatefulWidget {
   @override

pubspec.lock

@@ -106,6 +106,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.14.12"
+  colorize:
+    dependency: transitive
+    description:
+      name: colorize
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.0.0"
   connectivity:
     dependency: "direct main"
     description:
@@ -411,6 +418,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.1.0"
+  import_sorter:
+    dependency: "direct dev"
+    description:
+      name: import_sorter
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "4.2.1"
   in_app_purchase:
     dependency: "direct main"
     description:

pubspec.yaml

@@ -63,6 +63,7 @@ dev_dependencies:
   flutter_launcher_icons: "^0.7.2"
   screenshots: ^2.1.1
   test: ^1.5.1
+  import_sorter: ^4.2.1
   flutter_test:
     sdk: flutter
   flutter_driver:

test/checklist_test.dart

@@ -1,10 +1,11 @@
 import 'dart:io';
 
+import 'package:path/path.dart' as p;
+import 'package:test/test.dart';
+
 import 'package:gitjournal/core/checklist.dart';
 import 'package:gitjournal/core/note.dart';
 import 'package:gitjournal/core/notes_folder_fs.dart';
-import 'package:path/path.dart' as p;
-import 'package:test/test.dart';
 
 void main() {
   group('Note', () {

test/datetime_utils_test.dart

@@ -1,6 +1,7 @@
-import 'package:gitjournal/utils/datetime.dart';
 import 'package:test/test.dart';
 
+import 'package:gitjournal/utils/datetime.dart';
+
 void main() {
   group('DateTime Utils', () {
     test('Test random date', () {

test/editor_heuristics_test.dart

@@ -1,4 +1,5 @@
 import 'package:test/test.dart';
+
 import 'package:gitjournal/editors/heuristics.dart';
 
 void main() {

test/flattened_notes_folder_large_test.dart

@@ -1,12 +1,13 @@
 import 'dart:io';
 import 'dart:math';
 
-import 'package:gitjournal/core/flattened_notes_folder.dart';
-import 'package:gitjournal/core/notes_folder_fs.dart';
-import 'package:gitjournal/core/note.dart';
 import 'package:path/path.dart' as p;
 import 'package:test/test.dart';
 
+import 'package:gitjournal/core/flattened_notes_folder.dart';
+import 'package:gitjournal/core/note.dart';
+import 'package:gitjournal/core/notes_folder_fs.dart';
+
 void main() {
   group('Flattened Notes Folder Large Test', () {
     Directory tempDir;

test/flattened_notes_folder_test.dart

@@ -1,12 +1,13 @@
 import 'dart:io';
 import 'dart:math';
 
-import 'package:gitjournal/core/flattened_notes_folder.dart';
-import 'package:gitjournal/core/notes_folder_fs.dart';
-import 'package:gitjournal/core/note.dart';
 import 'package:path/path.dart' as p;
 import 'package:test/test.dart';
 
+import 'package:gitjournal/core/flattened_notes_folder.dart';
+import 'package:gitjournal/core/note.dart';
+import 'package:gitjournal/core/notes_folder_fs.dart';
+
 void main() {
   group('Flattened Notes Folder Test', () {
     Directory tempDir;

test/links_loader_test.dart

@@ -1,6 +1,7 @@
-import 'package:gitjournal/core/links_loader.dart';
 import 'package:test/test.dart';
 
+import 'package:gitjournal/core/links_loader.dart';
+
 void main() {
   group('LinksLoader', () {
     var contents = """[[GitJournal]]

test/md_yaml_codec_test.dart

@@ -1,9 +1,10 @@
 import 'dart:collection';
 
+import 'package:test/test.dart';
+
 import 'package:gitjournal/core/md_yaml_doc.dart';
 import 'package:gitjournal/core/md_yaml_doc_codec.dart';
 import 'package:gitjournal/utils/datetime.dart';
-import 'package:test/test.dart';
 
 DateTime nowWithoutMicro() {
   var dt = DateTime.now();

test/md_yaml_doc_loader_test.dart

@@ -1,9 +1,10 @@
 import 'dart:io';
 
-import 'package:gitjournal/core/md_yaml_doc_loader.dart';
 import 'package:path/path.dart' as p;
 import 'package:test/test.dart';
 
+import 'package:gitjournal/core/md_yaml_doc_loader.dart';
+
 void main() {
   group('MdYamlDocLoader', () {
     Directory tempDir;

test/md_yaml_doc_test.dart

@@ -1,8 +1,9 @@
 import 'dart:collection';
 
-import 'package:gitjournal/core/md_yaml_doc.dart';
 import 'package:test/test.dart';
 
+import 'package:gitjournal/core/md_yaml_doc.dart';
+
 void main() {
   test('Equality', () {
     // ignore: prefer_collection_literals

test/merge_conflcts_resolver_test.dart

@@ -1,4 +1,5 @@
 import 'package:test/test.dart';
+
 import 'package:gitjournal/utils/merge_conflict_resolver.dart';
 
 void main() {

test/note_serializer_test.dart

@@ -1,8 +1,9 @@
 import 'dart:collection';
 
+import 'package:test/test.dart';
+
 import 'package:gitjournal/core/md_yaml_doc.dart';
 import 'package:gitjournal/core/note.dart';
-import 'package:test/test.dart';
 import 'package:gitjournal/core/note_serializer.dart';
 
 void main() {

test/note_storage_test.dart

@@ -1,12 +1,13 @@
 import 'dart:collection';
 import 'dart:io';
 
-import 'package:gitjournal/utils/datetime.dart';
-import 'package:gitjournal/core/note.dart';
-import 'package:gitjournal/core/md_yaml_doc.dart';
 import 'package:path/path.dart' as p;
 import 'package:test/test.dart';
 
+import 'package:gitjournal/core/md_yaml_doc.dart';
+import 'package:gitjournal/core/note.dart';
+import 'package:gitjournal/utils/datetime.dart';
+
 void main() {
   group('NoteStorage', () {
     var notes = <Note>[];

test/note_test.dart

@@ -1,9 +1,10 @@
 import 'dart:io';
 
+import 'package:path/path.dart' as p;
+import 'package:test/test.dart';
+
 import 'package:gitjournal/core/note.dart';
 import 'package:gitjournal/core/notes_folder_fs.dart';
-import 'package:path/path.dart' as p;
-import 'package:test/test.dart';
 
 void main() {
   group('Note', () {

test/notes_cache_test.dart

@@ -1,9 +1,10 @@
 import 'dart:io';
 
+import 'package:path/path.dart' as p;
+import 'package:test/test.dart';
+
 import 'package:gitjournal/core/notes_cache.dart';
 import 'package:gitjournal/core/notes_folder_fs.dart';
-import 'package:path/path.dart' as p;
-import 'package:test/test.dart';
 
 void main() {
   group('Notes Cache', () {

test/notes_folder_config_test.dart

@@ -1,5 +1,8 @@
 import 'dart:io';
 
+import 'package:path/path.dart' as p;
+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';
@@ -7,8 +10,6 @@ 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:path/path.dart' as p;
-import 'package:test/test.dart';
 
 void main() {
   group('Notes Folder Config', () {

test/sorted_notes_folder_test.dart

@@ -1,12 +1,13 @@
 import 'dart:io';
 import 'dart:math';
 
+import 'package:path/path.dart' as p;
+import 'package:test/test.dart';
+
+import 'package:gitjournal/core/note.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/core/note.dart';
-import 'package:path/path.dart' as p;
-import 'package:test/test.dart';
 
 void main() {
   group('Sorted Notes Folder Test', () {

test/sorting_mode_test.dart

@@ -1,7 +1,8 @@
+import 'package:test/test.dart';
+
 import 'package:gitjournal/core/note.dart';
 import 'package:gitjournal/core/notes_folder_fs.dart';
 import 'package:gitjournal/core/sorting_mode.dart';
-import 'package:test/test.dart';
 
 void main() {
   group('Sorting Mode', () {

test/strip_markdown_formatting_test.dart

@@ -1,6 +1,7 @@
-import 'package:gitjournal/utils/markdown.dart';
 import 'package:test/test.dart';
 
+import 'package:gitjournal/utils/markdown.dart';
+
 void main() {
   group('Markdown Remove Formatting', () {
     test('Test Headers', () {