Merge pull request juliansteenbakker#1565 from juliansteenbakker/fix/core_style

fix: core style

Author: juliansteenbakker

analysis_options.yaml

@@ -1,6 +1 @@
 include: package:very_good_analysis/analysis_options.yaml
-
-linter:
-  rules:
-    omit_local_variable_types: false
-    specify_nonobvious_local_variable_types: true

lib/src/method_channel/android_surface_producer_delegate.dart

@@ -28,7 +28,7 @@ class AndroidSurfaceProducerDelegate {
       'naturalDeviceOrientation': final String naturalDeviceOrientation,
       'sensorOrientation': final int sensorOrientation,
     }) {
-      final DeviceOrientation naturalOrientation =
+      final naturalOrientation =
           naturalDeviceOrientation.parseDeviceOrientation();
 
       return AndroidSurfaceProducerDelegate(

lib/src/method_channel/mobile_scanner_method_channel.dart

@@ -87,23 +87,21 @@ class MethodChannelMobileScanner extends MobileScannerPlatform {
       return null;
     }
 
-    final Object? data = event['data'];
+    final data = event['data'];
 
     if (data == null || data is! List<Object?>) {
       return null;
     }
 
-    final List<Map<Object?, Object?>> barcodes =
-        data.cast<Map<Object?, Object?>>();
+    final barcodes = data.cast<Map<Object?, Object?>>();
 
     if (defaultTargetPlatform == TargetPlatform.android ||
         defaultTargetPlatform == TargetPlatform.iOS ||
         defaultTargetPlatform == TargetPlatform.macOS) {
-      final Map<Object?, Object?>? imageData =
-          event['image'] as Map<Object?, Object?>?;
-      final Uint8List? image = imageData?['bytes'] as Uint8List?;
-      final double? width = imageData?['width'] as double?;
-      final double? height = imageData?['height'] as double?;
+      final imageData = event['image'] as Map<Object?, Object?>?;
+      final image = imageData?['bytes'] as Uint8List?;
+      final width = imageData?['width'] as double?;
+      final height = imageData?['height'] as double?;
 
       return BarcodeCapture(
         raw: event,
@@ -143,10 +141,9 @@ class MethodChannelMobileScanner extends MobileScannerPlatform {
   /// Throws a [MobileScannerException] if the permission is not granted.
   Future<void> _requestCameraPermission() async {
     try {
-      final MobileScannerAuthorizationState authorizationState =
-          MobileScannerAuthorizationState.fromRawValue(
-            await methodChannel.invokeMethod<int>('state') ?? 0,
-          );
+      final authorizationState = MobileScannerAuthorizationState.fromRawValue(
+        await methodChannel.invokeMethod<int>('state') ?? 0,
+      );
 
       switch (authorizationState) {
         // Authorization was already granted, no need to request it again.
@@ -156,7 +153,7 @@ class MethodChannelMobileScanner extends MobileScannerPlatform {
         // So if the permission was denied, request it again.
         case MobileScannerAuthorizationState.denied:
         case MobileScannerAuthorizationState.undetermined:
-          final bool permissionGranted =
+          final permissionGranted =
               await methodChannel.invokeMethod<bool>('request') ?? false;
 
           if (!permissionGranted) {
@@ -209,17 +206,19 @@ class MethodChannelMobileScanner extends MobileScannerPlatform {
     List<BarcodeFormat> formats = const <BarcodeFormat>[],
   }) async {
     try {
-      final Map<Object?, Object?>? result = await methodChannel
-          .invokeMapMethod<Object?, Object?>('analyzeImage', {
-            'filePath': path,
-            'formats':
-                formats.isEmpty
-                    ? null
-                    : [
-                      for (final BarcodeFormat format in formats)
-                        if (format != BarcodeFormat.unknown) format.rawValue,
-                    ],
-          });
+      final result = await methodChannel.invokeMapMethod<Object?, Object?>(
+        'analyzeImage',
+        {
+          'filePath': path,
+          'formats':
+              formats.isEmpty
+                  ? null
+                  : [
+                    for (final BarcodeFormat format in formats)
+                      if (format != BarcodeFormat.unknown) format.rawValue,
+                  ],
+        },
+      );
 
       return _parseBarcode(result);
     } on PlatformException catch (error) {
@@ -282,7 +281,7 @@ class MethodChannelMobileScanner extends MobileScannerPlatform {
       throw UnimplementedError('setFocusPoint() has not been implemented.');
     }
 
-    final Map<String, Object?> params = <String, Object?>{
+    final params = <String, Object?>{
       'dx': position.dx,
       'dy': position.dy,
     };
@@ -330,7 +329,7 @@ class MethodChannelMobileScanner extends MobileScannerPlatform {
       );
     }
 
-    final int? textureId = startResult['textureId'] as int?;
+    final textureId = startResult['textureId'] as int?;
 
     if (textureId == null) {
       throw const MobileScannerException(
@@ -341,7 +340,7 @@ class MethodChannelMobileScanner extends MobileScannerPlatform {
       );
     }
 
-    final CameraFacing cameraDirection = CameraFacing.fromRawValue(
+    final cameraDirection = CameraFacing.fromRawValue(
       startResult['cameraDirection'] as int?,
     );
 
@@ -364,8 +363,8 @@ class MethodChannelMobileScanner extends MobileScannerPlatform {
       initialDeviceOrientation = orientation.parseDeviceOrientation();
     }
 
-    final int? numberOfCameras = startResult['numberOfCameras'] as int?;
-    final TorchState currentTorchState = TorchState.fromRawValue(
+    final numberOfCameras = startResult['numberOfCameras'] as int?;
+    final currentTorchState = TorchState.fromRawValue(
       startResult['currentTorchState'] as int? ?? -1,
     );
 

lib/src/method_channel/rotated_preview.dart

@@ -27,7 +27,7 @@ final class RotatedPreview extends StatefulWidget {
     required double sensorOrientationDegrees,
     Key? key,
   }) {
-    final int facingSignForDirection = switch (cameraFacingDirection) {
+    final facingSignForDirection = switch (cameraFacingDirection) {
       CameraFacing.front => 1,
       CameraFacing.back => -1,
       CameraFacing.unknown => 1,
@@ -101,7 +101,7 @@ final class _RotatedPreviewState extends State<RotatedPreview> {
     required double sensorOrientationDegrees,
     required int sign,
   }) {
-    final double deviceOrientationDegrees = switch (orientation) {
+    final deviceOrientationDegrees = switch (orientation) {
       DeviceOrientation.portraitUp => 0,
       DeviceOrientation.landscapeRight => 90,
       DeviceOrientation.portraitDown => 180,
@@ -110,7 +110,7 @@ final class _RotatedPreviewState extends State<RotatedPreview> {
 
     // Rotate the camera preview according to
     // https://developer.android.com/media/camera/camera2/camera-preview#orientation_calculation.
-    double rotationDegrees =
+    var rotationDegrees =
         (sensorOrientationDegrees - deviceOrientationDegrees * sign + 360) %
         360;
 
@@ -127,7 +127,7 @@ final class _RotatedPreviewState extends State<RotatedPreview> {
 
   @override
   Widget build(BuildContext context) {
-    final double rotationDegrees = _computeRotationDegrees(
+    final rotationDegrees = _computeRotationDegrees(
       deviceOrientation,
       sensorOrientationDegrees: widget.sensorOrientationDegrees,
       sign: widget.facingSign,

lib/src/mobile_scanner.dart

@@ -183,7 +183,7 @@ class _MobileScannerState extends State<MobileScanner>
       return;
     }
 
-    final Rect newScanWindow = calculateScanWindowRelativeToTextureInPercentage(
+    final newScanWindow = calculateScanWindowRelativeToTextureInPercentage(
       widget.fit,
       widget.scanWindow!,
       textureSize: scannerState.size,
@@ -215,8 +215,8 @@ class _MobileScannerState extends State<MobileScanner>
       return;
     }
 
-    final double dx = (newScanWindow.width - scanWindow!.width).abs();
-    final double dy = (newScanWindow.height - scanWindow!.height).abs();
+    final dx = (newScanWindow.width - scanWindow!.width).abs();
+    final dy = (newScanWindow.height - scanWindow!.height).abs();
 
     // The new scan window has changed enough, allow updating the scan window.
     if (dx >= widget.scanWindowUpdateThreshold ||
@@ -238,7 +238,7 @@ class _MobileScannerState extends State<MobileScanner>
           return widget.placeholderBuilder?.call(context) ?? defaultPlaceholder;
         }
 
-        final MobileScannerException? error = value.error;
+        final error = value.error;
         if (error != null) {
           final Widget defaultError = ScannerErrorWidget(error: error);
 
@@ -249,7 +249,7 @@ class _MobileScannerState extends State<MobileScanner>
           builder: (context, constraints) {
             _maybeUpdateScanWindow(value, constraints);
 
-            final Widget? overlay = widget.overlayBuilder?.call(
+            final overlay = widget.overlayBuilder?.call(
               context,
               constraints,
             );
@@ -269,11 +269,9 @@ class _MobileScannerState extends State<MobileScanner>
                 return GestureDetector(
                   child: scannerWidget,
                   onTapUp: (details) async {
-                    final Size size = MediaQuery.sizeOf(context);
-                    final double relativeX =
-                        details.globalPosition.dx / size.width;
-                    final double relativeY =
-                        details.globalPosition.dy / size.height;
+                    final size = MediaQuery.sizeOf(context);
+                    final relativeX = details.globalPosition.dx / size.width;
+                    final relativeY = details.globalPosition.dy / size.height;
 
                     await controller.setFocusPoint(
                       Offset(relativeX, relativeY),

lib/src/mobile_scanner_controller.dart

@@ -16,7 +16,6 @@ import 'package:mobile_scanner/src/enums/torch_state.dart';
 import 'package:mobile_scanner/src/method_channel/mobile_scanner_method_channel.dart';
 import 'package:mobile_scanner/src/mobile_scanner_exception.dart';
 import 'package:mobile_scanner/src/mobile_scanner_platform_interface.dart';
-import 'package:mobile_scanner/src/mobile_scanner_view_attributes.dart';
 import 'package:mobile_scanner/src/objects/barcode_capture.dart';
 import 'package:mobile_scanner/src/objects/mobile_scanner_state.dart';
 import 'package:mobile_scanner/src/objects/start_options.dart';
@@ -242,7 +241,7 @@ class MobileScannerController extends ValueNotifier<MobileScannerState> {
 
     _disposeListeners();
 
-    final TorchState oldTorchState = value.torchState;
+    final oldTorchState = value.torchState;
 
     // After the camera stopped, set the torch state to off,
     // as the torch state callback is never called when the camera is stopped.
@@ -319,7 +318,7 @@ class MobileScannerController extends ValueNotifier<MobileScannerState> {
       return;
     }
 
-    final double clampedZoomScale = zoomScale.clamp(0.0, 1.0);
+    final clampedZoomScale = zoomScale.clamp(0.0, 1.0);
 
     // Update the zoom scale state to the new state.
     // When the platform has updated the zoom scale,
@@ -339,7 +338,7 @@ class MobileScannerController extends ValueNotifier<MobileScannerState> {
       return;
     }
 
-    final Offset clampedPosition = Offset(
+    final clampedPosition = Offset(
       position.dx.clamp(0, 1),
       position.dy.clamp(0, 1),
     );
@@ -426,7 +425,7 @@ class MobileScannerController extends ValueNotifier<MobileScannerState> {
       value = value.copyWith(isStarting: true);
     }
 
-    final StartOptions options = StartOptions(
+    final options = StartOptions(
       cameraDirection: cameraDirection ?? facing,
       cameraResolution: cameraResolution,
       detectionSpeed: detectionSpeed,
@@ -442,8 +441,9 @@ class MobileScannerController extends ValueNotifier<MobileScannerState> {
     try {
       _setupListeners();
 
-      final MobileScannerViewAttributes viewAttributes =
-          await MobileScannerPlatform.instance.start(options);
+      final viewAttributes = await MobileScannerPlatform.instance.start(
+        options,
+      );
 
       if (!_isDisposed) {
         value = value.copyWith(
@@ -508,8 +508,8 @@ class MobileScannerController extends ValueNotifier<MobileScannerState> {
   Future<void> switchCamera() async {
     _throwIfNotInitialized();
 
-    final int? availableCameras = value.availableCameras;
-    final CameraFacing cameraDirection = value.cameraDirection;
+    final availableCameras = value.availableCameras;
+    final cameraDirection = value.cameraDirection;
 
     // Do nothing if the amount of cameras is less than 2 cameras.
     // If the the current platform does not provide the amount of cameras,
@@ -552,7 +552,7 @@ class MobileScannerController extends ValueNotifier<MobileScannerState> {
       return;
     }
 
-    final TorchState torchState = value.torchState;
+    final torchState = value.torchState;
 
     if (torchState == TorchState.unavailable) {
       return;

lib/src/objects/address.dart

@@ -10,8 +10,8 @@ class Address {
 
   /// Creates a new [Address] instance from a map.
   factory Address.fromNative(Map<Object?, Object?> data) {
-    final List<Object?>? addressLines = data['addressLines'] as List<Object?>?;
-    final AddressType type = AddressType.fromRawValue(
+    final addressLines = data['addressLines'] as List<Object?>?;
+    final type = AddressType.fromRawValue(
       data['type'] as int? ?? 0,
     );
 

lib/src/objects/barcode.dart

@@ -40,26 +40,20 @@ class Barcode {
 
   /// Creates a new [Barcode] instance from the given [data].
   factory Barcode.fromNative(Map<Object?, Object?> data) {
-    final Map<Object?, Object?>? calendarEvent =
-        data['calendarEvent'] as Map<Object?, Object?>?;
-    final Map<Object?, Object?>? contactInfo =
-        data['contactInfo'] as Map<Object?, Object?>?;
-    final List<Object?>? corners = data['corners'] as List<Object?>?;
-    final Map<Object?, Object?>? driverLicense =
-        data['driverLicense'] as Map<Object?, Object?>?;
-    final Map<Object?, Object?>? email =
-        data['email'] as Map<Object?, Object?>?;
-    final Map<Object?, Object?>? geoPoint =
-        data['geoPoint'] as Map<Object?, Object?>?;
-    final Map<Object?, Object?>? phone =
-        data['phone'] as Map<Object?, Object?>?;
-    final Map<Object?, Object?>? sms = data['sms'] as Map<Object?, Object?>?;
-    final Map<Object?, Object?>? size = data['size'] as Map<Object?, Object?>?;
-    final Map<Object?, Object?>? url = data['url'] as Map<Object?, Object?>?;
-    final Map<Object?, Object?>? wifi = data['wifi'] as Map<Object?, Object?>?;
-
-    final double? barcodeWidth = size?['width'] as double?;
-    final double? barcodeHeight = size?['height'] as double?;
+    final calendarEvent = data['calendarEvent'] as Map<Object?, Object?>?;
+    final contactInfo = data['contactInfo'] as Map<Object?, Object?>?;
+    final corners = data['corners'] as List<Object?>?;
+    final driverLicense = data['driverLicense'] as Map<Object?, Object?>?;
+    final email = data['email'] as Map<Object?, Object?>?;
+    final geoPoint = data['geoPoint'] as Map<Object?, Object?>?;
+    final phone = data['phone'] as Map<Object?, Object?>?;
+    final sms = data['sms'] as Map<Object?, Object?>?;
+    final size = data['size'] as Map<Object?, Object?>?;
+    final url = data['url'] as Map<Object?, Object?>?;
+    final wifi = data['wifi'] as Map<Object?, Object?>?;
+
+    final barcodeWidth = size?['width'] as double?;
+    final barcodeHeight = size?['height'] as double?;
 
     return Barcode(
       calendarEvent:
@@ -75,8 +69,8 @@ class Barcode {
                 corners.cast<Map<Object?, Object?>>().map((
                   Map<Object?, Object?> e,
                 ) {
-                  final double x = e['x']! as double;
-                  final double y = e['y']! as double;
+                  final x = e['x']! as double;
+                  final y = e['y']! as double;
 
                   return Offset(x, y);
                 }),
@@ -226,8 +220,8 @@ class Barcode {
     // The size and corners are in the same coordinate space,
     // which is the camera input.
     // If the barcode size is unknown, scale to 0,0.
-    final double scaleX = size.width > 0 ? targetSize.width / size.width : 0;
-    final double scaleY = size.height > 0 ? targetSize.height / size.height : 0;
+    final scaleX = size.width > 0 ? targetSize.width / size.width : 0;
+    final scaleY = size.height > 0 ? targetSize.height / size.height : 0;
 
     return [
       for (final Offset offset in corners)

lib/src/objects/contact_info.dart

@@ -19,11 +19,11 @@ class ContactInfo {
 
   /// Create a new [ContactInfo] instance from a map.
   factory ContactInfo.fromNative(Map<Object?, Object?> data) {
-    final List<Object?>? addresses = data['addresses'] as List<Object?>?;
-    final List<Object?>? emails = data['emails'] as List<Object?>?;
-    final List<Object?>? phones = data['phones'] as List<Object?>?;
-    final List<Object?>? urls = data['urls'] as List<Object?>?;
-    final Map<Object?, Object?>? name = data['name'] as Map<Object?, Object?>?;
+    final addresses = data['addresses'] as List<Object?>?;
+    final emails = data['emails'] as List<Object?>?;
+    final phones = data['phones'] as List<Object?>?;
+    final urls = data['urls'] as List<Object?>?;
+    final name = data['name'] as Map<Object?, Object?>?;
 
     return ContactInfo(
       addresses: