Add lint rules for relative imports and order.

Yubico · Nov 27, 2023 · 4080988 · 4080988
1 parent d5bd6e4
commit 4080988
Show file tree

Hide file tree

Showing 72 changed files with 150 additions and 133 deletions.
diff --git a/analysis_options.yaml b/analysis_options.yaml
@@ -26,6 +26,9 @@ linter:
     prefer_single_quotes: true  # Uncomment to enable the `prefer_single_quotes` rule
     unawaited_futures: true  # Explicitly mark futures which are not being awaited
     use_super_parameters: true
+    prefer_relative_imports: true
+    avoid_relative_lib_imports: true
+    directives_ordering: true
 
 # Additional information about this file can be found at
 # https://dart.dev/guides/language/analysis-options

diff --git a/integration_test/management_test.dart b/integration_test/management_test.dart
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
 import 'package:integration_test/integration_test.dart';
 import 'package:yubico_authenticator/app/views/keys.dart' as app_keys;
 import 'package:yubico_authenticator/management/views/keys.dart'

diff --git a/integration_test/utils/android/test_driver.dart b/integration_test/utils/android/test_driver.dart
@@ -14,14 +14,26 @@
  * limitations under the License.
  */
 
-import 'dart:io';
 import 'dart:async';
+import 'dart:io';
 
 import 'package:integration_test/integration_test_driver_extended.dart';
 
 Future<void> main() async {
-  await Process.run('adb' , ['shell' ,'pm', 'grant', 'com.yubico.yubioath', 'android.permission.CAMERA']);
-  await Process.run('adb' , ['shell' ,'pm', 'grant', 'com.yubico.yubioath', 'android.permission.WRITE_EXTERNAL_STORAGE']);
+  await Process.run('adb', [
+    'shell',
+    'pm',
+    'grant',
+    'com.yubico.yubioath',
+    'android.permission.CAMERA'
+  ]);
+  await Process.run('adb', [
+    'shell',
+    'pm',
+    'grant',
+    'com.yubico.yubioath',
+    'android.permission.WRITE_EXTERNAL_STORAGE'
+  ]);
 
   await integrationDriver();
-}
+}
diff --git a/integration_test/utils/oath_test_util.dart b/integration_test/utils/oath_test_util.dart
@@ -16,14 +16,14 @@
 
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
-import 'package:yubico_authenticator/core/state.dart';
 import 'package:yubico_authenticator/app/views/keys.dart' as app_keys;
+import 'package:yubico_authenticator/core/state.dart';
 import 'package:yubico_authenticator/oath/keys.dart' as keys;
 import 'package:yubico_authenticator/oath/views/account_list.dart';
 import 'package:yubico_authenticator/oath/views/account_view.dart';
 
-import 'android/util.dart';
 import '../utils/test_util.dart';
+import 'android/util.dart';
 
 class Account {
   final String? issuer;

diff --git a/lib/android/app_methods.dart b/lib/android/app_methods.dart
@@ -18,7 +18,7 @@ import 'dart:convert';
 
 import 'package:flutter/services.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:yubico_authenticator/android/state.dart';
+import 'state.dart';
 
 const appMethodsChannel = MethodChannel('app.methods');
 

diff --git a/lib/android/init.dart b/lib/android/init.dart
@@ -23,24 +23,24 @@ import 'package:flutter/services.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:logging/logging.dart';
 import 'package:shared_preferences/shared_preferences.dart';
-import 'package:yubico_authenticator/android/logger.dart';
-import 'package:yubico_authenticator/android/oath/otp_auth_link_handler.dart';
-import 'package:yubico_authenticator/android/window_state_provider.dart';
-import 'package:yubico_authenticator/app/logging.dart';
 
 import '../app/app.dart';
+import '../app/logging.dart';
 import '../app/models.dart';
 import '../app/state.dart';
 import '../app/views/main_page.dart';
 import '../core/state.dart';
 import '../management/state.dart';
 import '../oath/state.dart';
 import 'app_methods.dart';
+import 'logger.dart';
 import 'management/state.dart';
+import 'oath/otp_auth_link_handler.dart';
 import 'oath/state.dart';
 import 'qr_scanner/qr_scanner_provider.dart';
 import 'state.dart';
 import 'tap_request_dialog.dart';
+import 'window_state_provider.dart';
 
 Future<Widget> initialize() async {
   _initSystemUi();

diff --git a/lib/android/logger.dart b/lib/android/logger.dart
@@ -16,7 +16,7 @@
 
 import 'package:flutter/services.dart';
 import 'package:logging/logging.dart';
-import 'package:yubico_authenticator/app/logging.dart';
+import '../app/logging.dart';
 
 final _log = Logger('android.logger');
 

diff --git a/lib/android/management/state.dart b/lib/android/management/state.dart
@@ -17,10 +17,10 @@
 import 'dart:async';
 
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:yubico_authenticator/management/models.dart';
 
 import '../../app/models.dart';
 import '../../app/state.dart';
+import '../../management/models.dart';
 import '../../management/state.dart';
 
 final androidManagementState = AsyncNotifierProvider.autoDispose

diff --git a/lib/android/oath/state.dart b/lib/android/oath/state.dart
@@ -19,16 +19,16 @@ import 'dart:convert';
 
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
-import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:logging/logging.dart';
-import 'package:yubico_authenticator/exception/cancellation_exception.dart';
 
 import '../../app/logging.dart';
 import '../../app/models.dart';
 import '../../app/state.dart';
 import '../../app/views/user_interaction.dart';
 import '../../core/models.dart';
+import '../../exception/cancellation_exception.dart';
 import '../../exception/platform_exception_decoder.dart';
 import '../../oath/models.dart';
 import '../../oath/state.dart';

diff --git a/lib/android/qr_scanner/qr_scanner_permissions_view.dart b/lib/android/qr_scanner/qr_scanner_permissions_view.dart
@@ -16,8 +16,8 @@
 
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
-import 'package:yubico_authenticator/android/qr_scanner/qr_scanner_provider.dart';
 
+import 'qr_scanner_provider.dart';
 import 'qr_scanner_scan_status.dart';
 import 'qr_scanner_widgets.dart';
 

diff --git a/lib/android/qr_scanner/qr_scanner_provider.dart b/lib/android/qr_scanner/qr_scanner_provider.dart
@@ -20,14 +20,14 @@ import 'package:file_picker/file_picker.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:qrscanner_zxing/qrscanner_zxing_method_channel.dart';
-import 'package:yubico_authenticator/android/app_methods.dart';
-import 'package:yubico_authenticator/app/state.dart';
-import 'package:yubico_authenticator/exception/cancellation_exception.dart';
-import 'package:yubico_authenticator/theme.dart';
 
 import '../../app/message.dart';
+import '../../app/state.dart';
+import '../../exception/cancellation_exception.dart';
 import '../../oath/views/add_account_page.dart';
 import '../../oath/views/utils.dart';
+import '../../theme.dart';
+import '../app_methods.dart';
 import 'qr_scanner_view.dart';
 
 class AndroidQrScanner implements QrScanner {

diff --git a/lib/android/qr_scanner/qr_scanner_view.dart b/lib/android/qr_scanner/qr_scanner_view.dart
@@ -17,9 +17,9 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:qrscanner_zxing/qrscanner_zxing_view.dart';
-import 'package:yubico_authenticator/android/app_methods.dart';
 
 import '../../oath/models.dart';
+import '../app_methods.dart';
 import 'qr_scanner_overlay_view.dart';
 import 'qr_scanner_permissions_view.dart';
 import 'qr_scanner_scan_status.dart';

diff --git a/lib/android/views/settings_views.dart b/lib/android/views/settings_views.dart
@@ -18,9 +18,9 @@ import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 
-import '../state.dart';
-import '../models.dart';
 import '../keys.dart' as keys;
+import '../models.dart';
+import '../state.dart';
 
 class NfcTapActionView extends ConsumerWidget {
   const NfcTapActionView({super.key});

diff --git a/lib/android/window_state_provider.dart b/lib/android/window_state_provider.dart
@@ -17,11 +17,11 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:logging/logging.dart';
-import 'package:yubico_authenticator/android/state.dart';
-import 'package:yubico_authenticator/app/logging.dart';
 
+import '../app/logging.dart';
 import '../app/models.dart';
 import 'app_methods.dart';
+import 'state.dart';
 
 final _log = Logger('android.window_state_provider');
 
@@ -35,8 +35,8 @@ final androidWindowStateProvider = Provider<WindowState>(
 
 class _WindowStateNotifier extends StateNotifier<WindowState>
     with WidgetsBindingObserver {
-    final StateNotifierProviderRef<_WindowStateNotifier, WindowState> _ref;
-    _WindowStateNotifier(this._ref)
+  final StateNotifierProviderRef<_WindowStateNotifier, WindowState> _ref;
+  _WindowStateNotifier(this._ref)
       : super(WindowState(focused: true, visible: true, active: true)) {
     _init();
   }

diff --git a/lib/app/logging.dart b/lib/app/logging.dart
@@ -20,8 +20,8 @@ import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:logging/logging.dart';
 
-import '../core/state.dart';
 import '../android/state.dart';
+import '../core/state.dart';
 
 String _pad(int value, int zeroes) => value.toString().padLeft(zeroes, '0');
 

diff --git a/lib/app/models.dart b/lib/app/models.dart
@@ -16,8 +16,8 @@
 
 import 'package:collection/collection.dart';
 import 'package:flutter/material.dart';
-import 'package:freezed_annotation/freezed_annotation.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+import 'package:freezed_annotation/freezed_annotation.dart';
 
 import '../../management/models.dart';
 import '../core/models.dart';

diff --git a/lib/app/state.dart b/lib/app/state.dart
@@ -19,15 +19,15 @@ import 'dart:io';
 import 'dart:ui';
 
 import 'package:flutter/material.dart';
+import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:logging/logging.dart';
 import 'package:shared_preferences/shared_preferences.dart';
-import 'package:flutter_gen/gen_l10n/app_localizations.dart';
-import 'package:yubico_authenticator/app/logging.dart';
 
 import '../core/state.dart';
-import 'models.dart';
 import 'features.dart' as features;
+import 'logging.dart';
+import 'models.dart';
 
 final _log = Logger('app.state');
 

diff --git a/lib/app/views/app_page.dart b/lib/app/views/app_page.dart
@@ -16,8 +16,8 @@
 
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
-import 'package:yubico_authenticator/core/state.dart';
 
+import '../../core/state.dart';
 import '../../widgets/delayed_visibility.dart';
 import '../message.dart';
 import 'keys.dart';

diff --git a/lib/app/views/device_error_screen.dart b/lib/app/views/device_error_screen.dart
@@ -17,8 +17,8 @@
 import 'dart:io';
 
 import 'package:flutter/material.dart';
-import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
 
 import '../../core/models.dart';
 import '../../desktop/state.dart';

diff --git a/lib/app/views/device_picker.dart b/lib/app/views/device_picker.dart
@@ -15,9 +15,9 @@
  */
 
 import 'package:flutter/material.dart';
+import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:shared_preferences/shared_preferences.dart';
-import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 
 import '../../android/state.dart';
 import '../../core/state.dart';
@@ -151,8 +151,7 @@ class DevicePickerContent extends ConsumerWidget {
           selected: currentNode == null,
           extended: extended,
         ),
-      if (androidNoKeyWidget != null)
-        androidNoKeyWidget,
+      if (androidNoKeyWidget != null) androidNoKeyWidget,
       ...devices.map(
         (e) => e.path == currentNode?.path
             ? _buildCurrentDeviceRow(

diff --git a/lib/app/views/navigation.dart b/lib/app/views/navigation.dart
@@ -15,8 +15,8 @@
  */
 
 import 'package:flutter/material.dart';
-import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
 
 import '../../management/views/management_screen.dart';
 import '../message.dart';

diff --git a/lib/desktop/devices.dart b/lib/desktop/devices.dart
@@ -19,8 +19,8 @@ import 'dart:convert';
 
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:logging/logging.dart';
-import 'package:yubico_authenticator/app/logging.dart';
 
+import '../app/logging.dart';
 import '../app/models.dart';
 import '../app/state.dart';
 import '../core/models.dart';

diff --git a/lib/desktop/fido/state.dart b/lib/desktop/fido/state.dart
@@ -20,8 +20,8 @@ import 'dart:io';
 
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:logging/logging.dart';
-import 'package:yubico_authenticator/app/logging.dart';
 
+import '../../app/logging.dart';
 import '../../app/models.dart';
 import '../../app/state.dart';
 import '../../fido/models.dart';

diff --git a/lib/desktop/management/state.dart b/lib/desktop/management/state.dart
@@ -18,12 +18,12 @@ import 'dart:async';
 
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:logging/logging.dart';
-import 'package:yubico_authenticator/app/logging.dart';
-import 'package:yubico_authenticator/management/models.dart';
 
+import '../../app/logging.dart';
 import '../../app/models.dart';
 import '../../app/state.dart';
 import '../../core/models.dart';
+import '../../management/models.dart';
 import '../../management/state.dart';
 import '../rpc.dart';
 import '../state.dart';

diff --git a/lib/desktop/oath/state.dart b/lib/desktop/oath/state.dart
@@ -19,8 +19,8 @@ import 'dart:convert';
 import 'dart:math';
 
 import 'package:flutter/material.dart';
-import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:logging/logging.dart';
 
 import '../../app/logging.dart';

diff --git a/lib/desktop/piv/state.dart b/lib/desktop/piv/state.dart
@@ -18,8 +18,8 @@ import 'dart:async';
 import 'dart:convert';
 
 import 'package:flutter/material.dart';
-import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:logging/logging.dart';
 
 import '../../app/logging.dart';

diff --git a/lib/desktop/qr_scanner.dart b/lib/desktop/qr_scanner.dart
@@ -15,10 +15,10 @@
  */
 
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:yubico_authenticator/app/state.dart';
-import 'package:yubico_authenticator/desktop/state.dart';
 
+import '../app/state.dart';
 import 'rpc.dart';
+import 'state.dart';
 
 class RpcQrScanner implements QrScanner {
   final RpcSession _rpc;

diff --git a/lib/desktop/rpc.dart b/lib/desktop/rpc.dart
@@ -19,10 +19,10 @@ import 'dart:convert';
 import 'dart:io';
 import 'dart:math';
 
-import 'package:logging/logging.dart';
 import 'package:async/async.dart';
-import 'package:yubico_authenticator/app/logging.dart';
+import 'package:logging/logging.dart';
 
+import '../app/logging.dart';
 import '../app/models.dart';
 import 'models.dart';