Merge PR #1278.

analysis_options.yaml

@@ -22,10 +22,10 @@ linter:
   # `// ignore_for_file: name_of_lint` syntax on the line or in the file
   # producing the lint.
   rules:
-    # avoid_print: false  # Uncomment to disable the `avoid_print` rule
-    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_single_quotes
+    - unawaited_futures  # Explicitly mark futures which are not being awaited
+    - directives_ordering  # Force ordering of imports
+    - prefer_relative_imports
 
 # Additional information about this file can be found at
 # https://dart.dev/guides/language/analysis-options

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'

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

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;

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

lib/android/init.dart

@@ -23,12 +23,9 @@ 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';
@@ -36,11 +33,14 @@ 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();

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

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

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

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

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 {

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

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

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

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

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

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

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

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

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(

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

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

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

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

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

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

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;

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

lib/desktop/systray.dart

@@ -19,11 +19,11 @@ import 'dart:io';
 
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:local_notifier/local_notifier.dart';
 import 'package:tray_manager/tray_manager.dart';
 import 'package:window_manager/window_manager.dart';
-import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 
 import '../app/models.dart';
 import '../app/shortcuts.dart';

lib/fido/views/actions.dart

@@ -19,8 +19,8 @@ import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 
 import '../../app/models.dart';
 import '../../app/shortcuts.dart';
-import '../keys.dart' as keys;
 import '../features.dart' as features;
+import '../keys.dart' as keys;
 
 List<ActionItem> buildFingerprintActions(AppLocalizations l10n) {
   return [

lib/fido/views/add_fingerprint_dialog.dart

@@ -22,8 +22,8 @@ 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:yubico_authenticator/app/logging.dart';
 
+import '../../app/logging.dart';
 import '../../app/message.dart';
 import '../../app/models.dart';
 import '../../desktop/models.dart';

lib/fido/views/credential_dialog.dart

@@ -5,8 +5,8 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
 import '../../app/message.dart';
 import '../../app/shortcuts.dart';
 import '../../app/state.dart';
-import '../../app/views/fs_dialog.dart';
 import '../../app/views/action_list.dart';
+import '../../app/views/fs_dialog.dart';
 import '../../core/state.dart';
 import '../features.dart' as features;
 import '../models.dart';

lib/fido/views/delete_credential_dialog.dart

@@ -21,11 +21,11 @@ import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 
 import '../../app/message.dart';
+import '../../app/models.dart';
+import '../../app/state.dart';
 import '../../widgets/responsive_dialog.dart';
 import '../models.dart';
 import '../state.dart';
-import '../../app/models.dart';
-import '../../app/state.dart';
 
 class DeleteCredentialDialog extends ConsumerWidget {
   final DevicePath devicePath;

lib/fido/views/delete_fingerprint_dialog.dart

@@ -19,11 +19,11 @@ import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 
 import '../../app/message.dart';
+import '../../app/models.dart';
+import '../../app/state.dart';
 import '../../widgets/responsive_dialog.dart';
 import '../models.dart';
 import '../state.dart';
-import '../../app/models.dart';
-import '../../app/state.dart';
 
 class DeleteFingerprintDialog extends ConsumerWidget {
   final DevicePath devicePath;

lib/fido/views/fingerprint_dialog.dart

@@ -5,11 +5,11 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
 import '../../app/message.dart';
 import '../../app/shortcuts.dart';
 import '../../app/state.dart';
-import '../../app/views/fs_dialog.dart';
 import '../../app/views/action_list.dart';
+import '../../app/views/fs_dialog.dart';
 import '../../core/state.dart';
-import '../models.dart';
 import '../features.dart' as features;
+import '../models.dart';
 import 'actions.dart';
 import 'delete_fingerprint_dialog.dart';
 import 'rename_fingerprint_dialog.dart';

lib/fido/views/key_actions.dart

@@ -19,11 +19,11 @@ import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 
 import '../../app/message.dart';
 import '../../app/models.dart';
-import '../../app/views/fs_dialog.dart';
 import '../../app/views/action_list.dart';
-import '../models.dart';
-import '../keys.dart' as keys;
+import '../../app/views/fs_dialog.dart';
 import '../features.dart' as features;
+import '../keys.dart' as keys;
+import '../models.dart';
 import 'add_fingerprint_dialog.dart';
 import 'pin_dialog.dart';
 import 'reset_dialog.dart';

lib/fido/views/pin_dialog.dart

@@ -24,8 +24,8 @@ import '../../app/message.dart';
 import '../../app/models.dart';
 import '../../app/state.dart';
 import '../../desktop/models.dart';
-import '../../widgets/responsive_dialog.dart';
 import '../../widgets/app_text_form_field.dart';
+import '../../widgets/responsive_dialog.dart';
 import '../models.dart';
 import '../state.dart';
 

lib/fido/views/rename_fingerprint_dialog.dart

@@ -21,8 +21,8 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
 import '../../app/message.dart';
 import '../../app/models.dart';
 import '../../desktop/models.dart';
-import '../../widgets/responsive_dialog.dart';
 import '../../widgets/app_text_form_field.dart';
+import '../../widgets/responsive_dialog.dart';
 import '../../widgets/utf8_utils.dart';
 import '../models.dart';
 import '../state.dart';

lib/fido/views/reset_dialog.dart

@@ -20,15 +20,15 @@ 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:yubico_authenticator/app/logging.dart';
 
+import '../../app/logging.dart';
 import '../../app/message.dart';
+import '../../app/models.dart';
 import '../../core/models.dart';
 import '../../desktop/models.dart';
+import '../../fido/models.dart';
 import '../../widgets/responsive_dialog.dart';
 import '../state.dart';
-import '../../fido/models.dart';
-import '../../app/models.dart';
 
 final _log = Logger('fido.views.reset_dialog');
 

lib/fido/views/unlocked_page.dart

@@ -27,9 +27,9 @@ import '../../app/views/graphics.dart';
 import '../../app/views/message_page.dart';
 import '../../core/state.dart';
 import '../../widgets/list_title.dart';
+import '../features.dart' as features;
 import '../models.dart';
 import '../state.dart';
-import '../features.dart' as features;
 import 'actions.dart';
 import 'credential_dialog.dart';
 import 'delete_credential_dialog.dart';

lib/management/state.dart

@@ -15,10 +15,10 @@
  */
 
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:yubico_authenticator/management/models.dart';
 
 import '../app/models.dart';
 import '../core/state.dart';
+import 'models.dart';
 
 final managementStateProvider = AsyncNotifierProvider.autoDispose
     .family<ManagementStateNotifier, DeviceInfo, DevicePath>(

lib/oath/icon_provider/icon_cache.dart

@@ -21,7 +21,8 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:logging/logging.dart';
 import 'package:path/path.dart';
 import 'package:path_provider/path_provider.dart';
-import 'package:yubico_authenticator/app/logging.dart';
+
+import '../../app/logging.dart';
 
 final _log = Logger('icon_cache');
 

lib/oath/icon_provider/icon_file_loader.dart

@@ -24,8 +24,8 @@ import 'package:logging/logging.dart';
 import 'package:path/path.dart';
 import 'package:vector_graphics/vector_graphics.dart';
 import 'package:vector_graphics_compiler/vector_graphics_compiler.dart';
-import 'package:yubico_authenticator/app/logging.dart';
 
+import '../../app/logging.dart';
 import 'icon_cache.dart';
 
 final _log = Logger('icon_file_loader');

lib/oath/icon_provider/icon_pack_dialog.dart

@@ -20,11 +20,12 @@ import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:url_launcher/url_launcher.dart';
-import 'package:yubico_authenticator/app/message.dart';
-import 'package:yubico_authenticator/app/state.dart';
-import 'package:yubico_authenticator/oath/icon_provider/icon_pack.dart';
-import 'package:yubico_authenticator/oath/icon_provider/icon_pack_manager.dart';
-import 'package:yubico_authenticator/widgets/responsive_dialog.dart';
+
+import '../../app/message.dart';
+import '../../app/state.dart';
+import '../../widgets/responsive_dialog.dart';
+import 'icon_pack.dart';
+import 'icon_pack_manager.dart';
 
 class IconPackDialog extends ConsumerWidget {
   const IconPackDialog({super.key});

lib/oath/icon_provider/icon_pack_manager.dart

@@ -24,8 +24,8 @@ import 'package:io/io.dart';
 import 'package:logging/logging.dart';
 import 'package:path/path.dart';
 import 'package:path_provider/path_provider.dart';
-import 'package:yubico_authenticator/app/logging.dart';
 
+import '../../app/logging.dart';
 import 'icon_cache.dart';
 import 'icon_pack.dart';
 

lib/oath/models.dart

@@ -14,11 +14,12 @@
  * limitations under the License.
  */
 
-import 'dart:typed_data';
 import 'dart:convert';
+import 'dart:typed_data';
+
 import 'package:base32/base32.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 '../core/models.dart';
 

lib/oath/views/account_dialog.dart

@@ -17,14 +17,14 @@
 import 'dart:async';
 
 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 '../../app/message.dart';
 import '../../app/shortcuts.dart';
 import '../../app/state.dart';
-import '../../app/views/fs_dialog.dart';
 import '../../app/views/action_list.dart';
+import '../../app/views/fs_dialog.dart';
 import '../../core/models.dart';
 import '../../core/state.dart';
 import '../features.dart' as features;

lib/oath/views/account_helper.dart

@@ -28,9 +28,9 @@ import '../../core/state.dart';
 import '../../widgets/circle_timer.dart';
 import '../../widgets/custom_icons.dart';
 import '../features.dart' as features;
+import '../keys.dart' as keys;
 import '../models.dart';
 import '../state.dart';
-import '../keys.dart' as keys;
 import 'actions.dart';
 
 /// Support class for presenting an OATH account.

lib/oath/views/account_icon.dart

@@ -20,10 +20,11 @@ import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:path/path.dart';
 import 'package:vector_graphics/vector_graphics.dart';
-import 'package:yubico_authenticator/oath/icon_provider/icon_file_loader.dart';
-import 'package:yubico_authenticator/oath/icon_provider/icon_pack.dart';
-import 'package:yubico_authenticator/oath/icon_provider/icon_pack_manager.dart';
-import 'package:yubico_authenticator/widgets/delayed_visibility.dart';
+
+import '../../widgets/delayed_visibility.dart';
+import '../icon_provider/icon_file_loader.dart';
+import '../icon_provider/icon_pack.dart';
+import '../icon_provider/icon_pack_manager.dart';
 
 class AccountIcon extends ConsumerWidget {
   final String? issuer;

lib/oath/views/account_view.dart

@@ -24,8 +24,8 @@ import '../../app/shortcuts.dart';
 import '../../app/state.dart';
 import '../../app/views/app_list_item.dart';
 import '../../core/state.dart';
-import '../models.dart';
 import '../features.dart' as features;
+import '../models.dart';
 import '../state.dart';
 import 'account_dialog.dart';
 import 'account_helper.dart';

lib/oath/views/actions.dart

@@ -15,16 +15,16 @@
  */
 
 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 '../../app/message.dart';
 import '../../app/shortcuts.dart';
 import '../../app/state.dart';
 import '../../core/state.dart';
 import '../../exception/cancellation_exception.dart';
-import '../models.dart';
 import '../features.dart' as features;
+import '../models.dart';
 import '../state.dart';
 
 class TogglePinIntent extends Intent {

lib/oath/views/add_account_dialog.dart

@@ -15,15 +15,16 @@
  */
 
 import 'dart:convert';
+
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:yubico_authenticator/app/message.dart';
-import 'package:yubico_authenticator/app/state.dart';
-import 'package:yubico_authenticator/widgets/responsive_dialog.dart';
 
+import '../../app/message.dart';
 import '../../app/models.dart';
+import '../../app/state.dart';
 import '../../widgets/file_drop_target.dart';
+import '../../widgets/responsive_dialog.dart';
 import '../models.dart';
 import '../state.dart';
 import 'add_account_page.dart';

lib/oath/views/add_account_page.dart

@@ -35,11 +35,11 @@ import '../../desktop/models.dart';
 import '../../exception/apdu_exception.dart';
 import '../../exception/cancellation_exception.dart';
 import '../../management/models.dart';
+import '../../widgets/app_text_field.dart';
 import '../../widgets/choice_filter_chip.dart';
 import '../../widgets/file_drop_target.dart';
 import '../../widgets/focus_utils.dart';
 import '../../widgets/responsive_dialog.dart';
-import '../../widgets/app_text_field.dart';
 import '../../widgets/utf8_utils.dart';
 import '../keys.dart' as keys;
 import '../models.dart';

lib/oath/views/add_multi_account_page.dart

@@ -1,23 +1,21 @@
 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:yubico_authenticator/app/logging.dart';
-import 'package:yubico_authenticator/exception/apdu_exception.dart';
 
 import '../../android/oath/state.dart';
-import '../../app/models.dart';
-import '../../core/models.dart';
-import '../../desktop/models.dart';
-import '../../widgets/responsive_dialog.dart';
-
-import 'package:flutter_gen/gen_l10n/app_localizations.dart';
-import '../models.dart';
-import '../../app/state.dart';
-import '../../core/state.dart';
-import '../state.dart';
+import '../../app/logging.dart';
 import '../../app/message.dart';
-
+import '../../app/models.dart';
+import '../../app/state.dart';
+import '../../core/models.dart';
+import '../../core/state.dart';
+import '../../desktop/models.dart';
+import '../../exception/apdu_exception.dart';
 import '../../exception/cancellation_exception.dart';
+import '../../widgets/responsive_dialog.dart';
+import '../models.dart';
+import '../state.dart';
 import 'rename_account_dialog.dart';
 
 final _log = Logger('oath.views.list_screen');

lib/oath/views/delete_account_dialog.dart

@@ -23,9 +23,9 @@ import '../../app/models.dart';
 import '../../app/state.dart';
 import '../../exception/cancellation_exception.dart';
 import '../../widgets/responsive_dialog.dart';
+import '../keys.dart' as keys;
 import '../models.dart';
 import '../state.dart';
-import '../keys.dart' as keys;
 import 'utils.dart';
 
 class DeleteAccountDialog extends ConsumerWidget {

lib/oath/views/key_actions.dart

@@ -15,21 +15,21 @@
  */
 
 import 'package:flutter/material.dart';
-import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
-import 'package:yubico_authenticator/oath/icon_provider/icon_pack_dialog.dart';
-import 'package:yubico_authenticator/oath/views/add_account_dialog.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
 
 import '../../android/qr_scanner/qr_scanner_provider.dart';
 import '../../app/message.dart';
 import '../../app/models.dart';
 import '../../app/state.dart';
-import '../../app/views/fs_dialog.dart';
 import '../../app/views/action_list.dart';
+import '../../app/views/fs_dialog.dart';
 import '../../core/state.dart';
-import '../models.dart';
 import '../features.dart' as features;
+import '../icon_provider/icon_pack_dialog.dart';
 import '../keys.dart' as keys;
+import '../models.dart';
+import 'add_account_dialog.dart';
 import 'manage_password_dialog.dart';
 import 'reset_dialog.dart';
 
@@ -59,7 +59,6 @@ Widget oathBuildActions(
               icon: const Icon(Icons.person_add_alt_1_outlined),
               onTap: used != null && (capacity == null || capacity > used)
                   ? (context) async {
-
                       Navigator.of(context).pop();
                       if (isAndroid) {
                         final withContext = ref.read(withContextProvider);

lib/oath/views/manage_password_dialog.dart

@@ -17,10 +17,10 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:yubico_authenticator/widgets/app_text_field.dart';
 
 import '../../app/message.dart';
 import '../../app/models.dart';
+import '../../widgets/app_text_field.dart';
 import '../../widgets/focus_utils.dart';
 import '../../widgets/responsive_dialog.dart';
 import '../keys.dart' as keys;

lib/oath/views/rename_account_dialog.dart

@@ -25,9 +25,9 @@ import '../../app/models.dart';
 import '../../app/state.dart';
 import '../../desktop/models.dart';
 import '../../exception/cancellation_exception.dart';
+import '../../widgets/app_text_form_field.dart';
 import '../../widgets/focus_utils.dart';
 import '../../widgets/responsive_dialog.dart';
-import '../../widgets/app_text_form_field.dart';
 import '../../widgets/utf8_utils.dart';
 import '../keys.dart' as keys;
 import '../models.dart';

lib/oath/views/reset_dialog.dart

@@ -19,10 +19,10 @@ import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 
 import '../../app/message.dart';
-import '../../widgets/responsive_dialog.dart';
-import '../state.dart';
 import '../../app/models.dart';
 import '../../app/state.dart';
+import '../../widgets/responsive_dialog.dart';
+import '../state.dart';
 
 class ResetDialog extends ConsumerWidget {
   final DevicePath devicePath;

lib/piv/models.dart

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-import 'package:freezed_annotation/freezed_annotation.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+import 'package:freezed_annotation/freezed_annotation.dart';
 
 import '../core/models.dart';
 

lib/piv/views/actions.dart

@@ -18,18 +18,18 @@ import 'dart:io';
 
 import 'package:file_picker/file_picker.dart';
 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 '../../app/message.dart';
+import '../../app/models.dart';
 import '../../app/shortcuts.dart';
 import '../../app/state.dart';
-import '../../app/models.dart';
 import '../../core/state.dart';
+import '../features.dart' as features;
+import '../keys.dart' as keys;
 import '../models.dart';
 import '../state.dart';
-import '../keys.dart' as keys;
-import '../features.dart' as features;
 import 'authentication_dialog.dart';
 import 'delete_certificate_dialog.dart';
 import 'generate_key_dialog.dart';

lib/piv/views/authentication_dialog.dart

@@ -21,8 +21,8 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
 
 import '../../app/models.dart';
 import '../../exception/cancellation_exception.dart';
-import '../../widgets/responsive_dialog.dart';
 import '../../widgets/app_text_field.dart';
+import '../../widgets/responsive_dialog.dart';
 import '../keys.dart' as keys;
 import '../models.dart';
 import '../state.dart';

lib/piv/views/delete_certificate_dialog.dart

@@ -23,9 +23,9 @@ import '../../app/models.dart';
 import '../../app/state.dart';
 import '../../exception/cancellation_exception.dart';
 import '../../widgets/responsive_dialog.dart';
+import '../keys.dart' as keys;
 import '../models.dart';
 import '../state.dart';
-import '../keys.dart' as keys;
 
 class DeleteCertificateDialog extends ConsumerWidget {
   final DevicePath devicePath;

lib/piv/views/generate_key_dialog.dart

@@ -22,9 +22,9 @@ import '../../app/message.dart';
 import '../../app/models.dart';
 import '../../app/state.dart';
 import '../../core/models.dart';
+import '../../widgets/app_text_field.dart';
 import '../../widgets/choice_filter_chip.dart';
 import '../../widgets/responsive_dialog.dart';
-import '../../widgets/app_text_field.dart';
 import '../keys.dart' as keys;
 import '../models.dart';
 import '../state.dart';

lib/piv/views/import_file_dialog.dart

@@ -23,8 +23,8 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
 import '../../app/message.dart';
 import '../../app/models.dart';
 import '../../app/state.dart';
-import '../../widgets/responsive_dialog.dart';
 import '../../widgets/app_text_field.dart';
+import '../../widgets/responsive_dialog.dart';
 import '../keys.dart' as keys;
 import '../models.dart';
 import '../state.dart';

lib/piv/views/key_actions.dart

@@ -15,16 +15,16 @@
  */
 
 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 '../../app/message.dart';
 import '../../app/models.dart';
-import '../../app/views/fs_dialog.dart';
 import '../../app/views/action_list.dart';
-import '../models.dart';
-import '../keys.dart' as keys;
+import '../../app/views/fs_dialog.dart';
 import '../features.dart' as features;
+import '../keys.dart' as keys;
+import '../models.dart';
 import 'manage_key_dialog.dart';
 import 'manage_pin_puk_dialog.dart';
 import 'reset_dialog.dart';

lib/piv/views/manage_pin_puk_dialog.dart

@@ -20,8 +20,8 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
 
 import '../../app/message.dart';
 import '../../app/models.dart';
-import '../../widgets/responsive_dialog.dart';
 import '../../widgets/app_text_field.dart';
+import '../../widgets/responsive_dialog.dart';
 import '../keys.dart' as keys;
 import '../state.dart';
 

lib/piv/views/pin_dialog.dart

@@ -20,8 +20,8 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
 
 import '../../app/models.dart';
 import '../../exception/cancellation_exception.dart';
-import '../../widgets/responsive_dialog.dart';
 import '../../widgets/app_text_field.dart';
+import '../../widgets/responsive_dialog.dart';
 import '../keys.dart' as keys;
 import '../state.dart';
 

lib/piv/views/piv_screen.dart

@@ -27,9 +27,9 @@ import '../../app/views/app_page.dart';
 import '../../app/views/message_page.dart';
 import '../../core/state.dart';
 import '../../widgets/list_title.dart';
+import '../features.dart' as features;
 import '../models.dart';
 import '../state.dart';
-import '../features.dart' as features;
 import 'actions.dart';
 import 'key_actions.dart';
 import 'slot_dialog.dart';

lib/piv/views/reset_dialog.dart

@@ -19,10 +19,10 @@ import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 
 import '../../app/message.dart';
-import '../../widgets/responsive_dialog.dart';
-import '../state.dart';
 import '../../app/models.dart';
 import '../../app/state.dart';
+import '../../widgets/responsive_dialog.dart';
+import '../state.dart';
 
 class ResetDialog extends ConsumerWidget {
   final DevicePath devicePath;

lib/piv/views/slot_dialog.dart

@@ -19,8 +19,8 @@ import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 
 import '../../app/state.dart';
-import '../../app/views/fs_dialog.dart';
 import '../../app/views/action_list.dart';
+import '../../app/views/fs_dialog.dart';
 import '../models.dart';
 import '../state.dart';
 import 'actions.dart';

lib/widgets/responsive_dialog.dart

@@ -16,7 +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';
 
 class ResponsiveDialog extends StatefulWidget {
   final Widget? title;