Skip to content

armgit / ente

Public Imported from GitHub
0

πŸ’š End-to-end encrypted cloud for everything.

[mobile][locker] Tighten the scanner's Dart side

laurenspriem463014f8a46d
diff --git a/mobile/apps/locker/lib/services/scanner/auto_capture_controller.dart b/mobile/apps/locker/lib/services/scanner/auto_capture_controller.dart
index 9c323a0d0a..efc830c211 100644
--- a/mobile/apps/locker/lib/services/scanner/auto_capture_controller.dart
+++ b/mobile/apps/locker/lib/services/scanner/auto_capture_controller.dart
@@ -86,6 +86,5 @@ class AutoCaptureController {
_lastFrameAt = null;
}
- static double _areaFraction(ScanQuad quad) =>
- quadArea(quad.corners) / (ScanQuad.maskSide * ScanQuad.maskSide);
+ static double _areaFraction(ScanQuad quad) => quadArea(quad.corners);
}
diff --git a/mobile/apps/locker/lib/services/scanner/document_scanner_service.dart b/mobile/apps/locker/lib/services/scanner/document_scanner_service.dart
index 5cb53b59ef..978ffb061c 100644
--- a/mobile/apps/locker/lib/services/scanner/document_scanner_service.dart
+++ b/mobile/apps/locker/lib/services/scanner/document_scanner_service.dart
@@ -1,11 +1,76 @@
+import 'dart:io';
import 'dart:typed_data';
+import 'dart:ui';
import 'package:locker/services/scanner/scanner_models.dart';
+import 'package:locker/src/rust/api/document_scanner_api.dart';
+import 'package:logging/logging.dart';
+import 'package:path/path.dart' as p;
+import 'package:path_provider/path_provider.dart';
-abstract class DocumentScannerService {
- Future<void> init();
+class DocumentScannerService {
+ DocumentScannerService._();
- bool get isReady;
+ static final DocumentScannerService instance = DocumentScannerService._();
+
+ static const int _maxPixels = 4000000;
+ static const double _maskSide = 256;
+
+ final _logger = Logger('DocumentScannerService');
+ Directory? _dir;
+ ScannerSession? _session;
+ Future<void>? _initialization;
+ int _counter = 0;
+ DateTime _lastLiveLog = DateTime.fromMillisecondsSinceEpoch(0);
+
+ Future<void> init() {
+ return _initialization ??= () async {
+ try {
+ await _initialize();
+ } catch (_) {
+ _initialization = null;
+ rethrow;
+ }
+ }();
+ }
+
+ Future<void> _initialize() async {
+ final watch = Stopwatch()..start();
+ try {
+ final tmp = await getTemporaryDirectory();
+ _dir = await Directory(
+ p.join(tmp.path, 'document_scan'),
+ ).create(recursive: true);
+ final support = await getApplicationSupportDirectory();
+ _session = await ScannerSession.create(
+ assetsDir: p.join(support.path, 'assets'),
+ );
+ _logger.info(
+ 'Initialized: session ready in ${watch.elapsedMilliseconds}ms',
+ );
+ } catch (e, s) {
+ _logger.severe('Initialization failed', e, s);
+ rethrow;
+ }
+ }
+
+ bool get isReady => _session != null;
+
+ ScannerSession get _readySession {
+ final session = _session;
+ if (session == null) {
+ throw StateError('DocumentScannerService not initialized');
+ }
+ return session;
+ }
+
+ Directory get _root {
+ final dir = _dir;
+ if (dir == null) {
+ throw StateError('DocumentScannerService not initialized');
+ }
+ return dir;
+ }
Future<ScanQuad?> detectLiveYuv({
required Uint8List y,
@@ -17,7 +82,29 @@ abstract class DocumentScannerService {
required int width,
required int height,
required int rotationDegrees,
- });
+ }) async {
+ final session = _session;
+ if (session == null) return null;
+ try {
+ final quad = await session.liveDetectYuv420(
+ y: y,
+ u: u,
+ v: v,
+ layout: RustPlaneLayout(
+ width: width,
+ height: height,
+ yRowStride: yRowStride,
+ uvRowStride: uvRowStride,
+ uvPixelStride: uvPixelStride,
+ ),
+ rotationDegrees: rotationDegrees,
+ );
+ return quad == null ? null : _normalized(quad, _maskSide, _maskSide);
+ } catch (e) {
+ _logLiveThrottled(e);
+ return null;
+ }
+ }
Future<ScanQuad?> detectLiveBgra(
Uint8List bytes,
@@ -25,17 +112,154 @@ abstract class DocumentScannerService {
int width,
int height,
int rotationDegrees,
- );
+ ) async {
+ final session = _session;
+ if (session == null) return null;
+ try {
+ final quad = await session.liveDetectBgra(
+ bgra: bytes,
+ rowStride: rowStride,
+ width: width,
+ height: height,
+ rotationDegrees: rotationDegrees,
+ );
+ return quad == null ? null : _normalized(quad, _maskSide, _maskSide);
+ } catch (e) {
+ _logLiveThrottled(e);
+ return null;
+ }
+ }
- Future<ScannedPage> processCapture(Uint8List capturedJpeg);
+ void _logLiveThrottled(Object error) {
+ final now = DateTime.now();
+ if (now.difference(_lastLiveLog).inSeconds < 10) return;
+ _lastLiveLog = now;
+ _logger.warning('Live detection frame failed', error);
+ }
+
+ Future<ScannedPage> processCapture(Uint8List capturedJpeg) async {
+ try {
+ final result = await _readySession.processCapture(
+ imageBytes: capturedJpeg,
+ options: const RustScanOptions(
+ maxPixels: _maxPixels,
+ rotationDegrees: 0,
+ ),
+ );
+ final id = '${DateTime.now().microsecondsSinceEpoch}_${_counter++}';
+ final source = File(p.join(_root.path, '${id}_src.jpg'));
+ final processed = File(p.join(_root.path, '${id}_r0.jpg'));
+ await source.writeAsBytes(capturedJpeg, flush: true);
+ await processed.writeAsBytes(result.processedImage, flush: true);
+ final quad = result.quad;
+ return ScannedPage(
+ id: id,
+ sourceJpeg: source,
+ processedJpeg: processed,
+ quad: quad == null
+ ? ScanQuad.fullFrame()
+ : _normalized(
+ quad,
+ result.sourceWidth.toDouble(),
+ result.sourceHeight.toDouble(),
+ ),
+ rotationDegrees: 0,
+ resolvedColorMode: _colorModeFromRust(result.colorMode),
+ sourceWidth: result.sourceWidth,
+ sourceHeight: result.sourceHeight,
+ width: result.outputWidth,
+ height: result.outputHeight,
+ );
+ } catch (e, s) {
+ _logger.severe('processCapture failed', e, s);
+ rethrow;
+ }
+ }
Future<ScannedPage> updatePage(
ScannedPage page, {
ScanQuad? quad,
int? rotationDegrees,
- });
+ }) async {
+ try {
+ final sourceBytes = await page.sourceJpeg.readAsBytes();
+ final result = await _readySession.reprocess(
+ sourceBytes: sourceBytes,
+ options: RustReprocessOptions(
+ quad: _inSourcePixels(
+ quad ?? page.quad,
+ page.sourceWidth,
+ page.sourceHeight,
+ ),
+ rotationDegrees: rotationDegrees ?? page.rotationDegrees,
+ colorMode: _colorModeToRust(page.resolvedColorMode),
+ maxPixels: _maxPixels,
+ ),
+ );
+ final processed = File(
+ p.join(_root.path, '${page.id}_r${++_counter}.jpg'),
+ );
+ await processed.writeAsBytes(result.processedImage, flush: true);
+ if (page.processedJpeg.path != processed.path) {
+ await _deleteIfExists(page.processedJpeg);
+ }
+ return page.copyWith(
+ processedJpeg: processed,
+ quad: quad,
+ rotationDegrees: rotationDegrees,
+ width: result.outputWidth,
+ height: result.outputHeight,
+ );
+ } catch (e, s) {
+ _logger.severe('updatePage failed', e, s);
+ rethrow;
+ }
+ }
+
+ Future<void> disposePage(ScannedPage page) async {
+ await _deleteIfExists(page.sourceJpeg);
+ await _deleteIfExists(page.processedJpeg);
+ }
+
+ Future<void> dispose() async {
+ _session?.dispose();
+ _session = null;
+ _initialization = null;
+ _dir = null;
+ }
+
+ static ScanQuad _normalized(RustQuad quad, double width, double height) {
+ Offset scale(RustPoint point) => Offset(point.x / width, point.y / height);
+ return ScanQuad([
+ scale(quad.topLeft),
+ scale(quad.topRight),
+ scale(quad.bottomRight),
+ scale(quad.bottomLeft),
+ ]);
+ }
+
+ static RustQuad _inSourcePixels(ScanQuad quad, int width, int height) {
+ RustPoint scale(Offset corner) =>
+ RustPoint(x: corner.dx * width, y: corner.dy * height);
+ return RustQuad(
+ topLeft: scale(quad.corners[0]),
+ topRight: scale(quad.corners[1]),
+ bottomRight: scale(quad.corners[2]),
+ bottomLeft: scale(quad.corners[3]),
+ );
+ }
+
+ static ScanColorMode _colorModeFromRust(RustColorMode mode) => switch (mode) {
+ RustColorMode.color => ScanColorMode.color,
+ RustColorMode.grayscale => ScanColorMode.grayscale,
+ };
- Future<void> disposePage(ScannedPage page);
+ static RustColorMode _colorModeToRust(ScanColorMode mode) => switch (mode) {
+ ScanColorMode.grayscale => RustColorMode.grayscale,
+ ScanColorMode.color || ScanColorMode.auto => RustColorMode.color,
+ };
- Future<void> dispose();
+ static Future<void> _deleteIfExists(File file) async {
+ if (await file.exists()) await file.delete();
+ }
}
diff --git a/mobile/apps/locker/lib/services/scanner/rust_document_scanner_service.dart b/mobile/apps/locker/lib/services/scanner/rust_document_scanner_service.dart
deleted file mode 100644
index 579d2ecec3..0000000000
--- a/mobile/apps/locker/lib/services/scanner/rust_document_scanner_service.dart
+++ /dev/null
@@ -1,280 +0,0 @@
-import 'dart:io';
-import 'dart:typed_data';
-import 'dart:ui';
-
-import 'package:locker/services/scanner/document_scanner_service.dart';
-import 'package:locker/services/scanner/scanner_models.dart';
-import 'package:locker/src/rust/api/document_scanner_api.dart';
-import 'package:logging/logging.dart';
-import 'package:path/path.dart' as p;
-import 'package:path_provider/path_provider.dart';
-
-class RustDocumentScannerService implements DocumentScannerService {
- static const int _maxPixels = 4000000;
-
- final _logger = Logger('RustDocumentScannerService');
- Directory? _dir;
- ScannerSession? _session;
- Future<void>? _initialization;
- int _counter = 0;
- DateTime _lastLiveLog = DateTime.fromMillisecondsSinceEpoch(0);
-
- @override
- Future<void> init() {
- return _initialization ??= () async {
- try {
- await _initialize();
- } catch (_) {
- _initialization = null;
- rethrow;
- }
- }();
- }
-
- Future<void> _initialize() async {
- final watch = Stopwatch()..start();
- try {
- final tmp = await getTemporaryDirectory();
- _dir = await Directory(
- p.join(tmp.path, 'document_scan'),
- ).create(recursive: true);
- final support = await getApplicationSupportDirectory();
- _session = await ScannerSession.create(
- assetsDir: p.join(support.path, 'assets'),
- );
- _logger.info(
- 'Initialized: session ready in ${watch.elapsedMilliseconds}ms',
- );
- } catch (e, s) {
- _logger.severe('Initialization failed', e, s);
- rethrow;
- }
- }
-
- @override
- bool get isReady => _session != null;
-
- ScannerSession get _readySession {
- final session = _session;
- if (session == null) {
- throw StateError('DocumentScannerService not initialized');
- }
- return session;
- }
-
- Directory get _root {
- final dir = _dir;
- if (dir == null) {
- throw StateError('DocumentScannerService not initialized');
- }
- return dir;
- }
-
- @override
- Future<ScanQuad?> detectLiveYuv({
- required Uint8List y,
- required Uint8List u,
- required Uint8List v,
- required int yRowStride,
- required int uvRowStride,
- required int uvPixelStride,
- required int width,
- required int height,
- required int rotationDegrees,
- }) async {
- final session = _session;
- if (session == null) return null;
- try {
- final quad = await session.liveDetectYuv420(
- y: y,
- u: u,
- v: v,
- layout: RustPlaneLayout(
- width: width,
- height: height,
- yRowStride: yRowStride,
- uvRowStride: uvRowStride,
- uvPixelStride: uvPixelStride,
- ),
- rotationDegrees: rotationDegrees,
- );
- return quad == null ? null : _maskQuadFromRust(quad);
- } catch (e) {
- _logLiveThrottled(e);
- return null;
- }
- }
-
- @override
- Future<ScanQuad?> detectLiveBgra(
- Uint8List bytes,
- int rowStride,
- int width,
- int height,
- int rotationDegrees,
- ) async {
- final session = _session;
- if (session == null) return null;
- try {
- final quad = await session.liveDetectBgra(
- bgra: bytes,
- rowStride: rowStride,
- width: width,
- height: height,
- rotationDegrees: rotationDegrees,
- );
- return quad == null ? null : _maskQuadFromRust(quad);
- } catch (e) {
- _logLiveThrottled(e);
- return null;
- }
- }
-
- void _logLiveThrottled(Object error) {
- final now = DateTime.now();
- if (now.difference(_lastLiveLog).inSeconds < 10) return;
- _lastLiveLog = now;
- _logger.warning('Live detection frame failed', error);
- }
-
- @override
- Future<ScannedPage> processCapture(Uint8List capturedJpeg) async {
- try {
- final result = await _readySession.processCapture(
- imageBytes: capturedJpeg,
- options: const RustScanOptions(
- maxPixels: _maxPixels,
- rotationDegrees: 0,
- ),
- );
- final id = '${DateTime.now().microsecondsSinceEpoch}_${_counter++}';
- final source = File(p.join(_root.path, '${id}_src.jpg'));
- final processed = File(p.join(_root.path, '${id}_r0.jpg'));
- await source.writeAsBytes(capturedJpeg, flush: true);
- await processed.writeAsBytes(result.processedImage, flush: true);
- final quad = result.quad;
- return ScannedPage(
- id: id,
- sourceJpeg: source,
- processedJpeg: processed,
- quad: quad == null
- ? ScanQuad.fullFrame()
- : _maskQuadFromSource(
- quad,
- result.sourceWidth,
- result.sourceHeight,
- ),
- rotationDegrees: 0,
- resolvedColorMode: _colorModeFromRust(result.colorMode),
- sourceWidth: result.sourceWidth,
- sourceHeight: result.sourceHeight,
- width: result.outputWidth,
- height: result.outputHeight,
- );
- } catch (e, s) {
- _logger.severe('processCapture failed', e, s);
- rethrow;
- }
- }
-
- @override
- Future<ScannedPage> updatePage(
- ScannedPage page, {
- ScanQuad? quad,
- int? rotationDegrees,
- }) async {
- try {
- final sourceBytes = await page.sourceJpeg.readAsBytes();
- final result = await _readySession.reprocess(
- sourceBytes: sourceBytes,
- options: RustReprocessOptions(
- quad: _sourceQuadFromMask(
- quad ?? page.quad,
- page.sourceWidth,
- page.sourceHeight,
- ),
- rotationDegrees: rotationDegrees ?? page.rotationDegrees,
- colorMode: _colorModeToRust(page.resolvedColorMode),
- maxPixels: _maxPixels,
- ),
- );
- final processed = File(
- p.join(_root.path, '${page.id}_r${++_counter}.jpg'),
- );
- await processed.writeAsBytes(result.processedImage, flush: true);
- if (page.processedJpeg.path != processed.path) {
- await _deleteIfExists(page.processedJpeg);
- }
- return page.copyWith(
- processedJpeg: processed,
- quad: quad,
- rotationDegrees: rotationDegrees,
- width: result.outputWidth,
- height: result.outputHeight,
- );
- } catch (e, s) {
- _logger.severe('updatePage failed', e, s);
- rethrow;
- }
- }
-
- @override
- Future<void> disposePage(ScannedPage page) async {
- await _deleteIfExists(page.sourceJpeg);
- await _deleteIfExists(page.processedJpeg);
- }
-
- @override
- Future<void> dispose() async {
- _session?.dispose();
- _session = null;
- _initialization = null;
- _dir = null;
- }
-
- static ScanQuad _maskQuadFromRust(RustQuad quad) => ScanQuad([
- Offset(quad.topLeft.x, quad.topLeft.y),
- Offset(quad.topRight.x, quad.topRight.y),
- Offset(quad.bottomRight.x, quad.bottomRight.y),
- Offset(quad.bottomLeft.x, quad.bottomLeft.y),
- ]);
-
- static ScanQuad _maskQuadFromSource(RustQuad quad, int width, int height) {
- final sx = ScanQuad.maskSide / width;
- final sy = ScanQuad.maskSide / height;
- Offset scale(RustPoint point) => Offset(point.x * sx, point.y * sy);
- return ScanQuad([
- scale(quad.topLeft),
- scale(quad.topRight),
- scale(quad.bottomRight),
- scale(quad.bottomLeft),
- ]);
- }
-
- static RustQuad _sourceQuadFromMask(ScanQuad quad, int width, int height) {
- final sx = width / ScanQuad.maskSide;
- final sy = height / ScanQuad.maskSide;
- RustPoint scale(Offset corner) =>
- RustPoint(x: corner.dx * sx, y: corner.dy * sy);
- return RustQuad(
- topLeft: scale(quad.corners[0]),
- topRight: scale(quad.corners[1]),
- bottomRight: scale(quad.corners[2]),
- bottomLeft: scale(quad.corners[3]),
- );
- }
-
- static ScanColorMode _colorModeFromRust(RustColorMode mode) => switch (mode) {
- RustColorMode.color => ScanColorMode.color,
- RustColorMode.grayscale => ScanColorMode.grayscale,
- };
-
- static RustColorMode _colorModeToRust(ScanColorMode mode) => switch (mode) {
- ScanColorMode.grayscale => RustColorMode.grayscale,
- ScanColorMode.color || ScanColorMode.auto => RustColorMode.color,
- };
-
- static Future<void> _deleteIfExists(File file) async {
- if (await file.exists()) await file.delete();
- }
-}
diff --git a/mobile/apps/locker/lib/services/scanner/scan_geometry.dart b/mobile/apps/locker/lib/services/scanner/scan_geometry.dart
index f52986a3d5..069ed8f88f 100644
--- a/mobile/apps/locker/lib/services/scanner/scan_geometry.dart
+++ b/mobile/apps/locker/lib/services/scanner/scan_geometry.dart
@@ -53,7 +53,7 @@ Rect fittedRect(Size container, double aspect) {
}
class QuadStabilizer {
- static const double maxCornerDrift = 20.0;
+ static const double maxCornerDrift = 20.0 / 256;
static const int requiredStableFrames = 3;
int _stableCount = 0;
diff --git a/mobile/apps/locker/lib/services/scanner/scan_session_controller.dart b/mobile/apps/locker/lib/services/scanner/scan_session_controller.dart
index 60e81359f4..bb71cd9e82 100644
--- a/mobile/apps/locker/lib/services/scanner/scan_session_controller.dart
+++ b/mobile/apps/locker/lib/services/scanner/scan_session_controller.dart
@@ -5,19 +5,15 @@ import 'package:flutter/foundation.dart';
import 'package:locker/services/scanner/document_scanner_service.dart';
import 'package:locker/services/scanner/pdf_writer.dart';
import 'package:locker/services/scanner/scanner_models.dart';
-import 'package:locker/services/scanner/scanner_service_locator.dart';
import 'package:logging/logging.dart';
import 'package:path/path.dart' as p;
import 'package:path_provider/path_provider.dart';
class ScanSessionController extends ChangeNotifier {
- ScanSessionController({DocumentScannerService? service})
- : _service = service ?? documentScannerService;
-
static const _pdfExtension = '.pdf';
final _logger = Logger('ScanSessionController');
- final DocumentScannerService _service;
+ final DocumentScannerService _service = DocumentScannerService.instance;
final List<ScannedPage> _pages = [];
final List<File> _exports = [];
Future<void> _queue = Future.value();
@@ -173,7 +169,7 @@ class ScanSessionController extends ChangeNotifier {
final specs = <PdfPageSpec>[];
for (final page in List.of(_pages)) {
final jpeg = await page.processedJpeg.readAsBytes();
- final size = _pageSizeMm(jpeg);
+ final size = _pageSizeMm(page);
specs.add(
PdfPageSpec(jpeg: jpeg, widthMm: size.widthMm, heightMm: size.heightMm),
);
@@ -189,12 +185,11 @@ class ScanSessionController extends ChangeNotifier {
return file;
}
- static ({double widthMm, double heightMm}) _pageSizeMm(Uint8List jpeg) {
- final info = JpegInfo.parse(jpeg);
+ static ({double widthMm, double heightMm}) _pageSizeMm(ScannedPage page) {
const a4HeightMm = 297.0;
- final longestPx = info.width > info.height ? info.width : info.height;
+ final longestPx = page.width > page.height ? page.width : page.height;
final scale = a4HeightMm / longestPx;
- return constrainToMaxFormat(info.width * scale, info.height * scale);
+ return constrainToMaxFormat(page.width * scale, page.height * scale);
}
Future<void> disposeSession() async {
diff --git a/mobile/apps/locker/lib/services/scanner/scanner_models.dart b/mobile/apps/locker/lib/services/scanner/scanner_models.dart
index 405574322e..40f91e085e 100644
--- a/mobile/apps/locker/lib/services/scanner/scanner_models.dart
+++ b/mobile/apps/locker/lib/services/scanner/scanner_models.dart
@@ -6,16 +6,10 @@ enum ScanColorMode { auto, color, grayscale }
class ScanQuad {
const ScanQuad(this.corners);
- static const double maskSide = 256;
-
final List<Offset> corners;
- factory ScanQuad.fullFrame() => const ScanQuad([
- Offset(0, 0),
- Offset(maskSide, 0),
- Offset(maskSide, maskSide),
- Offset(0, maskSide),
- ]);
+ factory ScanQuad.fullFrame() =>
+ const ScanQuad([Offset(0, 0), Offset(1, 0), Offset(1, 1), Offset(0, 1)]);
}
class ScannedPage {
diff --git a/mobile/apps/locker/lib/services/scanner/scanner_service_locator.dart b/mobile/apps/locker/lib/services/scanner/scanner_service_locator.dart
deleted file mode 100644
index 8942f9ba43..0000000000
--- a/mobile/apps/locker/lib/services/scanner/scanner_service_locator.dart
+++ /dev/null
@@ -1,7 +0,0 @@
-import 'package:locker/services/scanner/document_scanner_service.dart';
-import 'package:locker/services/scanner/rust_document_scanner_service.dart';
-
-DocumentScannerService? _documentScannerService;
-
-DocumentScannerService get documentScannerService =>
- _documentScannerService ??= RustDocumentScannerService();
diff --git a/mobile/apps/locker/lib/ui/pages/scanner/scan_quad_overlay.dart b/mobile/apps/locker/lib/ui/pages/scanner/scan_quad_overlay.dart
index 2ae90b957f..b585ca2f74 100644
--- a/mobile/apps/locker/lib/ui/pages/scanner/scan_quad_overlay.dart
+++ b/mobile/apps/locker/lib/ui/pages/scanner/scan_quad_overlay.dart
@@ -8,7 +8,7 @@ class ScanQuadOverlay extends StatefulWidget {
static const double _smoothing = 0.15;
- static const double _settled = 0.05;
+ static const double _settled = 0.05 / 256;
final ScanQuad? quad;
final Color color;
@@ -74,10 +74,7 @@ class _QuadPainter extends CustomPainter {
if (source == null || size.isEmpty) return;
final points = [
for (final c in source.corners)
- Offset(
- c.dx / ScanQuad.maskSide * size.width,
- c.dy / ScanQuad.maskSide * size.height,
- ),
+ Offset(c.dx * size.width, c.dy * size.height),
];
final path = Path()..addPolygon(points, true);
canvas.drawPath(
diff --git a/mobile/apps/locker/lib/ui/pages/scanner/scanner_crop_page.dart b/mobile/apps/locker/lib/ui/pages/scanner/scanner_crop_page.dart
index 570ba5719c..80605188ca 100644
--- a/mobile/apps/locker/lib/ui/pages/scanner/scanner_crop_page.dart
+++ b/mobile/apps/locker/lib/ui/pages/scanner/scanner_crop_page.dart
@@ -49,10 +49,7 @@ class _ScannerCropPageState extends State<ScannerCropPage> {
setState(() {
_sourceBytes = bytes;
_aspect = page.sourceWidth / page.sourceHeight;
- _corners = [
- for (final c in page.quad.corners)
- Offset(c.dx / ScanQuad.maskSide, c.dy / ScanQuad.maskSide),
- ];
+ _corners = [...page.quad.corners];
});
}
@@ -63,16 +60,11 @@ class _ScannerCropPageState extends State<ScannerCropPage> {
return null;
}
- ScanQuad get _orderedQuad => orderClockwise([
- for (final c in _corners)
- Offset(c.dx * ScanQuad.maskSide, c.dy * ScanQuad.maskSide),
- ]);
+ ScanQuad get _orderedQuad => orderClockwise(_corners);
bool get _canSave =>
_corners.length == 4 &&
- quadArea(_orderedQuad.corners) /
- (ScanQuad.maskSide * ScanQuad.maskSide) >=
- _minAreaFraction;
+ quadArea(_orderedQuad.corners) >= _minAreaFraction;
Future<void> _save() async {
final navigator = Navigator.of(context);