From cf6ef9e5034ddb6efb4c82d9eaa81cb815a8f98f Mon Sep 17 00:00:00 2001 From: nrubin29 Date: Sun, 25 Sep 2022 22:18:39 -0700 Subject: [PATCH] Moved files related to external actions to their own subdirectory --- lib/main.dart | 6 +++--- lib/util/background_tasks/spotify_checker.dart | 2 +- lib/util/{ => external_actions}/external_actions.dart | 2 +- lib/util/{ => external_actions}/notifications.dart | 2 +- lib/util/{ => external_actions}/quick_actions_manager.dart | 4 ++-- lib/util/{ => external_actions}/time_safe_stream.dart | 0 lib/widgets/main/main_view.dart | 2 +- lib/widgets/profile/profile_view.dart | 2 +- lib/widgets/scrobble/music_recognition_component.dart | 2 +- lib/widgets/settings/spotify_settings_view.dart | 2 +- 10 files changed, 12 insertions(+), 12 deletions(-) rename lib/util/{ => external_actions}/external_actions.dart (97%) rename lib/util/{ => external_actions}/notifications.dart (96%) rename lib/util/{ => external_actions}/quick_actions_manager.dart (95%) rename lib/util/{ => external_actions}/time_safe_stream.dart (100%) diff --git a/lib/main.dart b/lib/main.dart index d55e260..f7f10aa 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -1,12 +1,12 @@ import 'package:finale/util/background_tasks/background_task_manager.dart' as background_task_manager; import 'package:finale/util/constants.dart'; +import 'package:finale/util/external_actions/notifications.dart' as notifications; +import 'package:finale/util/external_actions/quick_actions_manager.dart' + as quick_actions_manager; import 'package:finale/util/image_id_cache.dart'; -import 'package:finale/util/notifications.dart' as notifications; import 'package:finale/util/preference.dart'; import 'package:finale/util/preferences.dart'; -import 'package:finale/util/quick_actions_manager.dart' - as quick_actions_manager; import 'package:finale/util/theme.dart'; import 'package:finale/widgets/entity/lastfm/profile_stack.dart'; import 'package:finale/widgets/main/login_view.dart'; diff --git a/lib/util/background_tasks/spotify_checker.dart b/lib/util/background_tasks/spotify_checker.dart index b2ae12f..fc7f2c1 100644 --- a/lib/util/background_tasks/spotify_checker.dart +++ b/lib/util/background_tasks/spotify_checker.dart @@ -1,7 +1,7 @@ import 'package:collection/collection.dart'; import 'package:finale/services/lastfm/lastfm.dart'; import 'package:finale/services/spotify/spotify.dart'; -import 'package:finale/util/notifications.dart'; +import 'package:finale/util/external_actions/notifications.dart'; import 'package:finale/util/preferences.dart'; import 'background_task.dart'; diff --git a/lib/util/external_actions.dart b/lib/util/external_actions/external_actions.dart similarity index 97% rename from lib/util/external_actions.dart rename to lib/util/external_actions/external_actions.dart index cf477cd..a3dc233 100644 --- a/lib/util/external_actions.dart +++ b/lib/util/external_actions/external_actions.dart @@ -1,8 +1,8 @@ import 'package:finale/services/generic.dart'; +import 'package:finale/util/profile_tab.dart'; import 'package:flutter/foundation.dart'; import 'package:rxdart/rxdart.dart'; -import 'profile_tab.dart'; import 'time_safe_stream.dart'; /// An action taken outside of the app that causes the app to open. diff --git a/lib/util/notifications.dart b/lib/util/external_actions/notifications.dart similarity index 96% rename from lib/util/notifications.dart rename to lib/util/external_actions/notifications.dart index a8aa4da..f37b0c3 100644 --- a/lib/util/notifications.dart +++ b/lib/util/external_actions/notifications.dart @@ -1,4 +1,4 @@ -import 'package:finale/util/external_actions.dart'; +import 'package:finale/util/external_actions/external_actions.dart'; import 'package:flutter_local_notifications/flutter_local_notifications.dart'; import 'package:universal_io/io.dart'; diff --git a/lib/util/quick_actions_manager.dart b/lib/util/external_actions/quick_actions_manager.dart similarity index 95% rename from lib/util/quick_actions_manager.dart rename to lib/util/external_actions/quick_actions_manager.dart index a85ed19..7d53819 100644 --- a/lib/util/quick_actions_manager.dart +++ b/lib/util/external_actions/quick_actions_manager.dart @@ -2,11 +2,11 @@ /// [ExternalAction]s. import 'package:finale/services/generic.dart'; -import 'package:finale/util/external_actions.dart'; +import 'package:finale/util/external_actions/external_actions.dart'; +import 'package:finale/util/profile_tab.dart'; import 'package:quick_actions/quick_actions.dart'; import 'package:uni_links/uni_links.dart'; -import 'profile_tab.dart'; import 'time_safe_stream.dart'; Future setup() async { diff --git a/lib/util/time_safe_stream.dart b/lib/util/external_actions/time_safe_stream.dart similarity index 100% rename from lib/util/time_safe_stream.dart rename to lib/util/external_actions/time_safe_stream.dart diff --git a/lib/widgets/main/main_view.dart b/lib/widgets/main/main_view.dart index e0ddbfa..7114cf3 100644 --- a/lib/widgets/main/main_view.dart +++ b/lib/widgets/main/main_view.dart @@ -2,7 +2,7 @@ import 'dart:async'; import 'package:finale/services/generic.dart'; import 'package:finale/util/constants.dart'; -import 'package:finale/util/external_actions.dart'; +import 'package:finale/util/external_actions/external_actions.dart'; import 'package:finale/widgets/entity/lastfm/album_view.dart'; import 'package:finale/widgets/entity/lastfm/artist_view.dart'; import 'package:finale/widgets/entity/lastfm/track_view.dart'; diff --git a/lib/widgets/profile/profile_view.dart b/lib/widgets/profile/profile_view.dart index 1c6241f..77b25cf 100644 --- a/lib/widgets/profile/profile_view.dart +++ b/lib/widgets/profile/profile_view.dart @@ -6,7 +6,7 @@ import 'package:finale/services/lastfm/lastfm.dart'; import 'package:finale/services/lastfm/track.dart'; import 'package:finale/services/lastfm/user.dart'; import 'package:finale/util/constants.dart'; -import 'package:finale/util/external_actions.dart'; +import 'package:finale/util/external_actions/external_actions.dart'; import 'package:finale/util/preferences.dart'; import 'package:finale/util/profile_tab.dart'; import 'package:finale/widgets/base/app_bar.dart'; diff --git a/lib/widgets/scrobble/music_recognition_component.dart b/lib/widgets/scrobble/music_recognition_component.dart index 16d7a4c..f859b06 100644 --- a/lib/widgets/scrobble/music_recognition_component.dart +++ b/lib/widgets/scrobble/music_recognition_component.dart @@ -2,7 +2,7 @@ import 'dart:async'; import 'package:finale/env.dart'; import 'package:finale/util/constants.dart'; -import 'package:finale/util/external_actions.dart'; +import 'package:finale/util/external_actions/external_actions.dart'; import 'package:finale/widgets/base/titled_box.dart'; import 'package:finale/widgets/scrobble/acrcloud_dialog.dart'; import 'package:finale/widgets/scrobble/listen_continuously_view.dart'; diff --git a/lib/widgets/settings/spotify_settings_view.dart b/lib/widgets/settings/spotify_settings_view.dart index d7c8949..45afb8a 100644 --- a/lib/widgets/settings/spotify_settings_view.dart +++ b/lib/widgets/settings/spotify_settings_view.dart @@ -3,7 +3,7 @@ import 'dart:async'; import 'package:finale/services/lastfm/lastfm.dart'; import 'package:finale/services/spotify/spotify.dart'; import 'package:finale/util/constants.dart'; -import 'package:finale/util/notifications.dart' as notifications; +import 'package:finale/util/external_actions/notifications.dart' as notifications; import 'package:finale/util/preferences.dart'; import 'package:finale/util/social_media_icons_icons.dart'; import 'package:finale/widgets/base/app_bar.dart';