Navaron Bracke

remove toFormat helper

@@ -5,7 +5,6 @@ import 'dart:ui' as ui; @@ -5,7 +5,6 @@ import 'dart:ui' as ui;
5 import 'package:flutter/services.dart'; 5 import 'package:flutter/services.dart';
6 import 'package:flutter_web_plugins/flutter_web_plugins.dart'; 6 import 'package:flutter_web_plugins/flutter_web_plugins.dart';
7 import 'package:mobile_scanner/mobile_scanner_web.dart'; 7 import 'package:mobile_scanner/mobile_scanner_web.dart';
8 -import 'package:mobile_scanner/src/barcode_utility.dart';  
9 import 'package:mobile_scanner/src/enums/barcode_format.dart'; 8 import 'package:mobile_scanner/src/enums/barcode_format.dart';
10 import 'package:mobile_scanner/src/enums/camera_facing.dart'; 9 import 'package:mobile_scanner/src/enums/camera_facing.dart';
11 10
@@ -110,7 +109,7 @@ class MobileScannerWebPlugin { @@ -110,7 +109,7 @@ class MobileScannerWebPlugin {
110 if (arguments.containsKey('formats')) { 109 if (arguments.containsKey('formats')) {
111 formats = (arguments['formats'] as List) 110 formats = (arguments['formats'] as List)
112 .cast<int>() 111 .cast<int>()
113 - .map((e) => toFormat(e)) 112 + .map(BarcodeFormat.fromRawValue)
114 .toList(); 113 .toList();
115 } 114 }
116 115
1 import 'package:flutter/material.dart'; 1 import 'package:flutter/material.dart';
2 -import 'package:mobile_scanner/mobile_scanner.dart';  
3 2
4 List<Offset>? toCorners(List<Map<Object?, Object?>>? data) { 3 List<Offset>? toCorners(List<Map<Object?, Object?>>? data) {
5 if (data == null) { 4 if (data == null) {
@@ -12,38 +11,3 @@ List<Offset>? toCorners(List<Map<Object?, Object?>>? data) { @@ -12,38 +11,3 @@ List<Offset>? toCorners(List<Map<Object?, Object?>>? data) {
12 }), 11 }),
13 ); 12 );
14 } 13 }
15 -  
16 -BarcodeFormat toFormat(int value) {  
17 - switch (value) {  
18 - case 0:  
19 - return BarcodeFormat.all;  
20 - case 1:  
21 - return BarcodeFormat.code128;  
22 - case 2:  
23 - return BarcodeFormat.code39;  
24 - case 4:  
25 - return BarcodeFormat.code93;  
26 - case 8:  
27 - return BarcodeFormat.codebar;  
28 - case 16:  
29 - return BarcodeFormat.dataMatrix;  
30 - case 32:  
31 - return BarcodeFormat.ean13;  
32 - case 64:  
33 - return BarcodeFormat.ean8;  
34 - case 128:  
35 - return BarcodeFormat.itf;  
36 - case 256:  
37 - return BarcodeFormat.qrCode;  
38 - case 512:  
39 - return BarcodeFormat.upcA;  
40 - case 1024:  
41 - return BarcodeFormat.upcE;  
42 - case 2048:  
43 - return BarcodeFormat.pdf417;  
44 - case 4096:  
45 - return BarcodeFormat.aztec;  
46 - default:  
47 - return BarcodeFormat.unknown;  
48 - }  
49 -}  
@@ -436,7 +436,9 @@ class MobileScannerController { @@ -436,7 +436,9 @@ class MobileScannerController {
436 barcodes: [ 436 barcodes: [
437 Barcode( 437 Barcode(
438 rawValue: (data as Map)['payload'] as String?, 438 rawValue: (data as Map)['payload'] as String?,
439 - format: toFormat(data['symbology'] as int), 439 + format: BarcodeFormat.fromRawValue(
  440 + data['symbology'] as int? ?? -1,
  441 + ),
440 ), 442 ),
441 ], 443 ],
442 ), 444 ),
@@ -452,7 +454,9 @@ class MobileScannerController { @@ -452,7 +454,9 @@ class MobileScannerController {
452 Barcode( 454 Barcode(
453 rawValue: barcode['rawValue'] as String?, 455 rawValue: barcode['rawValue'] as String?,
454 rawBytes: barcode['rawBytes'] as Uint8List?, 456 rawBytes: barcode['rawBytes'] as Uint8List?,
455 - format: toFormat(barcode['format'] as int), 457 + format: BarcodeFormat.fromRawValue(
  458 + barcode['format'] as int? ?? -1,
  459 + ),
456 corners: toCorners( 460 corners: toCorners(
457 (barcode['corners'] as List<Object?>? ?? []) 461 (barcode['corners'] as List<Object?>? ?? [])
458 .cast<Map<Object?, Object?>>(), 462 .cast<Map<Object?, Object?>>(),