Move all settings code to its own folder

Jumping around between the widgets / screens and outside is bit
confusing. Also this way, I can add the stories right here.

lib/app.dart

@@ -18,12 +18,12 @@ import 'package:shared_preferences/shared_preferences.dart';
 
 import 'package:gitjournal/analytics/analytics.dart';
 import 'package:gitjournal/app_router.dart';
-import 'package:gitjournal/app_settings.dart';
 import 'package:gitjournal/core/notes_folder_fs.dart';
 import 'package:gitjournal/iap/iap.dart';
 import 'package:gitjournal/repository.dart';
 import 'package:gitjournal/repository_manager.dart';
-import 'package:gitjournal/settings.dart';
+import 'package:gitjournal/settings/app_settings.dart';
+import 'package:gitjournal/settings/settings.dart';
 import 'package:gitjournal/themes.dart';
 import 'package:gitjournal/utils/logger.dart';
 

lib/app_router.dart

@@ -1,6 +1,5 @@
 import 'package:flutter/material.dart';
 
-import 'package:gitjournal/app_settings.dart';
 import 'package:gitjournal/core/md_yaml_doc_codec.dart';
 import 'package:gitjournal/iap/purchase_screen.dart';
 import 'package:gitjournal/iap/purchase_thankyou_screen.dart';
@@ -12,10 +11,11 @@ import 'package:gitjournal/screens/home_screen.dart';
 import 'package:gitjournal/screens/login_screen.dart';
 import 'package:gitjournal/screens/note_editor.dart';
 import 'package:gitjournal/screens/onboarding_screens.dart';
-import 'package:gitjournal/screens/settings_screen.dart';
 import 'package:gitjournal/screens/signup_screen.dart';
 import 'package:gitjournal/screens/tag_listing.dart';
-import 'package:gitjournal/settings.dart';
+import 'package:gitjournal/settings/app_settings.dart';
+import 'package:gitjournal/settings/settings.dart';
+import 'package:gitjournal/settings/settings_screen.dart';
 import 'package:gitjournal/setup/screens.dart';
 import 'package:gitjournal/utils/logger.dart';
 import 'package:gitjournal/utils/utils.dart';

lib/core/git_repo.dart

@@ -8,7 +8,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/error_reporting.dart';
-import 'package:gitjournal/settings.dart';
+import 'package:gitjournal/settings/settings.dart';
 import 'package:gitjournal/utils/logger.dart';
 
 bool useDartGit = false;

lib/core/note.dart

@@ -26,7 +26,7 @@ import 'package:gitjournal/core/notes_folder_fs.dart';
 import 'package:gitjournal/core/processors/image_extractor.dart';
 import 'package:gitjournal/core/processors/inline_tags.dart';
 import 'package:gitjournal/error_reporting.dart';
-import 'package:gitjournal/settings.dart';
+import 'package:gitjournal/settings/settings.dart';
 import 'package:gitjournal/utils/datetime.dart';
 import 'package:gitjournal/utils/logger.dart';
 import 'package:gitjournal/utils/markdown.dart';

lib/core/note_serializer.dart

@@ -20,7 +20,7 @@ import 'package:flutter_emoji/flutter_emoji.dart';
 import 'package:yaml/yaml.dart';
 
 import 'package:gitjournal/core/notes_folder.dart';
-import 'package:gitjournal/settings.dart';
+import 'package:gitjournal/settings/settings.dart';
 import 'package:gitjournal/utils/datetime.dart';
 import 'package:gitjournal/utils/logger.dart';
 import 'md_yaml_doc.dart';

lib/core/notes_cache.dart

@@ -10,7 +10,7 @@ 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/settings.dart';
+import 'package:gitjournal/settings/settings.dart';
 import 'package:gitjournal/utils/logger.dart';
 
 class NotesCache {

lib/core/notes_folder_config.dart

@@ -11,7 +11,7 @@ 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/settings.dart';
+import 'package:gitjournal/settings/settings.dart';
 import 'package:gitjournal/utils/logger.dart';
 
 @immutable

lib/core/notes_folder_fs.dart

@@ -6,7 +6,7 @@ import 'package:path/path.dart' as p;
 import 'package:path/path.dart';
 import 'package:synchronized/synchronized.dart';
 
-import 'package:gitjournal/settings.dart';
+import 'package:gitjournal/settings/settings.dart';
 import 'package:gitjournal/utils/logger.dart';
 import 'note.dart';
 import 'notes_folder.dart';

lib/core/virtual_notes_folder.dart

@@ -1,4 +1,4 @@
-import 'package:gitjournal/settings.dart';
+import 'package:gitjournal/settings/settings.dart';
 import 'note.dart';
 import 'notes_folder.dart';
 import 'notes_folder_notifier.dart';

lib/editors/markdown_editor.dart

@@ -4,7 +4,6 @@ import 'package:flutter/material.dart';
 
 import 'package:provider/provider.dart';
 
-import 'package:gitjournal/app_settings.dart';
 import 'package:gitjournal/core/note.dart';
 import 'package:gitjournal/core/notes_folder.dart';
 import 'package:gitjournal/editors/common.dart';
@@ -13,6 +12,7 @@ import 'package:gitjournal/editors/heuristics.dart';
 import 'package:gitjournal/editors/note_body_editor.dart';
 import 'package:gitjournal/editors/note_title_editor.dart';
 import 'package:gitjournal/error_reporting.dart';
+import 'package:gitjournal/settings/app_settings.dart';
 import 'package:gitjournal/utils/logger.dart';
 import 'package:gitjournal/widgets/editor_scroll_view.dart';
 import 'package:gitjournal/widgets/markdown_toolbar.dart';

lib/editors/scaffold.dart

@@ -13,7 +13,7 @@ import 'package:gitjournal/core/notes_folder_fs.dart';
 import 'package:gitjournal/core/org_links_handler.dart';
 import 'package:gitjournal/editors/bottom_bar.dart';
 import 'package:gitjournal/editors/common.dart';
-import 'package:gitjournal/settings.dart';
+import 'package:gitjournal/settings/settings.dart';
 import 'package:gitjournal/widgets/note_viewer.dart';
 
 class EditorScaffold extends StatefulWidget {

lib/error_reporting.dart

@@ -11,7 +11,7 @@ import 'package:stack_trace/stack_trace.dart';
 
 import 'package:gitjournal/.env.dart';
 import 'package:gitjournal/app.dart';
-import 'package:gitjournal/app_settings.dart';
+import 'package:gitjournal/settings/app_settings.dart';
 import 'package:gitjournal/utils/logger.dart';
 
 Future<void> initSentry() async {

lib/experiments/main_dashbook.dart

@@ -6,8 +6,8 @@ import 'package:path_provider/path_provider.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 
 import 'package:gitjournal/app_router.dart';
-import 'package:gitjournal/app_settings.dart';
 import 'package:gitjournal/repository_manager.dart';
+import 'package:gitjournal/settings/app_settings.dart';
 import 'package:gitjournal/utils/logger.dart';
 
 void main() async {

lib/folder_views/common.dart

@@ -11,7 +11,7 @@ import 'package:gitjournal/folder_views/grid_view.dart';
 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/settings/settings.dart';
 import 'package:gitjournal/utils/logger.dart';
 import 'package:gitjournal/utils/utils.dart';
 import 'common_types.dart';

lib/folder_views/list_view.dart

@@ -6,7 +6,7 @@ import 'package:provider/provider.dart';
 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/settings/settings.dart';
 import 'package:gitjournal/utils/utils.dart';
 import 'package:gitjournal/widgets/icon_dismissable.dart';
 

lib/iap/iap.dart

@@ -6,9 +6,9 @@ import 'package:in_app_purchase/in_app_purchase.dart';
 import 'package:in_app_purchase/store_kit_wrappers.dart';
 
 import 'package:gitjournal/app.dart';
-import 'package:gitjournal/app_settings.dart';
 import 'package:gitjournal/error_reporting.dart';
 import 'package:gitjournal/features.dart';
+import 'package:gitjournal/settings/app_settings.dart';
 import 'package:gitjournal/utils/logger.dart';
 
 class InAppPurchases {

lib/iap/purchase_manager.dart

@@ -3,10 +3,10 @@ import 'dart:async';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:in_app_purchase/in_app_purchase.dart';
 
-import 'package:gitjournal/app_settings.dart';
 import 'package:gitjournal/error_reporting.dart';
 import 'package:gitjournal/iap/iap.dart';
 import 'package:gitjournal/iap/purchase_slider.dart';
+import 'package:gitjournal/settings/app_settings.dart';
 import 'package:gitjournal/utils/logger.dart';
 
 // ignore_for_file: cancel_subscriptions

lib/iap/purchase_widget.dart

@@ -7,11 +7,11 @@ import 'package:function_types/function_types.dart';
 import 'package:in_app_purchase/in_app_purchase.dart';
 
 import 'package:gitjournal/analytics/analytics.dart';
-import 'package:gitjournal/app_settings.dart';
 import 'package:gitjournal/error_reporting.dart';
 import 'package:gitjournal/iap/iap.dart';
 import 'package:gitjournal/iap/purchase_manager.dart';
 import 'package:gitjournal/iap/purchase_slider.dart';
+import 'package:gitjournal/settings/app_settings.dart';
 import 'package:gitjournal/utils/logger.dart';
 
 class PurchaseButton extends StatelessWidget {

lib/main.dart

@@ -10,8 +10,8 @@ import 'package:shared_preferences/shared_preferences.dart';
 import 'package:stack_trace/stack_trace.dart';
 
 import 'package:gitjournal/app.dart';
-import 'package:gitjournal/app_settings.dart';
 import 'package:gitjournal/error_reporting.dart';
+import 'package:gitjournal/settings/app_settings.dart';
 
 void main() async {
   WidgetsFlutterBinding.ensureInitialized();

lib/repository.dart

@@ -21,8 +21,8 @@ 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/settings/settings.dart';
-import 'package:gitjournal/settings_migrations.dart';
+import 'package:gitjournal/settings/settings_migrations.dart';
 import 'package:gitjournal/setup/clone.dart';
 import 'package:gitjournal/utils/logger.dart';
 

lib/repository_manager.dart

@@ -6,7 +6,7 @@ import 'package:path/path.dart' as p;
 import 'package:shared_preferences/shared_preferences.dart';
 
 import 'package:gitjournal/repository.dart';
-import 'package:gitjournal/settings.dart';
+import 'package:gitjournal/settings/settings.dart';
 import 'package:gitjournal/utils/logger.dart';
 
 class RepositoryManager with ChangeNotifier {

lib/screens/debug_screen.dart

@@ -7,7 +7,7 @@ import 'package:easy_localization/easy_localization.dart';
 import 'package:provider/provider.dart';
 import 'package:time/time.dart';
 
-import 'package:gitjournal/app_settings.dart';
+import 'package:gitjournal/settings/app_settings.dart';
 import 'package:gitjournal/utils/logger.dart';
 
 class DebugScreen extends StatefulWidget {

lib/screens/folder_listing.dart

@@ -19,10 +19,10 @@ import 'package:flutter/material.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:provider/provider.dart';
 
-import 'package:gitjournal/app_settings.dart';
 import 'package:gitjournal/core/flattened_notes_folder.dart';
 import 'package:gitjournal/core/notes_folder_fs.dart';
 import 'package:gitjournal/repository.dart';
+import 'package:gitjournal/settings/app_settings.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';

lib/screens/folder_view.dart

@@ -16,8 +16,8 @@ import 'package:gitjournal/folder_views/common.dart';
 import 'package:gitjournal/folder_views/standard_view.dart';
 import 'package:gitjournal/repository.dart';
 import 'package:gitjournal/screens/note_editor.dart';
-import 'package:gitjournal/screens/settings_screen.dart';
+import 'package:gitjournal/settings/settings.dart';
-import 'package:gitjournal/settings.dart';
+import 'package:gitjournal/settings/settings_screen.dart';
 import 'package:gitjournal/utils/utils.dart';
 import 'package:gitjournal/widgets/app_bar_menu_button.dart';
 import 'package:gitjournal/widgets/app_drawer.dart';

lib/screens/note_editor.dart

@@ -35,7 +35,7 @@ import 'package:gitjournal/editors/org_editor.dart';
 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/settings/settings.dart';
 import 'package:gitjournal/utils/logger.dart';
 import 'package:gitjournal/utils/utils.dart';
 import 'package:gitjournal/widgets/folder_selection_dialog.dart';

lib/screens/onboarding_screens.dart

@@ -9,7 +9,7 @@ import 'package:provider/provider.dart';
 import 'package:time/time.dart';
 
 import 'package:gitjournal/analytics/analytics.dart';
-import 'package:gitjournal/app_settings.dart';
+import 'package:gitjournal/settings/app_settings.dart';
 
 class OnBoardingScreen extends StatefulWidget {
   OnBoardingScreen();

lib/settings/settings_bottom_menu_bar.dart

@@ -4,7 +4,7 @@ import 'package:easy_localization/easy_localization.dart';
 import 'package:provider/provider.dart';
 
 import 'package:gitjournal/screens/home_screen.dart';
-import 'package:gitjournal/settings.dart';
+import 'package:gitjournal/settings/settings.dart';
 
 class BottomMenuBarSettings extends StatefulWidget {
   @override

lib/settings/settings_display_images.dart

@@ -21,10 +21,10 @@ import 'package:flutter/material.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:provider/provider.dart';
 
-import 'package:gitjournal/screens/settings_display_images_caption.dart';
+import 'package:gitjournal/settings/settings.dart';
-import 'package:gitjournal/screens/settings_display_images_theming.dart';
+import 'package:gitjournal/settings/settings_display_images_caption.dart';
-import 'package:gitjournal/screens/settings_screen.dart';
+import 'package:gitjournal/settings/settings_display_images_theming.dart';
-import 'package:gitjournal/settings.dart';
+import 'package:gitjournal/settings/settings_screen.dart';
 
 class SettingsDisplayImagesScreen extends StatefulWidget {
   @override

lib/settings/settings_display_images_caption.dart

@@ -19,9 +19,9 @@ import 'package:flutter/material.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:provider/provider.dart';
 
-import 'package:gitjournal/screens/settings_screen.dart';
+import 'package:gitjournal/settings/settings.dart';
-import 'package:gitjournal/screens/settings_widgets.dart';
+import 'package:gitjournal/settings/settings_screen.dart';
-import 'package:gitjournal/settings.dart';
+import 'package:gitjournal/settings/settings_widgets.dart';
 
 class SettingsDisplayImagesCaptionScreen extends StatefulWidget {
   @override

lib/settings/settings_display_images_theming.dart

@@ -1,5 +1,3 @@
-
-
 /*
 Copyright 2020-2021 Roland Fredenhagen <important@van-fredenhagen.de>
 
@@ -21,9 +19,9 @@ import 'package:flutter/material.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:provider/provider.dart';
 
-import 'package:gitjournal/screens/settings_screen.dart';
+import 'package:gitjournal/settings/settings.dart';
-import 'package:gitjournal/screens/settings_widgets.dart';
+import 'package:gitjournal/settings/settings_screen.dart';
-import 'package:gitjournal/settings.dart';
+import 'package:gitjournal/settings/settings_widgets.dart';
 
 class SettingsDisplayImagesThemingScreen extends StatefulWidget {
   @override

lib/settings/settings_editors.dart

@@ -5,9 +5,9 @@ import 'package:provider/provider.dart';
 
 import 'package:gitjournal/core/notes_folder_fs.dart';
 import 'package:gitjournal/features.dart';
-import 'package:gitjournal/screens/settings_screen.dart';
+import 'package:gitjournal/settings/settings.dart';
-import 'package:gitjournal/screens/settings_widgets.dart';
+import 'package:gitjournal/settings/settings_screen.dart';
-import 'package:gitjournal/settings.dart';
+import 'package:gitjournal/settings/settings_widgets.dart';
 import 'package:gitjournal/utils/utils.dart';
 import 'package:gitjournal/widgets/folder_selection_dialog.dart';
 import 'package:gitjournal/widgets/pro_overlay.dart';

lib/settings/settings_experimental.dart

@@ -22,7 +22,7 @@ import 'package:crypto/crypto.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:provider/provider.dart';
 
-import 'package:gitjournal/app_settings.dart';
+import 'package:gitjournal/settings/app_settings.dart';
 
 class ExperimentalSettingsScreen extends StatefulWidget {
   @override

lib/settings/settings_git_remote.dart

@@ -9,8 +9,8 @@ import 'package:path/path.dart' as p;
 import 'package:provider/provider.dart';
 
 import 'package:gitjournal/repository.dart';
-import 'package:gitjournal/screens/settings_widgets.dart';
+import 'package:gitjournal/settings/settings.dart';
-import 'package:gitjournal/settings.dart';
+import 'package:gitjournal/settings/settings_widgets.dart';
 import 'package:gitjournal/setup/screens.dart';
 import 'package:gitjournal/setup/sshkey.dart';
 import 'package:gitjournal/ssh/keygen.dart';

lib/settings/settings_images.dart

@@ -4,8 +4,8 @@ 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/settings.dart';
-import 'package:gitjournal/settings.dart';
+import 'package:gitjournal/settings/settings_widgets.dart';
 import 'package:gitjournal/widgets/folder_selection_dialog.dart';
 
 class SettingsImagesScreen extends StatefulWidget {

lib/settings/settings_migrations.dart

@@ -3,7 +3,7 @@ import 'dart:io';
 import 'package:path/path.dart' as p;
 import 'package:shared_preferences/shared_preferences.dart';
 
-import 'package:gitjournal/settings.dart';
+import 'package:gitjournal/settings/settings.dart';
 import 'package:gitjournal/utils/logger.dart';
 
 Future<void> migrateSettings(

lib/settings/settings_misc.dart

@@ -3,8 +3,8 @@ import 'package:flutter/material.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:provider/provider.dart';
 
-import 'package:gitjournal/screens/settings_screen.dart';
+import 'package:gitjournal/settings/settings.dart';
-import 'package:gitjournal/settings.dart';
+import 'package:gitjournal/settings/settings_screen.dart';
 
 class SettingsMisc extends StatefulWidget {
   @override

lib/settings/settings_note_metadata.dart

@@ -30,8 +30,8 @@ import 'package:gitjournal/core/notes_folder_fs.dart';
 import 'package:gitjournal/editors/note_body_editor.dart';
 import 'package:gitjournal/editors/note_title_editor.dart';
 import 'package:gitjournal/features.dart';
-import 'package:gitjournal/screens/settings_widgets.dart';
+import 'package:gitjournal/settings/settings.dart';
-import 'package:gitjournal/settings.dart';
+import 'package:gitjournal/settings/settings_widgets.dart';
 import 'package:gitjournal/widgets/pro_overlay.dart';
 
 class NoteMetadataSettingsScreen extends StatefulWidget {

lib/settings/settings_screen.dart

@@ -31,24 +31,24 @@ import 'package:permission_handler/permission_handler.dart';
 import 'package:provider/provider.dart';
 import 'package:url_launcher/url_launcher.dart';
 
-import 'package:gitjournal/app_settings.dart';
 import 'package:gitjournal/core/notes_folder_fs.dart';
 import 'package:gitjournal/features.dart';
 import 'package:gitjournal/repository.dart';
 import 'package:gitjournal/repository_manager.dart';
 import 'package:gitjournal/screens/debug_screen.dart';
 import 'package:gitjournal/screens/feature_timeline_screen.dart';
-import 'package:gitjournal/screens/settings_bottom_menu_bar.dart';
+import 'package:gitjournal/settings/app_settings.dart';
-import 'package:gitjournal/screens/settings_display_images.dart';
+import 'package:gitjournal/settings/settings.dart';
-import 'package:gitjournal/screens/settings_editors.dart';
+import 'package:gitjournal/settings/settings_bottom_menu_bar.dart';
-import 'package:gitjournal/screens/settings_experimental.dart';
+import 'package:gitjournal/settings/settings_display_images.dart';
-import 'package:gitjournal/screens/settings_git_remote.dart';
+import 'package:gitjournal/settings/settings_editors.dart';
-import 'package:gitjournal/screens/settings_images.dart';
+import 'package:gitjournal/settings/settings_experimental.dart';
-import 'package:gitjournal/screens/settings_misc.dart';
+import 'package:gitjournal/settings/settings_git_remote.dart';
-import 'package:gitjournal/screens/settings_note_metadata.dart';
+import 'package:gitjournal/settings/settings_images.dart';
-import 'package:gitjournal/screens/settings_tags.dart';
+import 'package:gitjournal/settings/settings_misc.dart';
-import 'package:gitjournal/screens/settings_widgets.dart';
+import 'package:gitjournal/settings/settings_note_metadata.dart';
-import 'package:gitjournal/settings.dart';
+import 'package:gitjournal/settings/settings_tags.dart';
+import 'package:gitjournal/settings/settings_widgets.dart';
 import 'package:gitjournal/utils/logger.dart';
 import 'package:gitjournal/utils/utils.dart';
 import 'package:gitjournal/widgets/folder_selection_dialog.dart';

lib/settings/settings_tags.dart

@@ -3,8 +3,8 @@ import 'package:flutter/material.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:provider/provider.dart';
 
-import 'package:gitjournal/screens/settings_screen.dart';
+import 'package:gitjournal/settings/settings.dart';
-import 'package:gitjournal/settings.dart';
+import 'package:gitjournal/settings/settings_screen.dart';
 
 class SettingsTagsScreen extends StatefulWidget {
   @override

lib/setup/autoconfigure.dart

@@ -8,7 +8,7 @@ import 'package:provider/provider.dart';
 import 'package:gitjournal/analytics/analytics.dart';
 import 'package:gitjournal/apis/githost_factory.dart';
 import 'package:gitjournal/error_reporting.dart';
-import 'package:gitjournal/settings.dart';
+import 'package:gitjournal/settings/settings.dart';
 import 'package:gitjournal/utils/logger.dart';
 import 'button.dart';
 import 'error.dart';

lib/setup/screens.dart

@@ -16,7 +16,7 @@ import 'package:gitjournal/analytics/analytics.dart';
 import 'package:gitjournal/apis/githost_factory.dart';
 import 'package:gitjournal/error_reporting.dart';
 import 'package:gitjournal/repository.dart';
-import 'package:gitjournal/settings.dart';
+import 'package:gitjournal/settings/settings.dart';
 import 'package:gitjournal/setup/autoconfigure.dart';
 import 'package:gitjournal/setup/button.dart';
 import 'package:gitjournal/setup/clone.dart';

lib/utils/utils.dart

@@ -6,7 +6,7 @@ import 'package:provider/provider.dart';
 import 'package:share/share.dart';
 
 import 'package:gitjournal/core/notes_folder_fs.dart';
-import 'package:gitjournal/settings.dart';
+import 'package:gitjournal/settings/settings.dart';
 import '../app.dart';
 import '../core/note.dart';
 import '../editors/common_types.dart';

lib/widgets/app_drawer.dart

@@ -12,10 +12,10 @@ import 'package:time/time.dart';
 import 'package:url_launcher/url_launcher.dart';
 
 import 'package:gitjournal/analytics/analytics.dart';
-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/settings/app_settings.dart';
 import 'package:gitjournal/utils/logger.dart';
 import 'package:gitjournal/utils/utils.dart';
 import 'package:gitjournal/widgets/app_drawer_header.dart';

lib/widgets/app_drawer_header.dart

@@ -7,9 +7,9 @@ import 'package:path/path.dart' as p;
 import 'package:provider/provider.dart';
 import 'package:time/time.dart';
 
-import 'package:gitjournal/app_settings.dart';
 import 'package:gitjournal/repository.dart';
-import 'package:gitjournal/settings.dart';
+import 'package:gitjournal/settings/app_settings.dart';
+import 'package:gitjournal/settings/settings.dart';
 
 class AppDrawerHeader extends StatelessWidget {
   final Func0<void> repoListToggled;

lib/widgets/images/image_caption.dart

@@ -21,7 +21,7 @@ import 'package:flutter/material.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:provider/provider.dart';
 
-import 'package:gitjournal/settings.dart';
+import 'package:gitjournal/settings/settings.dart';
 import 'package:gitjournal/utils/hero_dialog.dart';
 
 class ImageCaption extends StatelessWidget {

lib/widgets/images/image_details.dart

@@ -19,7 +19,7 @@ import 'package:flutter/material.dart';
 import 'package:photo_view/photo_view.dart';
 import 'package:provider/provider.dart';
 
-import 'package:gitjournal/settings.dart';
+import 'package:gitjournal/settings/settings.dart';
 import 'package:gitjournal/widgets/images/markdown_image.dart';
 import 'package:gitjournal/widgets/images/themable_image.dart';
 

lib/widgets/images/markdown_image.dart

@@ -26,7 +26,7 @@ import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter_cache_manager/flutter_cache_manager.dart';
 import 'package:provider/provider.dart';
 
-import 'package:gitjournal/settings.dart';
+import 'package:gitjournal/settings/settings.dart';
 import 'package:gitjournal/utils/logger.dart';
 import 'package:gitjournal/widgets/images/image_caption.dart';
 import 'package:gitjournal/widgets/images/image_details.dart';

lib/widgets/note_search_delegate.dart

@@ -1,5 +1,3 @@
-
-
 import 'package:flutter/material.dart';
 
 import 'package:easy_localization/easy_localization.dart';
@@ -9,7 +7,7 @@ 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/settings.dart';
+import 'package:gitjournal/settings/settings.dart';
 import 'package:gitjournal/themes.dart';
 
 class NoteSearchDelegate extends SearchDelegate<Note?> {

lib/widgets/pro_overlay.dart

@@ -4,8 +4,8 @@ import 'package:easy_localization/easy_localization.dart';
 import 'package:provider/provider.dart';
 
 import 'package:gitjournal/analytics/analytics.dart';
-import 'package:gitjournal/app_settings.dart';
 import 'package:gitjournal/features.dart';
+import 'package:gitjournal/settings/app_settings.dart';
 
 class ProOverlay extends StatelessWidget {
   final Widget child;

lib/widgets/sorting_mode_selector.dart

@@ -3,7 +3,7 @@ import 'package:flutter/material.dart';
 import 'package:easy_localization/easy_localization.dart';
 
 import 'package:gitjournal/core/sorting_mode.dart';
-import 'package:gitjournal/screens/settings_screen.dart';
+import 'package:gitjournal/settings/settings_screen.dart';
 
 class SortingModeSelector extends StatefulWidget {
   final SortingMode selectedMode;

test/checklist_test.dart

@@ -6,7 +6,7 @@ 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:gitjournal/settings.dart';
+import 'package:gitjournal/settings/settings.dart';
 
 void main() {
   group('Note', () {

test/flattened_notes_folder_large_test.dart

@@ -7,7 +7,7 @@ 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';
-import 'package:gitjournal/settings.dart';
+import 'package:gitjournal/settings/settings.dart';
 
 void main() {
   group('Flattened Notes Folder Large Test', () {

test/flattened_notes_folder_test.dart

@@ -7,7 +7,7 @@ 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';
-import 'package:gitjournal/settings.dart';
+import 'package:gitjournal/settings/settings.dart';
 
 void main() {
   var random = Random(DateTime.now().millisecondsSinceEpoch);

test/link_resolver_test.dart

@@ -5,7 +5,7 @@ import 'package:test/test.dart';
 
 import 'package:gitjournal/core/link.dart';
 import 'package:gitjournal/core/notes_folder_fs.dart';
-import 'package:gitjournal/settings.dart';
+import 'package:gitjournal/settings/settings.dart';
 import 'package:gitjournal/utils/link_resolver.dart';
 
 void main() {

test/note_serializer_test.dart

@@ -6,7 +6,7 @@ import 'package:gitjournal/core/md_yaml_doc.dart';
 import 'package:gitjournal/core/note.dart';
 import 'package:gitjournal/core/note_serializer.dart';
 import 'package:gitjournal/core/notes_folder_fs.dart';
-import 'package:gitjournal/settings.dart';
+import 'package:gitjournal/settings/settings.dart';
 
 void main() {
   group('Note Serializer Test', () {

test/note_storage_test.dart

@@ -7,7 +7,7 @@ import 'package:test/test.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/settings.dart';
+import 'package:gitjournal/settings/settings.dart';
 import 'package:gitjournal/utils/datetime.dart';
 
 void main() {

test/note_test.dart

@@ -5,7 +5,7 @@ import 'package:test/test.dart';
 
 import 'package:gitjournal/core/note.dart';
 import 'package:gitjournal/core/notes_folder_fs.dart';
-import 'package:gitjournal/settings.dart';
+import 'package:gitjournal/settings/settings.dart';
 
 void main() {
   group('Note', () {

test/notes_cache_test.dart

@@ -5,7 +5,7 @@ import 'package:test/test.dart';
 
 import 'package:gitjournal/core/notes_cache.dart';
 import 'package:gitjournal/core/notes_folder_fs.dart';
-import 'package:gitjournal/settings.dart';
+import 'package:gitjournal/settings/settings.dart';
 
 void main() {
   group('Notes Cache', () {

test/notes_folder_config_test.dart

@@ -9,7 +9,7 @@ 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/settings.dart';
+import 'package:gitjournal/settings/settings.dart';
 
 void main() {
   group('Notes Folder Config', () {

test/processors/wiki_links_auto_add_test.dart

@@ -2,7 +2,7 @@ import 'package:test/test.dart';
 
 import 'package:gitjournal/core/notes_folder_fs.dart';
 import 'package:gitjournal/core/processors/wiki_links_auto_add.dart';
-import 'package:gitjournal/settings.dart';
+import 'package:gitjournal/settings/settings.dart';
 
 void main() {
   test('Should process body', () {

test/sorted_notes_folder_test.dart

@@ -8,7 +8,7 @@ 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/settings.dart';
+import 'package:gitjournal/settings/settings.dart';
 
 void main() {
   group('Sorted Notes Folder Test', () {

test/sorting_mode_test.dart

@@ -3,7 +3,7 @@ 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:gitjournal/settings.dart';
+import 'package:gitjournal/settings/settings.dart';
 
 void main() {
   group('Sorting Mode', () {

test_driver/main.dart

@@ -7,7 +7,7 @@ import 'package:shared_preferences/shared_preferences.dart';
 import 'package:time/time.dart';
 
 import 'package:gitjournal/app.dart';
-import 'package:gitjournal/app_settings.dart';
+import 'package:gitjournal/settings/app_settings.dart';
 import 'package:gitjournal/utils/datetime.dart';
 
 void main() async {