From aa8f4b9bde4c4212aa3546f77fd2f1d8efb0e34b Mon Sep 17 00:00:00 2001 From: Neeraj Gupta <254676+ua741@users.noreply.github.com> Date: Sat, 30 Oct 2021 11:13:56 +0530 Subject: [PATCH] lint: enable directives_ordering for imports --- analysis_options.yaml | 2 ++ lib/services/user_service.dart | 32 ++++++++----------- lib/ui/editor/filtered_image.dart | 1 + lib/ui/email_entry_page.dart | 2 +- lib/ui/expansion_card.dart | 2 +- lib/ui/fading_bottom_bar.dart | 2 +- lib/ui/gallery_app_bar_widget.dart | 2 +- lib/ui/image_editor_page.dart | 6 ++-- lib/ui/landing_page_widget.dart | 2 +- lib/ui/location_search_results_page.dart | 2 +- lib/ui/login_page.dart | 2 +- lib/ui/nav_bar.dart | 1 + lib/ui/password_reentry_page.dart | 2 +- .../payment/subscription_common_widgets.dart | 2 +- lib/ui/share_collection_widget.dart | 2 +- lib/ui/thumbnail_widget.dart | 2 +- lib/ui/video_widget.dart | 1 + lib/ui/zoomable_live_image.dart | 1 + lib/utils/exif_util.dart | 2 +- lib/utils/file_uploader.dart | 5 +-- lib/utils/share_util.dart | 13 ++++---- 21 files changed, 45 insertions(+), 41 deletions(-) diff --git a/analysis_options.yaml b/analysis_options.yaml index b3fa57955..18fa0e19e 100644 --- a/analysis_options.yaml +++ b/analysis_options.yaml @@ -25,12 +25,14 @@ linter: - sort_pub_dependencies - use_rethrow_when_possible - prefer_double_quotes + - directives_ordering analyzer: errors: avoid_empty_else: error exhaustive_cases: error curly_braces_in_flow_control_structures: error + directives_ordering: error unused_import: warning prefer_is_empty: warning use_rethrow_when_possible: info diff --git a/lib/services/user_service.dart b/lib/services/user_service.dart index f56a4ded3..ad20222c5 100644 --- a/lib/services/user_service.dart +++ b/lib/services/user_service.dart @@ -3,14 +3,15 @@ import 'dart:typed_data'; import 'package:dio/dio.dart'; import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; +import 'package:flutter_gen/gen_l10n/app_localizations.dart'; import 'package:flutter_sodium/flutter_sodium.dart'; import 'package:logging/logging.dart'; import 'package:photos/core/configuration.dart'; import 'package:photos/core/event_bus.dart'; import 'package:photos/core/network.dart'; import 'package:photos/db/public_keys_db.dart'; -import 'package:photos/events/user_details_changed_event.dart'; import 'package:photos/events/two_factor_status_change_event.dart'; +import 'package:photos/events/user_details_changed_event.dart'; import 'package:photos/models/key_attributes.dart'; import 'package:photos/models/key_gen_result.dart'; import 'package:photos/models/public_key.dart'; @@ -28,7 +29,7 @@ import 'package:photos/utils/crypto_util.dart'; import 'package:photos/utils/dialog_util.dart'; import 'package:photos/utils/navigation_util.dart'; import 'package:photos/utils/toast_util.dart'; -import 'package:flutter_gen/gen_l10n/app_localizations.dart'; + class UserService { final _dio = Network.instance.getDio(); final _logger = Logger("UserAuthenticator"); @@ -177,7 +178,7 @@ class UserService { return page; }, ), - (route) => route.isFirst, + (route) => route.isFirst, ); } else { // should never reach here @@ -198,9 +199,7 @@ class UserService { } catch (e) { await dialog.hide(); _logger.severe(e); - showErrorDialog(context, AppLocalizations - .of(context) - .oops, + showErrorDialog(context, AppLocalizations.of(context).oops, "verification failed, please try again"); } } @@ -241,8 +240,10 @@ class UserService { showErrorDialog(context, AppLocalizations.of(context).oops, AppLocalizations.of(context).email_already_claimed); } else { - showErrorDialog(context, AppLocalizations.of(context).incorrect_code_title, - AppLocalizations.of(context).incorrect_code_msg); + showErrorDialog( + context, + AppLocalizations.of(context).incorrect_code_title, + AppLocalizations.of(context).incorrect_code_msg); } } catch (e) { await dialog.hide(); @@ -370,8 +371,7 @@ class UserService { } catch (e) { await dialog.hide(); _logger.severe(e); - showErrorDialog( - context, AppLocalizations.of(context).oops, + showErrorDialog(context, AppLocalizations.of(context).oops, "authentication failed, please try again"); } } @@ -412,14 +412,12 @@ class UserService { (route) => route.isFirst, ); } else { - showErrorDialog( - context, AppLocalizations.of(context).oops, + showErrorDialog(context, AppLocalizations.of(context).oops, "something went wrong, please try again"); } } catch (e) { _logger.severe(e); - showErrorDialog( - context, AppLocalizations.of(context).oops, + showErrorDialog(context, AppLocalizations.of(context).oops, "something went wrong, please try again"); } finally { await dialog.hide(); @@ -480,14 +478,12 @@ class UserService { (route) => route.isFirst, ); } else { - showErrorDialog( - context, AppLocalizations.of(context).oops, + showErrorDialog(context, AppLocalizations.of(context).oops, "something went wrong, please try again"); } } catch (e) { _logger.severe(e); - showErrorDialog( - context, AppLocalizations.of(context).oops, + showErrorDialog(context, AppLocalizations.of(context).oops, "something went wrong, please try again"); } finally { await dialog.hide(); diff --git a/lib/ui/editor/filtered_image.dart b/lib/ui/editor/filtered_image.dart index cd1de6bf0..867e8fb21 100644 --- a/lib/ui/editor/filtered_image.dart +++ b/lib/ui/editor/filtered_image.dart @@ -1,4 +1,5 @@ import 'dart:math'; + import 'package:flutter/widgets.dart'; import 'package:image_editor/image_editor.dart'; diff --git a/lib/ui/email_entry_page.dart b/lib/ui/email_entry_page.dart index 0240bbfc9..7be31cf73 100644 --- a/lib/ui/email_entry_page.dart +++ b/lib/ui/email_entry_page.dart @@ -4,6 +4,7 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/gestures.dart'; import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; +import 'package:flutter_gen/gen_l10n/app_localizations.dart'; import 'package:flutter_password_strength/flutter_password_strength.dart'; import 'package:photos/core/configuration.dart'; import 'package:photos/models/billing_plan.dart'; @@ -15,7 +16,6 @@ import 'package:photos/ui/web_page.dart'; import 'package:photos/utils/data_util.dart'; import 'package:photos/utils/dialog_util.dart'; import 'package:photos/utils/email_util.dart'; -import 'package:flutter_gen/gen_l10n/app_localizations.dart'; class EmailEntryPage extends StatefulWidget { EmailEntryPage({Key key}) : super(key: key); diff --git a/lib/ui/expansion_card.dart b/lib/ui/expansion_card.dart index e9927ee15..01e149343 100644 --- a/lib/ui/expansion_card.dart +++ b/lib/ui/expansion_card.dart @@ -1,5 +1,5 @@ -import 'package:flutter/widgets.dart'; import 'package:flutter/material.dart'; +import 'package:flutter/widgets.dart'; const Duration _kExpand = Duration(milliseconds: 200); diff --git a/lib/ui/fading_bottom_bar.dart b/lib/ui/fading_bottom_bar.dart index f89fbb6f5..1f3a92d8d 100644 --- a/lib/ui/fading_bottom_bar.dart +++ b/lib/ui/fading_bottom_bar.dart @@ -11,8 +11,8 @@ import 'package:photos/models/selected_files.dart'; import 'package:photos/models/trash_file.dart'; import 'package:photos/ui/create_collection_page.dart'; import 'package:photos/ui/file_info_dialog.dart'; -import 'package:photos/utils/magic_util.dart'; import 'package:photos/utils/delete_file_util.dart'; +import 'package:photos/utils/magic_util.dart'; import 'package:photos/utils/share_util.dart'; class FadingBottomBar extends StatefulWidget { diff --git a/lib/ui/gallery_app_bar_widget.dart b/lib/ui/gallery_app_bar_widget.dart index f3eb61b63..22999d421 100644 --- a/lib/ui/gallery_app_bar_widget.dart +++ b/lib/ui/gallery_app_bar_widget.dart @@ -15,9 +15,9 @@ import 'package:photos/services/collections_service.dart'; import 'package:photos/ui/change_collection_name_dialog.dart'; import 'package:photos/ui/create_collection_page.dart'; import 'package:photos/ui/share_collection_widget.dart'; -import 'package:photos/utils/magic_util.dart'; import 'package:photos/utils/delete_file_util.dart'; import 'package:photos/utils/dialog_util.dart'; +import 'package:photos/utils/magic_util.dart'; import 'package:photos/utils/share_util.dart'; import 'package:photos/utils/toast_util.dart'; diff --git a/lib/ui/image_editor_page.dart b/lib/ui/image_editor_page.dart index 3b22c5b3c..58b37d992 100644 --- a/lib/ui/image_editor_page.dart +++ b/lib/ui/image_editor_page.dart @@ -5,10 +5,13 @@ import 'package:extended_image/extended_image.dart'; import 'package:flutter/material.dart'; import 'package:image_editor/image_editor.dart'; import 'package:logging/logging.dart'; +import 'package:path/path.dart' as path; import 'package:photo_manager/photo_manager.dart'; import 'package:photos/core/event_bus.dart'; import 'package:photos/db/files_db.dart'; import 'package:photos/events/local_photos_updated_event.dart'; +import 'package:photos/models/file.dart' as ente; +import 'package:photos/models/location.dart'; import 'package:photos/services/local_sync_service.dart'; import 'package:photos/services/sync_service.dart'; import 'package:photos/ui/detail_page.dart'; @@ -17,9 +20,6 @@ import 'package:photos/ui/loading_widget.dart'; import 'package:photos/utils/dialog_util.dart'; import 'package:photos/utils/navigation_util.dart'; import 'package:photos/utils/toast_util.dart'; -import 'package:photos/models/file.dart' as ente; -import 'package:photos/models/location.dart'; -import 'package:path/path.dart' as path; import 'package:syncfusion_flutter_core/theme.dart'; import 'package:syncfusion_flutter_sliders/sliders.dart'; diff --git a/lib/ui/landing_page_widget.dart b/lib/ui/landing_page_widget.dart index 790f2e9b9..691391dcd 100644 --- a/lib/ui/landing_page_widget.dart +++ b/lib/ui/landing_page_widget.dart @@ -1,13 +1,13 @@ import 'package:dots_indicator/dots_indicator.dart'; import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; +import 'package:flutter_gen/gen_l10n/app_localizations.dart'; import 'package:photos/core/configuration.dart'; import 'package:photos/ui/email_entry_page.dart'; import 'package:photos/ui/login_page.dart'; import 'package:photos/ui/password_entry_page.dart'; import 'package:photos/ui/password_reentry_page.dart'; import 'package:photos/ui/payment/subscription.dart'; -import 'package:flutter_gen/gen_l10n/app_localizations.dart'; class LandingPageWidget extends StatefulWidget { const LandingPageWidget({Key key}) : super(key: key); diff --git a/lib/ui/location_search_results_page.dart b/lib/ui/location_search_results_page.dart index 17dd305e7..c7c84f840 100644 --- a/lib/ui/location_search_results_page.dart +++ b/lib/ui/location_search_results_page.dart @@ -1,7 +1,7 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; -import 'package:photos/models/location.dart'; import 'package:photos/models/file.dart'; +import 'package:photos/models/location.dart'; import 'package:photos/models/selected_files.dart'; import 'package:photos/ui/gallery.dart'; diff --git a/lib/ui/login_page.dart b/lib/ui/login_page.dart index 4179a37fc..fb36611c7 100644 --- a/lib/ui/login_page.dart +++ b/lib/ui/login_page.dart @@ -2,13 +2,13 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/gestures.dart'; import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; +import 'package:flutter_gen/gen_l10n/app_localizations.dart'; import 'package:photos/core/configuration.dart'; import 'package:photos/services/user_service.dart'; import 'package:photos/ui/common_elements.dart'; import 'package:photos/ui/web_page.dart'; import 'package:photos/utils/dialog_util.dart'; import 'package:photos/utils/email_util.dart'; -import 'package:flutter_gen/gen_l10n/app_localizations.dart'; class LoginPage extends StatefulWidget { LoginPage({Key key}) : super(key: key); diff --git a/lib/ui/nav_bar.dart b/lib/ui/nav_bar.dart index a668f4f68..4c3bc85ab 100644 --- a/lib/ui/nav_bar.dart +++ b/lib/ui/nav_bar.dart @@ -2,6 +2,7 @@ library google_nav_bar; import 'dart:async'; import 'dart:math'; + import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; diff --git a/lib/ui/password_reentry_page.dart b/lib/ui/password_reentry_page.dart index 5be2122f7..8c010064b 100644 --- a/lib/ui/password_reentry_page.dart +++ b/lib/ui/password_reentry_page.dart @@ -1,5 +1,6 @@ import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; +import 'package:flutter_gen/gen_l10n/app_localizations.dart'; import 'package:logging/logging.dart'; import 'package:photos/core/configuration.dart'; import 'package:photos/core/event_bus.dart'; @@ -7,7 +8,6 @@ import 'package:photos/events/subscription_purchased_event.dart'; import 'package:photos/ui/common_elements.dart'; import 'package:photos/ui/recovery_page.dart'; import 'package:photos/utils/dialog_util.dart'; -import 'package:flutter_gen/gen_l10n/app_localizations.dart'; class PasswordReentryPage extends StatefulWidget { PasswordReentryPage({Key key}) : super(key: key); diff --git a/lib/ui/payment/subscription_common_widgets.dart b/lib/ui/payment/subscription_common_widgets.dart index acf743182..f793557eb 100644 --- a/lib/ui/payment/subscription_common_widgets.dart +++ b/lib/ui/payment/subscription_common_widgets.dart @@ -1,8 +1,8 @@ import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; import 'package:photos/models/subscription.dart'; -import 'package:photos/utils/data_util.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'; diff --git a/lib/ui/share_collection_widget.dart b/lib/ui/share_collection_widget.dart index e30bf0e7d..9733aac47 100644 --- a/lib/ui/share_collection_widget.dart +++ b/lib/ui/share_collection_widget.dart @@ -1,6 +1,7 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; +import 'package:flutter_gen/gen_l10n/app_localizations.dart'; import 'package:flutter_typeahead/flutter_typeahead.dart'; import 'package:fluttercontactpicker/fluttercontactpicker.dart'; import 'package:logging/logging.dart'; @@ -17,7 +18,6 @@ import 'package:photos/utils/dialog_util.dart'; import 'package:photos/utils/email_util.dart'; import 'package:photos/utils/share_util.dart'; import 'package:photos/utils/toast_util.dart'; -import 'package:flutter_gen/gen_l10n/app_localizations.dart'; class SharingDialog extends StatefulWidget { final Collection collection; diff --git a/lib/ui/thumbnail_widget.dart b/lib/ui/thumbnail_widget.dart index 571dbb6ae..a86c1af4b 100644 --- a/lib/ui/thumbnail_widget.dart +++ b/lib/ui/thumbnail_widget.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; -import 'package:logging/logging.dart'; import 'package:flutter/widgets.dart'; +import 'package:logging/logging.dart'; import 'package:photos/core/cache/thumbnail_cache.dart'; import 'package:photos/core/constants.dart'; import 'package:photos/core/errors.dart'; diff --git a/lib/ui/video_widget.dart b/lib/ui/video_widget.dart index 14f5636a7..e9f9696fe 100644 --- a/lib/ui/video_widget.dart +++ b/lib/ui/video_widget.dart @@ -1,4 +1,5 @@ import 'dart:io' as io; + import 'package:chewie/chewie.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; diff --git a/lib/ui/zoomable_live_image.dart b/lib/ui/zoomable_live_image.dart index 443ff00ac..14ccd5e11 100644 --- a/lib/ui/zoomable_live_image.dart +++ b/lib/ui/zoomable_live_image.dart @@ -1,4 +1,5 @@ import 'dart:io' as io; + import 'package:chewie/chewie.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; diff --git a/lib/utils/exif_util.dart b/lib/utils/exif_util.dart index 22707bb18..8199149e1 100644 --- a/lib/utils/exif_util.dart +++ b/lib/utils/exif_util.dart @@ -2,9 +2,9 @@ import 'dart:io' as io; import 'package:exif/exif.dart'; import 'package:intl/intl.dart'; +import 'package:logging/logging.dart'; import 'package:photos/models/file.dart'; import 'package:photos/utils/file_util.dart'; -import 'package:logging/logging.dart'; const kDateTimeOriginal = "EXIF DateTimeOriginal"; const kImageDateTime = "Image DateTime"; diff --git a/lib/utils/file_uploader.dart b/lib/utils/file_uploader.dart index 37a63e1cb..7dd92c49e 100644 --- a/lib/utils/file_uploader.dart +++ b/lib/utils/file_uploader.dart @@ -4,12 +4,12 @@ import 'dart:convert'; import 'dart:io' as io; import 'dart:math'; import 'dart:typed_data'; -import 'package:path/path.dart'; import 'package:connectivity/connectivity.dart'; import 'package:dio/dio.dart'; import 'package:flutter_sodium/flutter_sodium.dart'; import 'package:logging/logging.dart'; +import 'package:path/path.dart'; import 'package:photos/core/configuration.dart'; import 'package:photos/core/errors.dart'; import 'package:photos/core/event_bus.dart'; @@ -328,7 +328,8 @@ class FileUploader { final fileUploadURL = await _getUploadURL(); String fileObjectKey = await _putFile(fileUploadURL, encryptedFile); - final metadata = await file.getMetadataForUpload(mediaUploadData.sourceFile); + final metadata = + await file.getMetadataForUpload(mediaUploadData.sourceFile); final encryptedMetadataData = await CryptoUtil.encryptChaCha( utf8.encode(jsonEncode(metadata)), fileAttributes.key); final fileDecryptionHeader = Sodium.bin2base64(fileAttributes.header); diff --git a/lib/utils/share_util.dart b/lib/utils/share_util.dart index 8996c8033..16915cf21 100644 --- a/lib/utils/share_util.dart +++ b/lib/utils/share_util.dart @@ -1,17 +1,18 @@ import 'dart:async'; +import 'dart:io' as dartio; + +import 'package:flutter/widgets.dart'; import 'package:logging/logging.dart'; import 'package:path/path.dart'; -import 'dart:io' as dartio; +import 'package:photos/core/configuration.dart'; import 'package:photos/core/constants.dart'; +import 'package:photos/models/file.dart'; import 'package:photos/models/file_type.dart'; +import 'package:photos/utils/dialog_util.dart'; import 'package:photos/utils/exif_util.dart'; +import 'package:photos/utils/file_util.dart'; import 'package:receive_sharing_intent/receive_sharing_intent.dart'; import 'package:share_plus/share_plus.dart'; -import 'package:photos/core/configuration.dart'; -import 'package:flutter/widgets.dart'; -import 'package:photos/models/file.dart'; -import 'package:photos/utils/dialog_util.dart'; -import 'package:photos/utils/file_util.dart'; final _logger = Logger("ShareUtil"); // share is used to share media/files from ente to other apps