diff --git a/integration_test/utils.dart b/integration_test/utils.dart index 05f7e82d..4b19e659 100644 --- a/integration_test/utils.dart +++ b/integration_test/utils.dart @@ -4,15 +4,15 @@ import 'package:flutter_test/flutter_test.dart'; import 'package:localmaterialnotes/app.dart'; import 'package:localmaterialnotes/common/constants/constants.dart'; import 'package:localmaterialnotes/common/preferences/preferences_utils.dart'; +import 'package:localmaterialnotes/common/system/flag_secure_utils.dart'; +import 'package:localmaterialnotes/common/system/info_utils.dart'; +import 'package:localmaterialnotes/common/ui/theme_utils.dart'; import 'package:localmaterialnotes/navigation/navigation_routes.dart'; import 'package:localmaterialnotes/pages/bin/bin_page.dart'; import 'package:localmaterialnotes/pages/settings/settings_main_page.dart'; import 'package:localmaterialnotes/services/backup/auto_backup_service.dart'; import 'package:localmaterialnotes/services/labels/labels_service.dart'; import 'package:localmaterialnotes/services/notes/notes_service.dart'; -import 'package:localmaterialnotes/utils/flag_secure_utils.dart'; -import 'package:localmaterialnotes/utils/info_utils.dart'; -import 'package:localmaterialnotes/utils/theme_utils.dart'; import 'package:patrol/patrol.dart'; import 'package:shared_preferences/shared_preferences.dart'; diff --git a/lib/app.dart b/lib/app.dart index 0a717db6..202f0a17 100644 --- a/lib/app.dart +++ b/lib/app.dart @@ -11,6 +11,10 @@ import 'common/actions/notes/select.dart'; import 'common/constants/constants.dart'; import 'common/enums/localization_completion.dart'; import 'common/extensions/locale_extension.dart'; +import 'common/localization/locale_utils.dart'; +import 'common/system/quick_actions_utils.dart'; +import 'common/system/share_utils.dart'; +import 'common/ui/theme_utils.dart'; import 'common/widgets/placeholders/error_placeholder.dart'; import 'l10n/app_localizations/app_localizations.g.dart'; import 'pages/notes/notes_page.dart'; @@ -18,10 +22,6 @@ import 'providers/labels/labels_list/labels_list_provider.dart'; import 'providers/labels/labels_navigation/labels_navigation_provider.dart'; import 'providers/notifiers/notifiers.dart'; import 'providers/preferences/preferences_provider.dart'; -import 'utils/locale_utils.dart'; -import 'utils/quick_actions_utils.dart'; -import 'utils/share_utils.dart'; -import 'utils/theme_utils.dart'; /// MaterialNotes application. class App extends ConsumerStatefulWidget { diff --git a/lib/common/actions/notes/copy.dart b/lib/common/actions/notes/copy.dart index b48ac682..e0fdcda3 100644 --- a/lib/common/actions/notes/copy.dart +++ b/lib/common/actions/notes/copy.dart @@ -1,8 +1,8 @@ import 'package:flutter/services.dart'; import '../../../models/note/note.dart'; -import '../../../utils/snack_bar_utils.dart'; import '../../constants/constants.dart'; +import '../../ui/snack_bar_utils.dart'; /// Copies the content of the [note] to the clipboard. Future copyNote({required Note note}) async { diff --git a/lib/common/actions/notes/labels.dart b/lib/common/actions/notes/labels.dart index 3d286632..daeb99a4 100644 --- a/lib/common/actions/notes/labels.dart +++ b/lib/common/actions/notes/labels.dart @@ -7,8 +7,8 @@ import '../../../pages/editor/dialogs/labels_selection_dialog.dart'; import '../../../providers/labels/labels_list/labels_list_provider.dart'; import '../../../providers/notes/notes_provider.dart'; import '../../../providers/notifiers/notifiers.dart'; -import '../../../utils/snack_bar_utils.dart'; import '../../constants/constants.dart'; +import '../../ui/snack_bar_utils.dart'; import 'select.dart'; /// Asks the user to select the labels for the [note]. diff --git a/lib/common/constants/notes.dart b/lib/common/constants/notes.dart index 96a30537..dbb35c42 100644 --- a/lib/common/constants/notes.dart +++ b/lib/common/constants/notes.dart @@ -1,5 +1,5 @@ import '../../models/note/note.dart'; -import '../../utils/localizations_utils.dart'; +import '../localization/localizations_utils.dart'; /// Note displayed on the very first run of the application to welcome the user. final welcomeNote = RichTextNote( diff --git a/lib/common/dialogs/confirmation_dialog.dart b/lib/common/dialogs/confirmation_dialog.dart index e846d22a..474c1f0c 100644 --- a/lib/common/dialogs/confirmation_dialog.dart +++ b/lib/common/dialogs/confirmation_dialog.dart @@ -1,7 +1,8 @@ import 'package:flutter/material.dart'; + import '../constants/constants.dart'; import '../preferences/enums/confirmations.dart'; -import '../../utils/keys.dart'; +import '../widgets/keys.dart'; /// Shows the confirmation dialog to ask the user for a confirmation on an action. /// diff --git a/lib/common/extensions/locale_extension.dart b/lib/common/extensions/locale_extension.dart index b12eaf87..e8cc3065 100644 --- a/lib/common/extensions/locale_extension.dart +++ b/lib/common/extensions/locale_extension.dart @@ -1,7 +1,8 @@ import 'dart:ui'; import 'package:intl/intl.dart' as intl; -import '../../utils/locale_utils.dart'; + +import '../localization/locale_utils.dart'; /// Extends the [Locale] class with some utilities functions. extension LocaleExtension on Locale { diff --git a/lib/utils/encryption_utils.dart b/lib/common/files/encryption_utils.dart similarity index 100% rename from lib/utils/encryption_utils.dart rename to lib/common/files/encryption_utils.dart diff --git a/lib/utils/files_utils.dart b/lib/common/files/files_utils.dart similarity index 97% rename from lib/utils/files_utils.dart rename to lib/common/files/files_utils.dart index 9efa9e56..5f7c0929 100644 --- a/lib/utils/files_utils.dart +++ b/lib/common/files/files_utils.dart @@ -4,8 +4,8 @@ import 'dart:typed_data'; import 'package:path/path.dart'; -import '../common/constants/constants.dart'; -import '../services/backup/auto_backup_service.dart'; +import '../../services/backup/auto_backup_service.dart'; +import '../constants/constants.dart'; /// Writes a file with the [data], in the [directory], with the [filename]. /// diff --git a/lib/utils/locale_utils.dart b/lib/common/localization/locale_utils.dart similarity index 96% rename from lib/utils/locale_utils.dart rename to lib/common/localization/locale_utils.dart index 265e9939..a89c717f 100644 --- a/lib/utils/locale_utils.dart +++ b/lib/common/localization/locale_utils.dart @@ -2,7 +2,7 @@ import 'dart:io'; import 'package:flutter/material.dart'; -import '../common/preferences/preference_key.dart'; +import '../preferences/preference_key.dart'; import 'localizations_utils.dart'; /// Utilities for the application's locale. diff --git a/lib/utils/localizations_utils.dart b/lib/common/localization/localizations_utils.dart similarity index 93% rename from lib/utils/localizations_utils.dart rename to lib/common/localization/localizations_utils.dart index 5702120d..bfb6d9af 100644 --- a/lib/utils/localizations_utils.dart +++ b/lib/common/localization/localizations_utils.dart @@ -1,4 +1,4 @@ -import '../l10n/app_localizations/app_localizations.g.dart'; +import '../../l10n/app_localizations/app_localizations.g.dart'; import 'locale_utils.dart'; /// Utilities for the hardcoded application's localizations. diff --git a/lib/common/logs/app_logger.dart b/lib/common/logs/app_logger.dart index 69fd2485..bcb76d7c 100644 --- a/lib/common/logs/app_logger.dart +++ b/lib/common/logs/app_logger.dart @@ -8,13 +8,13 @@ import 'package:path/path.dart'; import 'package:path_provider/path_provider.dart'; import '../../l10n/app_localizations/app_localizations.g.dart'; -import '../../utils/files_utils.dart'; -import '../../utils/snack_bar_utils.dart'; import '../constants/constants.dart'; import '../enums/mime_type.dart'; import '../extensions/date_time_extensions.dart'; import '../extensions/string_extension.dart'; -import 'filters/debug_filter.dart'; +import '../files/files_utils.dart'; +import '../ui/snack_bar_utils.dart'; +import 'filters/default_filter.dart'; import 'filters/release_filter.dart'; /// Exceptions logger. @@ -42,11 +42,13 @@ class AppLogger { _logFilesDirectory = join((await getApplicationSupportDirectory()).path, 'logs'); _consoleLogger = Logger( - filter: DebugFilter(), + filter: DefaultFilter(), printer: PrettyPrinter( methodCount: 5, - errorMethodCount: 20, - dateTimeFormat: DateTimeFormat.onlyTime, + errorMethodCount: 25, + colors: false, + printEmojis: false, + dateTimeFormat: DateTimeFormat.dateAndTime, ), ); _fileLogger = Logger( diff --git a/lib/common/logs/filters/debug_filter.dart b/lib/common/logs/filters/debug_filter.dart deleted file mode 100644 index 1b7e1b6e..00000000 --- a/lib/common/logs/filters/debug_filter.dart +++ /dev/null @@ -1,14 +0,0 @@ -import 'package:flutter/foundation.dart'; -import 'package:logger/logger.dart'; - -/// Log filter that only logs messages in debug mode. -class DebugFilter extends LogFilter { - @override - bool shouldLog(LogEvent event) { - if (!kDebugMode) { - return false; - } - - return event.level.value >= level!.value; - } -} diff --git a/lib/common/logs/filters/default_filter.dart b/lib/common/logs/filters/default_filter.dart new file mode 100644 index 00000000..db348c41 --- /dev/null +++ b/lib/common/logs/filters/default_filter.dart @@ -0,0 +1,9 @@ +import 'package:logger/logger.dart'; + +/// Default log filter. +class DefaultFilter extends LogFilter { + @override + bool shouldLog(LogEvent event) { + return event.level.value >= level!.value; + } +} diff --git a/lib/common/navigation/app_bars/notes_app_bar.dart b/lib/common/navigation/app_bars/notes_app_bar.dart index 19cb2543..9f037944 100644 --- a/lib/common/navigation/app_bars/notes_app_bar.dart +++ b/lib/common/navigation/app_bars/notes_app_bar.dart @@ -8,13 +8,13 @@ import '../../../providers/notes/notes_provider.dart'; import '../../../providers/notifiers/notifiers.dart'; import '../../../providers/preferences/preferences_provider.dart'; import '../../../services/notes/notes_service.dart'; -import '../../../utils/keys.dart'; import '../../constants/constants.dart'; import '../../constants/paddings.dart'; import '../../preferences/enums/layout.dart'; import '../../preferences/enums/sort_method.dart'; import '../../preferences/preference_key.dart'; import '../../preferences/watched_preferences.dart'; +import '../../widgets/keys.dart'; import '../../widgets/notes/note_tile.dart'; import '../../widgets/placeholders/empty_placeholder.dart'; diff --git a/lib/common/navigation/side_navigation.dart b/lib/common/navigation/side_navigation.dart index 3011bc13..2c2daf88 100644 --- a/lib/common/navigation/side_navigation.dart +++ b/lib/common/navigation/side_navigation.dart @@ -11,12 +11,12 @@ import '../../pages/notes/notes_page.dart'; import '../../pages/settings/settings_main_page.dart'; import '../../providers/labels/labels_navigation/labels_navigation_provider.dart'; import '../../providers/notifiers/notifiers.dart'; -import '../../utils/asset.dart'; -import '../../utils/keys.dart'; import '../constants/constants.dart'; import '../constants/paddings.dart'; import '../constants/sizes.dart'; import '../preferences/preference_key.dart'; +import '../widgets/asset.dart'; +import '../widgets/keys.dart'; import '../widgets/placeholders/error_placeholder.dart'; /// Side navigation with the drawer. diff --git a/lib/common/preferences/watched_preferences.dart b/lib/common/preferences/watched_preferences.dart index 9a200635..c38cdcf0 100644 --- a/lib/common/preferences/watched_preferences.dart +++ b/lib/common/preferences/watched_preferences.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; -import '../../utils/theme_utils.dart'; +import '../ui/theme_utils.dart'; import 'enums/bin_swipe_action.dart'; import 'enums/font.dart'; import 'enums/layout.dart'; diff --git a/lib/utils/flag_secure_utils.dart b/lib/common/system/flag_secure_utils.dart similarity index 84% rename from lib/utils/flag_secure_utils.dart rename to lib/common/system/flag_secure_utils.dart index eacf3552..d531d04f 100644 --- a/lib/utils/flag_secure_utils.dart +++ b/lib/common/system/flag_secure_utils.dart @@ -1,5 +1,6 @@ import 'package:flag_secure/flag_secure.dart'; -import '../common/preferences/preference_key.dart'; + +import '../preferences/preference_key.dart'; /// Sets `FLAG_SECURE` to `true` if the corresponding preference was enabled by the user. Future setFlagSecureIfNeeded() async { diff --git a/lib/utils/info_utils.dart b/lib/common/system/info_utils.dart similarity index 96% rename from lib/utils/info_utils.dart rename to lib/common/system/info_utils.dart index 15b090a6..a0437637 100644 --- a/lib/utils/info_utils.dart +++ b/lib/common/system/info_utils.dart @@ -1,8 +1,9 @@ import 'package:device_info_plus/device_info_plus.dart'; import 'package:flutter/foundation.dart'; -import '../common/constants/constants.dart'; import 'package:package_info_plus/package_info_plus.dart'; +import '../constants/constants.dart'; + /// Utilities for information about the application. /// /// This class is a singleton. diff --git a/lib/utils/quick_actions_utils.dart b/lib/common/system/quick_actions_utils.dart similarity index 89% rename from lib/utils/quick_actions_utils.dart rename to lib/common/system/quick_actions_utils.dart index 84427bc6..c79b0b2a 100644 --- a/lib/utils/quick_actions_utils.dart +++ b/lib/common/system/quick_actions_utils.dart @@ -1,9 +1,10 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; -import '../common/actions/notes/add.dart'; -import 'localizations_utils.dart'; import 'package:quick_actions/quick_actions.dart'; +import '../actions/notes/add.dart'; +import '../localization/localizations_utils.dart'; + /// Utilities for the quick actions. class QuickActionsUtils { /// Application's quick actions. diff --git a/lib/utils/share_utils.dart b/lib/common/system/share_utils.dart similarity index 93% rename from lib/utils/share_utils.dart rename to lib/common/system/share_utils.dart index 29932845..3daedc7b 100644 --- a/lib/utils/share_utils.dart +++ b/lib/common/system/share_utils.dart @@ -2,11 +2,12 @@ import 'dart:async'; import 'dart:convert'; import 'package:flutter_riverpod/flutter_riverpod.dart'; -import '../common/actions/notes/add.dart'; -import '../common/constants/constants.dart'; import 'package:parchment_delta/parchment_delta.dart'; import 'package:receive_sharing_intent/receive_sharing_intent.dart'; +import '../actions/notes/add.dart'; +import '../constants/constants.dart'; + /// Listens to any data shared from other applications. StreamSubscription listenSharedData(WidgetRef ref) => ReceiveSharingIntent.instance.getMediaStream().listen((data) { _processSharedData(ref, data); diff --git a/lib/utils/snack_bar_utils.dart b/lib/common/ui/snack_bar_utils.dart similarity index 95% rename from lib/utils/snack_bar_utils.dart rename to lib/common/ui/snack_bar_utils.dart index 3d75dc97..f73bfeab 100644 --- a/lib/utils/snack_bar_utils.dart +++ b/lib/common/ui/snack_bar_utils.dart @@ -1,5 +1,6 @@ import 'package:flutter/material.dart'; -import '../common/constants/constants.dart'; + +import '../constants/constants.dart'; /// Utilities for the snack bars. class SnackBarUtils { diff --git a/lib/utils/theme_utils.dart b/lib/common/ui/theme_utils.dart similarity index 96% rename from lib/utils/theme_utils.dart rename to lib/common/ui/theme_utils.dart index 848cbe87..c39f3b71 100644 --- a/lib/utils/theme_utils.dart +++ b/lib/common/ui/theme_utils.dart @@ -1,9 +1,10 @@ import 'package:dynamic_color/dynamic_color.dart'; import 'package:flutter/material.dart'; -import '../common/constants/constants.dart'; -import '../common/extensions/iterable_extension.dart'; -import '../common/preferences/enums/font.dart'; -import '../common/preferences/preference_key.dart'; + +import '../constants/constants.dart'; +import '../extensions/iterable_extension.dart'; +import '../preferences/enums/font.dart'; +import '../preferences/preference_key.dart'; /// Utilities for the application's theme. /// diff --git a/lib/utils/utils.dart b/lib/common/utils.dart similarity index 100% rename from lib/utils/utils.dart rename to lib/common/utils.dart diff --git a/lib/utils/asset.dart b/lib/common/widgets/asset.dart similarity index 100% rename from lib/utils/asset.dart rename to lib/common/widgets/asset.dart diff --git a/lib/utils/keys.dart b/lib/common/widgets/keys.dart similarity index 100% rename from lib/utils/keys.dart rename to lib/common/widgets/keys.dart diff --git a/lib/common/widgets/notes/notes_list.dart b/lib/common/widgets/notes/notes_list.dart index 822e0dec..9a51b480 100644 --- a/lib/common/widgets/notes/notes_list.dart +++ b/lib/common/widgets/notes/notes_list.dart @@ -8,11 +8,11 @@ import '../../../providers/bin/bin_provider.dart'; import '../../../providers/notes/notes_provider.dart'; import '../../../providers/notifiers/notifiers.dart'; import '../../../providers/preferences/preferences_provider.dart'; -import '../../../utils/keys.dart'; import '../../constants/paddings.dart'; import '../../constants/separators.dart'; import '../../constants/sizes.dart'; import '../../preferences/enums/layout.dart'; +import '../keys.dart'; import '../placeholders/empty_placeholder.dart'; import '../placeholders/error_placeholder.dart'; import '../placeholders/loading_placeholder.dart'; diff --git a/lib/common/widgets/placeholders/error_placeholder.dart b/lib/common/widgets/placeholders/error_placeholder.dart index 52362d28..f186ca37 100644 --- a/lib/common/widgets/placeholders/error_placeholder.dart +++ b/lib/common/widgets/placeholders/error_placeholder.dart @@ -5,15 +5,15 @@ import 'package:url_launcher/url_launcher.dart'; import '../../../l10n/app_localizations/app_localizations.g.dart'; import '../../../services/backup/backup_service.dart'; -import '../../../utils/info_utils.dart'; -import '../../../utils/snack_bar_utils.dart'; -import '../../../utils/utils.dart'; import '../../constants/constants.dart'; import '../../constants/paddings.dart'; import '../../navigation/app_bars/error_app_bar.dart'; import '../../navigation/side_navigation.dart'; import '../../navigation/top_navigation.dart'; import '../../preferences/preference_key.dart'; +import '../../system/info_utils.dart'; +import '../../ui/snack_bar_utils.dart'; +import '../../utils.dart'; /// Placeholder widget for an error. class ErrorPlaceholder extends StatelessWidget { diff --git a/lib/main.dart b/lib/main.dart index a2f16b72..3e0d5e1e 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -5,14 +5,14 @@ import 'package:flutter_native_splash/flutter_native_splash.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'app.dart'; +import 'common/localization/localizations_utils.dart'; import 'common/logs/app_logger.dart'; import 'common/preferences/preferences_utils.dart'; +import 'common/system/flag_secure_utils.dart'; +import 'common/system/info_utils.dart'; +import 'common/ui/theme_utils.dart'; import 'services/backup/auto_backup_service.dart'; import 'services/database_service.dart'; -import 'utils/flag_secure_utils.dart'; -import 'utils/info_utils.dart'; -import 'utils/localizations_utils.dart'; -import 'utils/theme_utils.dart'; /// Main entry point of the application. Future main() async { diff --git a/lib/models/note/note.dart b/lib/models/note/note.dart index 49ba43b1..c2247224 100644 --- a/lib/models/note/note.dart +++ b/lib/models/note/note.dart @@ -6,7 +6,7 @@ import 'package:isar/isar.dart'; import 'package:json_annotation/json_annotation.dart'; import '../../../common/constants/constants.dart'; -import '../../../utils/encryption_utils.dart'; +import '../../common/files/encryption_utils.dart'; import '../../common/preferences/enums/sort_method.dart'; import '../../common/preferences/preference_key.dart'; import '../label/label.dart'; diff --git a/lib/pages/bin/bin_page.dart b/lib/pages/bin/bin_page.dart index 3f03d5bc..a8797384 100644 --- a/lib/pages/bin/bin_page.dart +++ b/lib/pages/bin/bin_page.dart @@ -4,8 +4,8 @@ import 'package:flutter_riverpod/flutter_riverpod.dart'; import '../../common/navigation/app_bars/notes_app_bar.dart'; import '../../common/navigation/side_navigation.dart'; import '../../common/navigation/top_navigation.dart'; +import '../../common/widgets/keys.dart'; import '../../common/widgets/notes/notes_list.dart'; -import '../../utils/keys.dart'; import 'widgets/empty_bin_fab.dart'; /// Page displaying the deleted notes. diff --git a/lib/pages/editor/editor_page.dart b/lib/pages/editor/editor_page.dart index badb1240..82e7123f 100644 --- a/lib/pages/editor/editor_page.dart +++ b/lib/pages/editor/editor_page.dart @@ -10,11 +10,11 @@ import '../../common/constants/paddings.dart'; import '../../common/navigation/app_bars/editor_app_bar.dart'; import '../../common/navigation/top_navigation.dart'; import '../../common/preferences/preference_key.dart'; +import '../../common/widgets/keys.dart'; import '../../common/widgets/placeholders/loading_placeholder.dart'; import '../../models/note/note.dart'; import '../../providers/notes/notes_provider.dart'; import '../../providers/notifiers/notifiers.dart'; -import '../../utils/keys.dart'; import 'widgets/editor_field.dart'; import 'widgets/editor_labels_list.dart'; import 'widgets/editor_toolbar.dart'; diff --git a/lib/pages/notes/notes_page.dart b/lib/pages/notes/notes_page.dart index 4e1f48d9..f0476eea 100644 --- a/lib/pages/notes/notes_page.dart +++ b/lib/pages/notes/notes_page.dart @@ -4,9 +4,9 @@ import 'package:flutter_riverpod/flutter_riverpod.dart'; import '../../common/navigation/app_bars/notes_app_bar.dart'; import '../../common/navigation/side_navigation.dart'; import '../../common/navigation/top_navigation.dart'; +import '../../common/widgets/keys.dart'; import '../../common/widgets/notes/notes_list.dart'; import '../../providers/notifiers/notifiers.dart'; -import '../../utils/keys.dart'; import 'widgets/add_note_fab.dart'; /// List of notes. diff --git a/lib/pages/settings/pages/settings_about_page.dart b/lib/pages/settings/pages/settings_about_page.dart index 71b605aa..0f467179 100644 --- a/lib/pages/settings/pages/settings_about_page.dart +++ b/lib/pages/settings/pages/settings_about_page.dart @@ -1,17 +1,18 @@ import 'package:flutter/material.dart'; +import 'package:material_symbols_icons/material_symbols_icons.dart'; +import 'package:settings_tiles/settings_tiles.dart'; +import 'package:simple_icons/simple_icons.dart'; +import 'package:url_launcher/url_launcher.dart'; + import '../../../common/constants/constants.dart'; import '../../../common/constants/paddings.dart'; import '../../../common/constants/sizes.dart'; import '../../../common/navigation/app_bars/basic_app_bar.dart'; import '../../../common/navigation/top_navigation.dart'; -import '../../../utils/asset.dart'; -import '../../../utils/info_utils.dart'; -import '../../../utils/keys.dart'; -import '../../../utils/utils.dart'; -import 'package:material_symbols_icons/material_symbols_icons.dart'; -import 'package:settings_tiles/settings_tiles.dart'; -import 'package:simple_icons/simple_icons.dart'; -import 'package:url_launcher/url_launcher.dart'; +import '../../../common/system/info_utils.dart'; +import '../../../common/utils.dart'; +import '../../../common/widgets/asset.dart'; +import '../../../common/widgets/keys.dart'; /// Settings providing information about the application. class SettingsAboutPage extends StatelessWidget { diff --git a/lib/pages/settings/pages/settings_accessibility_page.dart b/lib/pages/settings/pages/settings_accessibility_page.dart index ae2cda3a..104ac030 100644 --- a/lib/pages/settings/pages/settings_accessibility_page.dart +++ b/lib/pages/settings/pages/settings_accessibility_page.dart @@ -1,16 +1,17 @@ import 'package:dart_helper_utils/dart_helper_utils.dart'; import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; +import 'package:settings_tiles/settings_tiles.dart'; + import '../../../common/constants/constants.dart'; import '../../../common/constants/paddings.dart'; +import '../../../common/localization/locale_utils.dart'; import '../../../common/navigation/app_bars/basic_app_bar.dart'; import '../../../common/navigation/top_navigation.dart'; import '../../../common/preferences/preference_key.dart'; import '../../../common/preferences/watched_preferences.dart'; +import '../../../common/widgets/keys.dart'; import '../../../providers/preferences/preferences_provider.dart'; -import '../../../utils/keys.dart'; -import '../../../utils/locale_utils.dart'; -import 'package:settings_tiles/settings_tiles.dart'; /// Accessibility settings. class SettingsAccessibilityPage extends ConsumerStatefulWidget { diff --git a/lib/pages/settings/pages/settings_appearance_page.dart b/lib/pages/settings/pages/settings_appearance_page.dart index 37be8714..94bbe208 100644 --- a/lib/pages/settings/pages/settings_appearance_page.dart +++ b/lib/pages/settings/pages/settings_appearance_page.dart @@ -10,15 +10,15 @@ import 'package:url_launcher/url_launcher.dart'; import '../../../common/constants/constants.dart'; import '../../../common/constants/paddings.dart'; import '../../../common/enums/localization_completion.dart'; +import '../../../common/localization/locale_utils.dart'; import '../../../common/navigation/app_bars/basic_app_bar.dart'; import '../../../common/navigation/top_navigation.dart'; import '../../../common/preferences/enums/font.dart'; import '../../../common/preferences/preference_key.dart'; import '../../../common/preferences/watched_preferences.dart'; +import '../../../common/ui/theme_utils.dart'; +import '../../../common/widgets/keys.dart'; import '../../../providers/preferences/preferences_provider.dart'; -import '../../../utils/keys.dart'; -import '../../../utils/locale_utils.dart'; -import '../../../utils/theme_utils.dart'; /// Settings related to the appearance of the application. class SettingsAppearancePage extends ConsumerStatefulWidget { diff --git a/lib/pages/settings/pages/settings_backup_page.dart b/lib/pages/settings/pages/settings_backup_page.dart index 3f05ef64..7329c1bb 100644 --- a/lib/pages/settings/pages/settings_backup_page.dart +++ b/lib/pages/settings/pages/settings_backup_page.dart @@ -7,9 +7,12 @@ import 'package:simple_icons/simple_icons.dart'; import '../../../common/constants/constants.dart'; import '../../../common/constants/paddings.dart'; import '../../../common/extensions/string_extension.dart'; +import '../../../common/files/files_utils.dart'; import '../../../common/navigation/app_bars/basic_app_bar.dart'; import '../../../common/navigation/top_navigation.dart'; import '../../../common/preferences/preference_key.dart'; +import '../../../common/ui/snack_bar_utils.dart'; +import '../../../common/widgets/keys.dart'; import '../../../providers/bin/bin_provider.dart'; import '../../../providers/labels/labels/labels_provider.dart'; import '../../../providers/labels/labels_list/labels_list_provider.dart'; @@ -19,9 +22,6 @@ import '../../../providers/notifiers/notifiers.dart'; import '../../../providers/preferences/preferences_provider.dart'; import '../../../services/backup/auto_backup_service.dart'; import '../../../services/backup/backup_service.dart'; -import '../../../utils/files_utils.dart'; -import '../../../utils/keys.dart'; -import '../../../utils/snack_bar_utils.dart'; import '../dialogs/auto_export_frequency_dialog.dart'; import '../dialogs/auto_export_password_dialog.dart'; import '../dialogs/manual_export_dialog.dart'; diff --git a/lib/pages/settings/pages/settings_behavior_page.dart b/lib/pages/settings/pages/settings_behavior_page.dart index 050f8e67..daba0eed 100644 --- a/lib/pages/settings/pages/settings_behavior_page.dart +++ b/lib/pages/settings/pages/settings_behavior_page.dart @@ -12,8 +12,8 @@ import '../../../common/preferences/enums/confirmations.dart'; import '../../../common/preferences/enums/swipe_action.dart'; import '../../../common/preferences/preference_key.dart'; import '../../../common/preferences/watched_preferences.dart'; +import '../../../common/widgets/keys.dart'; import '../../../providers/preferences/preferences_provider.dart'; -import '../../../utils/keys.dart'; /// Settings related to the behavior of the application. class SettingsBehaviorPage extends ConsumerStatefulWidget { diff --git a/lib/pages/settings/pages/settings_editor_page.dart b/lib/pages/settings/pages/settings_editor_page.dart index 9231641c..78376891 100644 --- a/lib/pages/settings/pages/settings_editor_page.dart +++ b/lib/pages/settings/pages/settings_editor_page.dart @@ -1,11 +1,12 @@ import 'package:flutter/material.dart'; +import 'package:settings_tiles/settings_tiles.dart'; + import '../../../common/constants/constants.dart'; import '../../../common/constants/paddings.dart'; import '../../../common/navigation/app_bars/basic_app_bar.dart'; import '../../../common/navigation/top_navigation.dart'; import '../../../common/preferences/preference_key.dart'; -import '../../../utils/keys.dart'; -import 'package:settings_tiles/settings_tiles.dart'; +import '../../../common/widgets/keys.dart'; /// Settings related to the notes editor. class SettingsEditorPage extends StatefulWidget { diff --git a/lib/pages/settings/pages/settings_labels_page.dart b/lib/pages/settings/pages/settings_labels_page.dart index c60e1e31..ef1d410b 100644 --- a/lib/pages/settings/pages/settings_labels_page.dart +++ b/lib/pages/settings/pages/settings_labels_page.dart @@ -1,14 +1,15 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; +import 'package:material_symbols_icons/material_symbols_icons.dart'; +import 'package:restart_app/restart_app.dart'; +import 'package:settings_tiles/settings_tiles.dart'; + import '../../../common/constants/constants.dart'; import '../../../common/constants/paddings.dart'; import '../../../common/navigation/app_bars/basic_app_bar.dart'; import '../../../common/navigation/top_navigation.dart'; import '../../../common/preferences/preference_key.dart'; -import '../../../utils/keys.dart'; -import 'package:material_symbols_icons/material_symbols_icons.dart'; -import 'package:restart_app/restart_app.dart'; -import 'package:settings_tiles/settings_tiles.dart'; +import '../../../common/widgets/keys.dart'; /// Settings related to the labels. class SettingsLabelsPage extends StatefulWidget { diff --git a/lib/pages/settings/pages/settings_notes_tiles_page.dart b/lib/pages/settings/pages/settings_notes_tiles_page.dart index b72ddd88..515fcb2e 100644 --- a/lib/pages/settings/pages/settings_notes_tiles_page.dart +++ b/lib/pages/settings/pages/settings_notes_tiles_page.dart @@ -9,8 +9,8 @@ import '../../../common/navigation/app_bars/basic_app_bar.dart'; import '../../../common/navigation/top_navigation.dart'; import '../../../common/preferences/preference_key.dart'; import '../../../common/preferences/watched_preferences.dart'; +import '../../../common/widgets/keys.dart'; import '../../../providers/preferences/preferences_provider.dart'; -import '../../../utils/keys.dart'; /// Settings related to the appearance of the application. class SettingsNotesTilesPage extends ConsumerStatefulWidget { diff --git a/lib/pages/settings/settings_main_page.dart b/lib/pages/settings/settings_main_page.dart index ddf9dbc9..06da3fd5 100644 --- a/lib/pages/settings/settings_main_page.dart +++ b/lib/pages/settings/settings_main_page.dart @@ -5,8 +5,8 @@ import '../../common/constants/constants.dart'; import '../../common/navigation/app_bars/basic_app_bar.dart'; import '../../common/navigation/side_navigation.dart'; import '../../common/navigation/top_navigation.dart'; +import '../../common/widgets/keys.dart'; import '../../navigation/navigation_routes.dart'; -import '../../utils/keys.dart'; import 'pages/settings_about_page.dart'; import 'pages/settings_accessibility_page.dart'; import 'pages/settings_appearance_page.dart'; diff --git a/lib/services/backup/auto_backup_service.dart b/lib/services/backup/auto_backup_service.dart index 4831492f..920ab857 100644 --- a/lib/services/backup/auto_backup_service.dart +++ b/lib/services/backup/auto_backup_service.dart @@ -5,8 +5,8 @@ import 'package:path_provider/path_provider.dart'; import 'package:saf_util/saf_util.dart'; import '../../common/constants/constants.dart'; +import '../../common/files/files_utils.dart'; import '../../common/preferences/preference_key.dart'; -import '../../utils/files_utils.dart'; import 'backup_service.dart'; /// Service for the automatic backup (export and import) of the database. diff --git a/lib/services/backup/backup_service.dart b/lib/services/backup/backup_service.dart index e5c6186f..771b342a 100644 --- a/lib/services/backup/backup_service.dart +++ b/lib/services/backup/backup_service.dart @@ -10,14 +10,14 @@ import '../../common/constants/constants.dart'; import '../../common/enums/mime_type.dart'; import '../../common/extensions/date_time_extensions.dart'; import '../../common/extensions/iterable_extension.dart'; +import '../../common/files/files_utils.dart'; import '../../common/preferences/preference_key.dart'; import '../../common/preferences/preferences_utils.dart'; +import '../../common/system/info_utils.dart'; +import '../../common/ui/snack_bar_utils.dart'; import '../../models/label/label.dart'; import '../../models/note/note.dart'; import '../../pages/settings/dialogs/auto_export_password_dialog.dart'; -import '../../utils/files_utils.dart'; -import '../../utils/info_utils.dart'; -import '../../utils/snack_bar_utils.dart'; import '../labels/labels_service.dart'; import '../notes/notes_service.dart'; import 'auto_backup_service.dart';