lint: enable directives_ordering for imports

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

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();

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

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

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

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 {

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

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

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

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

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

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

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

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

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;

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

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

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

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

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

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