0ct0pu5/ente
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Resolve existing package import issues

Browse source
This commit is contained in:
Neeraj Gupta 2021-10-30 11:21:23 +05:30
parent aa8f4b9bde
commit 3239ba3644
No known key found for this signature in database
GPG key ID: 3C5A1684DC1729E1
14 changed files with 19 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/events/trigger_logout_event.dart
View file

@ -1,3 +1,3 @@
import 'event.dart';
import 'package:photos/events/event.dart';
class TriggerLogoutEvent extends Event {}

2
lib/events/user_logged_out_event.dart
View file

@ -1,3 +1,3 @@
import 'event.dart';
import 'package:photos/events/event.dart';
class UserLoggedOutEvent extends Event {}

3
lib/main.dart
View file

@ -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<void> _initializationStatus;

5
lib/ui/archive_page.dart
View file

@ -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;

5
lib/ui/collection_page.dart
View file

@ -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;

5
lib/ui/payment/payment_web_page.dart
View file

@ -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;

3
lib/ui/payment/skip_subscription_widget.dart
View file

@ -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,

7
lib/ui/payment/stripe_subscription_page.dart
View file

@ -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<StripeSubscriptionPage> {
? "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,
),

3
lib/ui/payment/subscription_common_widgets.dart
View file

@ -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<int> usageFuture;

5
lib/ui/trash_page.dart
View file

@ -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;

3
lib/utils/delete_file_util.dart
View file

@ -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<void> deleteFilesFromEverywhere(

3
lib/utils/file_download_util.dart
View file

@ -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");

3
lib/utils/file_uploader_util.dart
View file

@ -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;

3
lib/utils/thumbnail_util.dart
View file

@ -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 = <int, FileDownloadItem>{};
final _queue = Queue<int>();