From 3239ba3644f990583eff07fc3d56b0601757baed Mon Sep 17 00:00:00 2001 From: Neeraj Gupta <254676+ua741@users.noreply.github.com> Date: Sat, 30 Oct 2021 11:21:23 +0530 Subject: [PATCH] Resolve existing package import issues --- lib/events/trigger_logout_event.dart | 2 +- lib/events/user_logged_out_event.dart | 2 +- lib/main.dart | 3 +-- lib/ui/archive_page.dart | 5 ++--- lib/ui/collection_page.dart | 5 ++--- lib/ui/payment/payment_web_page.dart | 5 ++--- lib/ui/payment/skip_subscription_widget.dart | 3 +-- lib/ui/payment/stripe_subscription_page.dart | 7 ++----- lib/ui/payment/subscription_common_widgets.dart | 3 +-- lib/ui/trash_page.dart | 5 ++--- lib/utils/delete_file_util.dart | 3 +-- lib/utils/file_download_util.dart | 3 +-- lib/utils/file_uploader_util.dart | 3 +-- lib/utils/thumbnail_util.dart | 3 +-- 14 files changed, 19 insertions(+), 33 deletions(-) diff --git a/lib/events/trigger_logout_event.dart b/lib/events/trigger_logout_event.dart index 48b068ffc..77672c55b 100644 --- a/lib/events/trigger_logout_event.dart +++ b/lib/events/trigger_logout_event.dart @@ -1,3 +1,3 @@ -import 'event.dart'; +import 'package:photos/events/event.dart'; class TriggerLogoutEvent extends Event {} diff --git a/lib/events/user_logged_out_event.dart b/lib/events/user_logged_out_event.dart index 7b3a9d338..aed28acde 100644 --- a/lib/events/user_logged_out_event.dart +++ b/lib/events/user_logged_out_event.dart @@ -1,3 +1,3 @@ -import 'event.dart'; +import 'package:photos/events/event.dart'; class UserLoggedOutEvent extends Event {} diff --git a/lib/main.dart b/lib/main.dart index 47ca6e910..66a208465 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -14,6 +14,7 @@ import 'package:photos/core/configuration.dart'; import 'package:photos/core/constants.dart'; import 'package:photos/core/network.dart'; import 'package:photos/db/upload_locks_db.dart'; +import 'package:photos/l10n/l10n.dart'; import 'package:photos/services/billing_service.dart'; import 'package:photos/services/collections_service.dart'; import 'package:photos/services/feature_flag_service.dart'; @@ -33,8 +34,6 @@ import 'package:photos/utils/local_settings.dart'; import 'package:shared_preferences/shared_preferences.dart'; import 'package:super_logging/super_logging.dart'; -import 'l10n/l10n.dart'; - final _logger = Logger("main"); Completer _initializationStatus; diff --git a/lib/ui/archive_page.dart b/lib/ui/archive_page.dart index 153a1493e..ac7f91628 100644 --- a/lib/ui/archive_page.dart +++ b/lib/ui/archive_page.dart @@ -6,9 +6,8 @@ import 'package:photos/db/files_db.dart'; import 'package:photos/events/files_updated_event.dart'; import 'package:photos/models/magic_metadata.dart'; import 'package:photos/models/selected_files.dart'; - -import 'gallery.dart'; -import 'gallery_app_bar_widget.dart'; +import 'package:photos/ui/gallery.dart'; +import 'package:photos/ui/gallery_app_bar_widget.dart'; class ArchivePage extends StatelessWidget { final String tagPrefix; diff --git a/lib/ui/collection_page.dart b/lib/ui/collection_page.dart index 9fe908833..e11d04bee 100644 --- a/lib/ui/collection_page.dart +++ b/lib/ui/collection_page.dart @@ -6,9 +6,8 @@ import 'package:photos/events/collection_updated_event.dart'; import 'package:photos/events/files_updated_event.dart'; import 'package:photos/models/collection_items.dart'; import 'package:photos/models/selected_files.dart'; - -import 'gallery.dart'; -import 'gallery_app_bar_widget.dart'; +import 'package:photos/ui/gallery.dart'; +import 'package:photos/ui/gallery_app_bar_widget.dart'; class CollectionPage extends StatelessWidget { final CollectionWithThumbnail c; diff --git a/lib/ui/payment/payment_web_page.dart b/lib/ui/payment/payment_web_page.dart index 30339212f..91357c62d 100644 --- a/lib/ui/payment/payment_web_page.dart +++ b/lib/ui/payment/payment_web_page.dart @@ -8,11 +8,10 @@ import 'package:logging/logging.dart'; import 'package:photos/models/subscription.dart'; import 'package:photos/services/billing_service.dart'; import 'package:photos/services/user_service.dart'; +import 'package:photos/ui/loading_widget.dart'; +import 'package:photos/ui/progress_dialog.dart'; import 'package:photos/utils/dialog_util.dart'; -import '../loading_widget.dart'; -import '../progress_dialog.dart'; - class PaymentWebPage extends StatefulWidget { final String planId; final String actionType; diff --git a/lib/ui/payment/skip_subscription_widget.dart b/lib/ui/payment/skip_subscription_widget.dart index b1d779661..7eb2bd390 100644 --- a/lib/ui/payment/skip_subscription_widget.dart +++ b/lib/ui/payment/skip_subscription_widget.dart @@ -4,10 +4,9 @@ import 'package:photos/events/subscription_purchased_event.dart'; import 'package:photos/models/billing_plan.dart'; import 'package:photos/models/subscription.dart'; import 'package:photos/services/billing_service.dart'; +import 'package:photos/ui/common_elements.dart'; import 'package:photos/utils/toast_util.dart'; -import '../common_elements.dart'; - class SkipSubscriptionWidget extends StatelessWidget { const SkipSubscriptionWidget({ Key key, diff --git a/lib/ui/payment/stripe_subscription_page.dart b/lib/ui/payment/stripe_subscription_page.dart index 433146ebb..96a46c12f 100644 --- a/lib/ui/payment/stripe_subscription_page.dart +++ b/lib/ui/payment/stripe_subscription_page.dart @@ -14,12 +14,11 @@ import 'package:photos/ui/payment/skip_subscription_widget.dart'; import 'package:photos/ui/payment/subscription_common_widgets.dart'; import 'package:photos/ui/payment/subscription_plan_widget.dart'; import 'package:photos/ui/progress_dialog.dart'; +import 'package:photos/ui/web_page.dart'; import 'package:photos/utils/dialog_util.dart'; import 'package:photos/utils/toast_util.dart'; import 'package:url_launcher/url_launcher.dart'; -import '../web_page.dart'; - class StripeSubscriptionPage extends StatefulWidget { final bool isOnboarding; @@ -191,9 +190,7 @@ class _StripeSubscriptionPageState extends State { ? "visit ${_currentSubscription.paymentProvider} to manage your subscription" : "payment details", style: TextStyle( - color: _isStripeSubscriber - ? Colors.blue - : Colors.white, + color: _isStripeSubscriber ? Colors.blue : Colors.white, fontFamily: 'Ubuntu', fontSize: 15, ), diff --git a/lib/ui/payment/subscription_common_widgets.dart b/lib/ui/payment/subscription_common_widgets.dart index f793557eb..301867c4e 100644 --- a/lib/ui/payment/subscription_common_widgets.dart +++ b/lib/ui/payment/subscription_common_widgets.dart @@ -1,12 +1,11 @@ import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; import 'package:photos/models/subscription.dart'; +import 'package:photos/ui/billing_questions_widget.dart'; import 'package:photos/ui/loading_widget.dart'; import 'package:photos/utils/data_util.dart'; import 'package:photos/utils/date_time_util.dart'; -import '../billing_questions_widget.dart'; - class SubscriptionHeaderWidget extends StatefulWidget { final bool isOnboarding; final Future usageFuture; diff --git a/lib/ui/trash_page.dart b/lib/ui/trash_page.dart index 8fb97baf9..90387c82c 100644 --- a/lib/ui/trash_page.dart +++ b/lib/ui/trash_page.dart @@ -6,9 +6,8 @@ import 'package:photos/events/files_updated_event.dart'; import 'package:photos/events/force_reload_trash_page_event.dart'; import 'package:photos/models/selected_files.dart'; import 'package:photos/models/trash_file.dart'; - -import 'gallery.dart'; -import 'gallery_app_bar_widget.dart'; +import 'package:photos/ui/gallery.dart'; +import 'package:photos/ui/gallery_app_bar_widget.dart'; class TrashPage extends StatelessWidget { final String tagPrefix; diff --git a/lib/utils/delete_file_util.dart b/lib/utils/delete_file_util.dart index 3680ec7ca..7909e057a 100644 --- a/lib/utils/delete_file_util.dart +++ b/lib/utils/delete_file_util.dart @@ -23,10 +23,9 @@ import 'package:photos/services/trash_sync_service.dart'; import 'package:photos/ui/common/dialogs.dart'; import 'package:photos/ui/linear_progress_dialog.dart'; import 'package:photos/utils/dialog_util.dart'; +import 'package:photos/utils/file_util.dart'; import 'package:photos/utils/toast_util.dart'; -import 'file_util.dart'; - final _logger = Logger("DeleteFileUtil"); Future deleteFilesFromEverywhere( diff --git a/lib/utils/file_download_util.dart b/lib/utils/file_download_util.dart index 7ced46f2d..9f5782f3f 100644 --- a/lib/utils/file_download_util.dart +++ b/lib/utils/file_download_util.dart @@ -8,8 +8,7 @@ import 'package:photos/core/configuration.dart'; import 'package:photos/core/network.dart'; import 'package:photos/models/file.dart' as ente; import 'package:photos/services/collections_service.dart'; - -import 'crypto_util.dart'; +import 'package:photos/utils/crypto_util.dart'; final _logger = Logger("file_download_util"); diff --git a/lib/utils/file_uploader_util.dart b/lib/utils/file_uploader_util.dart index 8a5ed73da..c573de311 100644 --- a/lib/utils/file_uploader_util.dart +++ b/lib/utils/file_uploader_util.dart @@ -14,10 +14,9 @@ import 'package:photos/core/errors.dart'; import 'package:photos/models/file.dart' as ente; import 'package:photos/models/file_type.dart'; import 'package:photos/models/location.dart'; +import 'package:photos/utils/file_util.dart'; import 'package:video_thumbnail/video_thumbnail.dart'; -import 'file_util.dart'; - final _logger = Logger("FileUtil"); const kMaximumThumbnailCompressionAttempts = 2; diff --git a/lib/utils/thumbnail_util.dart b/lib/utils/thumbnail_util.dart index 344cea126..a82ac3247 100644 --- a/lib/utils/thumbnail_util.dart +++ b/lib/utils/thumbnail_util.dart @@ -14,10 +14,9 @@ import 'package:photos/core/network.dart'; import 'package:photos/models/file.dart'; import 'package:photos/utils/crypto_util.dart'; import 'package:photos/utils/file_download_util.dart'; +import 'package:photos/utils/file_uploader_util.dart'; import 'package:photos/utils/file_util.dart'; -import 'file_uploader_util.dart'; - final _logger = Logger("ThumbnailUtil"); final _map = {}; final _queue = Queue();