From 30b9a850d4bc20488b0f04ace10efce87ac5eb7d Mon Sep 17 00:00:00 2001
From: Vishesh Handa <me@vhanda.in>
Date: Fri, 4 Jun 2021 18:59:58 +0200
Subject: [PATCH] Move utils file to utils folder

---
 lib/app_router.dart                  |  2 +-
 lib/core/org_links_handler.dart      |  2 +-
 lib/editors/bottom_bar.dart          |  2 +-
 lib/folder_views/common.dart         |  2 +-
 lib/folder_views/list_view.dart      |  2 +-
 lib/iap/screens_stories.dart         |  1 +
 lib/monarch.dart                     |  3 ++-
 lib/screens/folder_view.dart         |  2 +-
 lib/screens/note_editor.dart         |  2 +-
 lib/screens/settings_editors.dart    |  2 +-
 lib/screens/settings_git_remote.dart |  2 +-
 lib/screens/settings_screen.dart     |  2 +-
 lib/setup/screens.dart               |  2 +-
 lib/{ => utils}/utils.dart           | 10 +++++-----
 lib/widgets/app_drawer.dart          |  2 +-
 lib/widgets/markdown_renderer.dart   |  2 +-
 lib/widgets/sync_button.dart         |  4 +---
 17 files changed, 22 insertions(+), 22 deletions(-)
 rename lib/{ => utils}/utils.dart (94%)

diff --git a/lib/app_router.dart b/lib/app_router.dart
index 1994c314..8bf68c75 100644
--- a/lib/app_router.dart
+++ b/lib/app_router.dart
@@ -17,8 +17,8 @@ import 'package:gitjournal/screens/signup_screen.dart';
 import 'package:gitjournal/screens/tag_listing.dart';
 import 'package:gitjournal/settings.dart';
 import 'package:gitjournal/setup/screens.dart';
-import 'package:gitjournal/utils.dart';
 import 'package:gitjournal/utils/logger.dart';
+import 'package:gitjournal/utils/utils.dart';
 
 class AppRoute {
   static const OnBoarding = '/onBoarding';
diff --git a/lib/core/org_links_handler.dart b/lib/core/org_links_handler.dart
index c5ebe1cf..268baf6d 100644
--- a/lib/core/org_links_handler.dart
+++ b/lib/core/org_links_handler.dart
@@ -30,9 +30,9 @@ import 'package:gitjournal/core/note.dart';
 import 'package:gitjournal/folder_views/common.dart';
 import 'package:gitjournal/utils/link_resolver.dart';
 import 'package:gitjournal/utils/logger.dart';
+import 'package:gitjournal/utils/utils.dart';
 import 'package:gitjournal/widgets/images/image_details.dart';
 import 'package:gitjournal/widgets/images/themable_image.dart';
-import '../utils.dart';
 
 //import 'dart:html';
 
diff --git a/lib/editors/bottom_bar.dart b/lib/editors/bottom_bar.dart
index a5aadbd5..dbad38d0 100644
--- a/lib/editors/bottom_bar.dart
+++ b/lib/editors/bottom_bar.dart
@@ -12,7 +12,7 @@ import 'package:gitjournal/core/notes_folder_fs.dart';
 import 'package:gitjournal/editors/common.dart';
 import 'package:gitjournal/error_reporting.dart';
 import 'package:gitjournal/features.dart';
-import 'package:gitjournal/utils.dart';
+import 'package:gitjournal/utils/utils.dart';
 import 'package:gitjournal/widgets/pro_overlay.dart';
 
 class EditorBottomBar extends StatelessWidget {
diff --git a/lib/folder_views/common.dart b/lib/folder_views/common.dart
index 2a58591c..448e4fad 100644
--- a/lib/folder_views/common.dart
+++ b/lib/folder_views/common.dart
@@ -12,8 +12,8 @@ import 'package:gitjournal/folder_views/journal_view.dart';
 import 'package:gitjournal/repository.dart';
 import 'package:gitjournal/screens/note_editor.dart';
 import 'package:gitjournal/settings.dart';
-import 'package:gitjournal/utils.dart';
 import 'package:gitjournal/utils/logger.dart';
+import 'package:gitjournal/utils/utils.dart';
 import 'common_types.dart';
 import 'standard_view.dart';
 
diff --git a/lib/folder_views/list_view.dart b/lib/folder_views/list_view.dart
index 3b802c3b..44bec670 100644
--- a/lib/folder_views/list_view.dart
+++ b/lib/folder_views/list_view.dart
@@ -7,7 +7,7 @@ import 'package:gitjournal/core/note.dart';
 import 'package:gitjournal/core/notes_folder.dart';
 import 'package:gitjournal/repository.dart';
 import 'package:gitjournal/settings.dart';
-import 'package:gitjournal/utils.dart';
+import 'package:gitjournal/utils/utils.dart';
 import 'package:gitjournal/widgets/icon_dismissable.dart';
 
 typedef Widget NoteTileBuilder(BuildContext context, Note note);
diff --git a/lib/iap/screens_stories.dart b/lib/iap/screens_stories.dart
index a7089d4a..0d567a19 100644
--- a/lib/iap/screens_stories.dart
+++ b/lib/iap/screens_stories.dart
@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+
 import 'package:gitjournal/iap/purchase_thankyou_screen.dart';
 
 Widget thankYou() => PurchaseThankYouScreen();
diff --git a/lib/monarch.dart b/lib/monarch.dart
index 8c5ba1ea..0b9d9313 100644
--- a/lib/monarch.dart
+++ b/lib/monarch.dart
@@ -5,9 +5,10 @@ import 'package:flutter/material.dart';
 import 'package:easy_localization/src/localization.dart';
 import 'package:easy_localization/src/translations.dart';
 import 'package:easy_localization_loader/easy_localization_loader.dart';
-import 'package:gitjournal/themes.dart';
 import 'package:monarch_annotations/monarch_annotations.dart';
 
+import 'package:gitjournal/themes.dart';
+
 // ignore_for_file: implementation_imports
 
 /// Only used with Monarch
diff --git a/lib/screens/folder_view.dart b/lib/screens/folder_view.dart
index f7a46fe9..4ab21989 100644
--- a/lib/screens/folder_view.dart
+++ b/lib/screens/folder_view.dart
@@ -18,7 +18,7 @@ import 'package:gitjournal/repository.dart';
 import 'package:gitjournal/screens/note_editor.dart';
 import 'package:gitjournal/screens/settings_screen.dart';
 import 'package:gitjournal/settings.dart';
-import 'package:gitjournal/utils.dart';
+import 'package:gitjournal/utils/utils.dart';
 import 'package:gitjournal/widgets/app_bar_menu_button.dart';
 import 'package:gitjournal/widgets/app_drawer.dart';
 import 'package:gitjournal/widgets/new_note_nav_bar.dart';
diff --git a/lib/screens/note_editor.dart b/lib/screens/note_editor.dart
index 7b2462aa..7482a222 100644
--- a/lib/screens/note_editor.dart
+++ b/lib/screens/note_editor.dart
@@ -36,8 +36,8 @@ import 'package:gitjournal/editors/raw_editor.dart';
 import 'package:gitjournal/error_reporting.dart';
 import 'package:gitjournal/repository.dart';
 import 'package:gitjournal/settings.dart';
-import 'package:gitjournal/utils.dart';
 import 'package:gitjournal/utils/logger.dart';
+import 'package:gitjournal/utils/utils.dart';
 import 'package:gitjournal/widgets/folder_selection_dialog.dart';
 import 'package:gitjournal/widgets/note_delete_dialog.dart';
 import 'package:gitjournal/widgets/note_editor_selector.dart';
diff --git a/lib/screens/settings_editors.dart b/lib/screens/settings_editors.dart
index b6b2eaaa..312b0b80 100644
--- a/lib/screens/settings_editors.dart
+++ b/lib/screens/settings_editors.dart
@@ -8,7 +8,7 @@ import 'package:gitjournal/features.dart';
 import 'package:gitjournal/screens/settings_screen.dart';
 import 'package:gitjournal/screens/settings_widgets.dart';
 import 'package:gitjournal/settings.dart';
-import 'package:gitjournal/utils.dart';
+import 'package:gitjournal/utils/utils.dart';
 import 'package:gitjournal/widgets/folder_selection_dialog.dart';
 import 'package:gitjournal/widgets/pro_overlay.dart';
 
diff --git a/lib/screens/settings_git_remote.dart b/lib/screens/settings_git_remote.dart
index 983618dc..dabb0270 100644
--- a/lib/screens/settings_git_remote.dart
+++ b/lib/screens/settings_git_remote.dart
@@ -14,8 +14,8 @@ import 'package:gitjournal/settings.dart';
 import 'package:gitjournal/setup/screens.dart';
 import 'package:gitjournal/setup/sshkey.dart';
 import 'package:gitjournal/ssh/keygen.dart';
-import 'package:gitjournal/utils.dart';
 import 'package:gitjournal/utils/logger.dart';
+import 'package:gitjournal/utils/utils.dart';
 
 class GitRemoteSettingsScreen extends StatefulWidget {
   final String sshPublicKey;
diff --git a/lib/screens/settings_screen.dart b/lib/screens/settings_screen.dart
index 3f29a518..69f1247b 100644
--- a/lib/screens/settings_screen.dart
+++ b/lib/screens/settings_screen.dart
@@ -49,8 +49,8 @@ import 'package:gitjournal/screens/settings_note_metadata.dart';
 import 'package:gitjournal/screens/settings_tags.dart';
 import 'package:gitjournal/screens/settings_widgets.dart';
 import 'package:gitjournal/settings.dart';
-import 'package:gitjournal/utils.dart';
 import 'package:gitjournal/utils/logger.dart';
+import 'package:gitjournal/utils/utils.dart';
 import 'package:gitjournal/widgets/folder_selection_dialog.dart';
 import 'package:gitjournal/widgets/pro_overlay.dart';
 
diff --git a/lib/setup/screens.dart b/lib/setup/screens.dart
index 74c93d11..a8421af7 100644
--- a/lib/setup/screens.dart
+++ b/lib/setup/screens.dart
@@ -25,8 +25,8 @@ import 'package:gitjournal/setup/loading_error.dart';
 import 'package:gitjournal/setup/repo_selector.dart';
 import 'package:gitjournal/setup/sshkey.dart';
 import 'package:gitjournal/ssh/keygen.dart';
-import 'package:gitjournal/utils.dart';
 import 'package:gitjournal/utils/logger.dart';
+import 'package:gitjournal/utils/utils.dart';
 
 class GitHostSetupScreen extends StatefulWidget {
   final String repoFolderName;
diff --git a/lib/utils.dart b/lib/utils/utils.dart
similarity index 94%
rename from lib/utils.dart
rename to lib/utils/utils.dart
index 311ed986..6730cdf4 100644
--- a/lib/utils.dart
+++ b/lib/utils/utils.dart
@@ -7,11 +7,11 @@ import 'package:share/share.dart';
 
 import 'package:gitjournal/core/notes_folder_fs.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';
+import '../app.dart';
+import '../core/note.dart';
+import '../editors/common_types.dart';
+import '../repository.dart';
+import 'logger.dart';
 
 Future<String> getVersionString() async {
   var info = await PackageInfo.fromPlatform();
diff --git a/lib/widgets/app_drawer.dart b/lib/widgets/app_drawer.dart
index cea7165c..89eebb84 100644
--- a/lib/widgets/app_drawer.dart
+++ b/lib/widgets/app_drawer.dart
@@ -16,8 +16,8 @@ import 'package:gitjournal/app_settings.dart';
 import 'package:gitjournal/features.dart';
 import 'package:gitjournal/repository.dart';
 import 'package:gitjournal/repository_manager.dart';
-import 'package:gitjournal/utils.dart';
 import 'package:gitjournal/utils/logger.dart';
+import 'package:gitjournal/utils/utils.dart';
 import 'package:gitjournal/widgets/app_drawer_header.dart';
 import 'package:gitjournal/widgets/pro_overlay.dart';
 
diff --git a/lib/widgets/markdown_renderer.dart b/lib/widgets/markdown_renderer.dart
index 455353f0..45b7ab71 100644
--- a/lib/widgets/markdown_renderer.dart
+++ b/lib/widgets/markdown_renderer.dart
@@ -28,9 +28,9 @@ import 'package:url_launcher/url_launcher.dart';
 import 'package:gitjournal/core/link.dart';
 import 'package:gitjournal/core/note.dart';
 import 'package:gitjournal/folder_views/common.dart';
-import 'package:gitjournal/utils.dart';
 import 'package:gitjournal/utils/link_resolver.dart';
 import 'package:gitjournal/utils/logger.dart';
+import 'package:gitjournal/utils/utils.dart';
 import 'package:gitjournal/widgets/images/markdown_image.dart';
 
 class MarkdownRenderer extends StatelessWidget {
diff --git a/lib/widgets/sync_button.dart b/lib/widgets/sync_button.dart
index 7ecef703..324b5a4a 100644
--- a/lib/widgets/sync_button.dart
+++ b/lib/widgets/sync_button.dart
@@ -1,5 +1,3 @@
-
-
 import 'dart:async';
 
 import 'package:flutter/material.dart';
@@ -11,7 +9,7 @@ import 'package:git_bindings/git_bindings.dart';
 import 'package:provider/provider.dart';
 
 import 'package:gitjournal/repository.dart';
-import 'package:gitjournal/utils.dart';
+import 'package:gitjournal/utils/utils.dart';
 
 class SyncButton extends StatefulWidget {
   @override