π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
[locker] Animate scanner captures into the page thumbnail
laurenspriem12207be1f026
diff --git a/mobile/apps/locker/lib/services/scanner/scan_geometry.dart b/mobile/apps/locker/lib/services/scanner/scan_geometry.dartindex ebbea0387a..3631c55d1b 100644--- a/mobile/apps/locker/lib/services/scanner/scan_geometry.dart+++ b/mobile/apps/locker/lib/services/scanner/scan_geometry.dart@@ -1,4 +1,5 @@import 'dart:math' as math;+import 'dart:typed_data';import 'dart:ui';import 'package:locker/services/scanner/scanner_models.dart';@@ -104,3 +105,43 @@ class QuadStabilizer {_lastRawQuad = null;}}++Float64List? homographyMatrix(List<Offset> source, List<Offset> target) {+ assert(source.length == 4 && target.length == 4);+ final rows = List.generate(8, (_) => List.filled(9, 0.0));+ for (var i = 0; i < 4; i++) {+ final x = source[i].dx;+ final y = source[i].dy;+ final u = target[i].dx;+ final v = target[i].dy;+ rows[2 * i] = [x, y, 1, 0, 0, 0, -u * x, -u * y, u];+ rows[2 * i + 1] = [0, 0, 0, x, y, 1, -v * x, -v * y, v];+ }+ for (var col = 0; col < 8; col++) {+ var pivot = col;+ for (var r = col + 1; r < 8; r++) {+ if (rows[r][col].abs() > rows[pivot][col].abs()) pivot = r;+ }+ if (rows[pivot][col].abs() < 1e-9) return null;+ if (pivot != col) {+ final swap = rows[pivot];+ rows[pivot] = rows[col];+ rows[col] = swap;+ }+ for (var r = 0; r < 8; r++) {+ if (r == col) continue;+ final factor = rows[r][col] / rows[col][col];+ if (factor == 0) continue;+ for (var c = col; c < 9; c++) {+ rows[r][c] -= factor * rows[col][c];+ }+ }+ }+ final h = [for (var i = 0; i < 8; i++) rows[i][8] / rows[i][i], 1.0];+ return Float64List.fromList([+ h[0], h[3], 0, h[6], //+ h[1], h[4], 0, h[7], //+ 0, 0, 1, 0, //+ h[2], h[5], 0, h[8], //+ ]);+}diff --git a/mobile/apps/locker/lib/services/scanner/scan_session_controller.dart b/mobile/apps/locker/lib/services/scanner/scan_session_controller.dartindex bb71cd9e82..c401d7ca7d 100644--- a/mobile/apps/locker/lib/services/scanner/scan_session_controller.dart+++ b/mobile/apps/locker/lib/services/scanner/scan_session_controller.dart@@ -24,6 +24,7 @@ class ScanSessionController extends ChangeNotifier {List<ScannedPage> get pages => List.unmodifiable(_pages);int get pageCount => _pages.length;+ int get pendingCount => _pendingCount;bool get isProcessing => _pendingCount > 0;String? get fileName => _fileName;diff --git a/mobile/apps/locker/lib/ui/pages/scanner/capture_flight.dart b/mobile/apps/locker/lib/ui/pages/scanner/capture_flight.dartnew file mode 100644index 0000000000..dce82223aa--- /dev/null+++ b/mobile/apps/locker/lib/ui/pages/scanner/capture_flight.dart@@ -0,0 +1,415 @@+import 'dart:math' as math;+import 'dart:typed_data';+import 'dart:ui' as ui;++import 'package:flutter/material.dart';+import 'package:locker/services/scanner/scan_geometry.dart';+import 'package:locker/services/scanner/scanner_models.dart';++class CaptureFlightSpec {+ CaptureFlightSpec({+ required this.image,+ required this.sourceCorners,+ required this.imageToLayer,+ required this.target,+ required this.targetRadius,+ required this.targetBorder,+ }) : clipEnd = _rectCorners(target),+ zoomedCorners = _insetQuad(sourceCorners, thumbnailInset),+ imageEnd = _rectCorners(+ _coverRect(target.deflate(targetBorder), _aspectOf(sourceCorners)),+ );++ static const thumbnailInset = 0.05;++ final ui.Image image;+ final List<Offset> sourceCorners;+ final List<Offset> zoomedCorners;+ final Float64List imageToLayer;+ final Rect target;+ final double targetRadius;+ final double targetBorder;+ final List<Offset> clipEnd;+ final List<Offset> imageEnd;++ static List<Offset> _insetQuad(List<Offset> corners, double inset) {+ Offset at(double u, double v) {+ final top = Offset.lerp(corners[0], corners[1], u)!;+ final bottom = Offset.lerp(corners[3], corners[2], u)!;+ return Offset.lerp(top, bottom, v)!;+ }++ return [+ at(inset, inset),+ at(1 - inset, inset),+ at(1 - inset, 1 - inset),+ at(inset, 1 - inset),+ ];+ }++ static List<Offset> _rectCorners(Rect rect) => [+ rect.topLeft,+ rect.topRight,+ rect.bottomRight,+ rect.bottomLeft,+ ];++ static double _aspectOf(List<Offset> corners) {+ final width =+ ((corners[1] - corners[0]).distance ++ (corners[2] - corners[3]).distance) /+ 2;+ final height =+ ((corners[3] - corners[0]).distance ++ (corners[2] - corners[1]).distance) /+ 2;+ if (width <= 0 || height <= 0) return 1;+ return width / height;+ }++ static Rect _coverRect(Rect box, double aspect) {+ if (aspect < 1) {+ return Rect.fromLTWH(box.left, box.top, box.width, box.width / aspect);+ }+ final width = box.height * aspect;+ return Rect.fromLTWH(box.center.dx - width / 2, box.top, width, box.height);+ }+}++Float64List coverImageTransform(Size image, Rect destination) {+ final rotate =+ (image.width > image.height) != (destination.width > destination.height);+ final shown = rotate ? Size(image.height, image.width) : image;+ final scale = math.max(+ destination.width / shown.width,+ destination.height / shown.height,+ );+ final matrix = Matrix4.translationValues(+ destination.left + (destination.width - shown.width * scale) / 2,+ destination.top + (destination.height - shown.height * scale) / 2,+ 0,+ )..multiply(Matrix4.diagonal3Values(scale, scale, 1));+ if (rotate) {+ matrix+ ..multiply(Matrix4.translationValues(shown.width, 0, 0))+ ..multiply(Matrix4.rotationZ(math.pi / 2));+ }+ return matrix.storage;+}++List<Offset> lerpCorners(List<Offset> a, List<Offset> b, double t) => [+ for (var i = 0; i < a.length; i++) Offset.lerp(a[i], b[i], t)!,+];++Path roundedPolygonPath(List<Offset> corners, double radius) {+ final path = Path();+ if (radius <= 0.01) return path..addPolygon(corners, true);+ final n = corners.length;+ for (var i = 0; i < n; i++) {+ final previous = corners[(i - 1 + n) % n];+ final corner = corners[i];+ final next = corners[(i + 1) % n];+ final toPrevious = previous - corner;+ final toNext = next - corner;+ final r = math.min(+ radius,+ math.min(toPrevious.distance, toNext.distance) / 2,+ );+ final entry = corner + toPrevious / toPrevious.distance * r;+ final exit = corner + toNext / toNext.distance * r;+ if (i == 0) {+ path.moveTo(entry.dx, entry.dy);+ } else {+ path.lineTo(entry.dx, entry.dy);+ }+ path.quadraticBezierTo(corner.dx, corner.dy, exit.dx, exit.dy);+ }+ return path..close();+}++class CaptureFlightCard extends StatefulWidget {+ const CaptureFlightCard({+ super.key,+ required this.spec,+ required this.borderColor,+ required this.onLanded,+ });++ static const duration = Duration(milliseconds: 620);++ final CaptureFlightSpec spec;+ final Color borderColor;+ final VoidCallback onLanded;++ @override+ State<CaptureFlightCard> createState() => _CaptureFlightCardState();+}++class _CaptureFlightCardState extends State<CaptureFlightCard>+ with SingleTickerProviderStateMixin {+ late final AnimationController _controller = AnimationController(+ vsync: this,+ duration: CaptureFlightCard.duration,+ );+ late final Animation<double> _progress = CurvedAnimation(+ parent: _controller,+ curve: Curves.easeInOutCubic,+ );++ @override+ void initState() {+ super.initState();+ _controller+ ..addStatusListener((status) {+ if (status == AnimationStatus.completed) widget.onLanded();+ })+ ..forward();+ }++ @override+ void dispose() {+ _controller.dispose();+ super.dispose();+ }++ @override+ Widget build(BuildContext context) {+ return IgnorePointer(+ child: CustomPaint(+ size: Size.infinite,+ painter: _FlightPainter(+ spec: widget.spec,+ progress: _progress,+ borderColor: widget.borderColor,+ ),+ ),+ );+ }+}++class _FlightPainter extends CustomPainter {+ _FlightPainter({+ required this.spec,+ required this.progress,+ required this.borderColor,+ }) : super(repaint: progress);++ final CaptureFlightSpec spec;+ final Animation<double> progress;+ final Color borderColor;++ @override+ void paint(Canvas canvas, Size size) {+ final t = progress.value;+ final clip = lerpCorners(spec.sourceCorners, spec.clipEnd, t);+ final sourceQuad = lerpCorners(spec.sourceCorners, spec.zoomedCorners, t);+ final imageQuad = lerpCorners(spec.sourceCorners, spec.imageEnd, t);+ final path = roundedPolygonPath(clip, spec.targetRadius * t);+ final elevation = 18 * math.sin(math.pi * t) + 3 * t;+ if (elevation > 0) {+ canvas.drawShadow(path, Colors.black, elevation, false);+ }+ canvas+ ..save()+ ..clipPath(path);+ paintMappedSnapshot(canvas, spec, sourceQuad, imageQuad);+ final borderAlpha = ((t - 0.7) / 0.3).clamp(0.0, 1.0);+ if (borderAlpha > 0) {+ canvas.drawPath(+ path,+ Paint()+ ..color = borderColor.withValues(alpha: borderAlpha)+ ..style = PaintingStyle.stroke+ ..strokeWidth = spec.targetBorder * 2,+ );+ }+ canvas.restore();+ }++ @override+ bool shouldRepaint(_FlightPainter oldDelegate) =>+ oldDelegate.spec != spec || oldDelegate.borderColor != borderColor;+}++void paintMappedSnapshot(+ Canvas canvas,+ CaptureFlightSpec spec,+ List<Offset> sourceQuad,+ List<Offset> imageQuad,+) {+ canvas.save();+ final homography = homographyMatrix(sourceQuad, imageQuad);+ if (homography != null) {+ canvas.transform(homography);+ } else {+ final from = _bounds(sourceQuad);+ final to = _bounds(imageQuad);+ canvas+ ..translate(to.left, to.top)+ ..scale(to.width / from.width, to.height / from.height)+ ..translate(-from.left, -from.top);+ }+ canvas+ ..transform(spec.imageToLayer)+ ..drawImage(+ spec.image,+ Offset.zero,+ Paint()..filterQuality = FilterQuality.medium,+ )+ ..restore();+}++Rect _bounds(List<Offset> points) {+ var left = double.infinity;+ var top = double.infinity;+ var right = double.negativeInfinity;+ var bottom = double.negativeInfinity;+ for (final p in points) {+ left = math.min(left, p.dx);+ top = math.min(top, p.dy);+ right = math.max(right, p.dx);+ bottom = math.max(bottom, p.dy);+ }+ return Rect.fromLTRB(left, top, right, bottom);+}++class CaptureSnapshotThumbnail extends StatelessWidget {+ const CaptureSnapshotThumbnail({super.key, required this.spec});++ final CaptureFlightSpec spec;++ @override+ Widget build(BuildContext context) {+ return CustomPaint(+ size: Size.infinite,+ painter: _SnapshotThumbnailPainter(spec),+ );+ }+}++class _SnapshotThumbnailPainter extends CustomPainter {+ const _SnapshotThumbnailPainter(this.spec);++ final CaptureFlightSpec spec;++ @override+ void paint(Canvas canvas, Size size) {+ final origin = spec.target.topLeft.translate(+ spec.targetBorder,+ spec.targetBorder,+ );+ canvas+ ..save()+ ..clipRect(Offset.zero & size)+ ..translate(-origin.dx, -origin.dy);+ paintMappedSnapshot(canvas, spec, spec.zoomedCorners, spec.imageEnd);+ canvas.restore();+ }++ @override+ bool shouldRepaint(_SnapshotThumbnailPainter oldDelegate) =>+ oldDelegate.spec != spec;+}++class CaptureSnapOverlay extends StatefulWidget {+ const CaptureSnapOverlay({+ super.key,+ required this.quad,+ required this.snapId,+ required this.color,+ });++ static const duration = Duration(milliseconds: 320);++ final ScanQuad? quad;+ final int snapId;+ final Color color;++ @override+ State<CaptureSnapOverlay> createState() => _CaptureSnapOverlayState();+}++class _CaptureSnapOverlayState extends State<CaptureSnapOverlay>+ with SingleTickerProviderStateMixin {+ late final AnimationController _controller = AnimationController(+ vsync: this,+ duration: CaptureSnapOverlay.duration,+ );++ @override+ void didUpdateWidget(CaptureSnapOverlay oldWidget) {+ super.didUpdateWidget(oldWidget);+ if (widget.snapId != oldWidget.snapId && widget.quad != null) {+ _controller.forward(from: 0);+ }+ }++ @override+ void dispose() {+ _controller.dispose();+ super.dispose();+ }++ @override+ Widget build(BuildContext context) {+ return IgnorePointer(+ child: CustomPaint(+ size: Size.infinite,+ painter: _SnapPainter(+ quad: widget.quad,+ progress: _controller,+ color: widget.color,+ ),+ ),+ );+ }+}++class _SnapPainter extends CustomPainter {+ _SnapPainter({+ required this.quad,+ required this.progress,+ required this.color,+ }) : super(repaint: progress);++ final ScanQuad? quad;+ final Animation<double> progress;+ final Color color;++ @override+ void paint(Canvas canvas, Size size) {+ final source = quad;+ final t = progress.value;+ if (source == null || t <= 0 || t >= 1 || size.isEmpty) return;+ final flash = math.pow(1 - Curves.easeOut.transform(t), 2).toDouble();+ canvas.drawRect(+ Offset.zero & size,+ Paint()..color = Colors.white.withValues(alpha: 0.55 * flash),+ );+ final fade = 1 - Curves.easeOutCubic.transform(t);+ final path = Path()+ ..addPolygon([+ for (final c in source.corners)+ Offset(c.dx * size.width, c.dy * size.height),+ ], true);+ canvas+ ..drawPath(+ path,+ Paint()+ ..color = color.withValues(alpha: 0.4 * fade)+ ..style = PaintingStyle.fill,+ )+ ..drawPath(+ path,+ Paint()+ ..color = color.withValues(alpha: fade)+ ..style = PaintingStyle.stroke+ ..strokeWidth = 4 + 4 * fade+ ..strokeJoin = StrokeJoin.round,+ );+ }++ @override+ bool shouldRepaint(_SnapPainter oldDelegate) =>+ oldDelegate.quad != quad || oldDelegate.color != color;+}diff --git a/mobile/apps/locker/lib/ui/pages/scanner/scanner_capture_page.dart b/mobile/apps/locker/lib/ui/pages/scanner/scanner_capture_page.dartindex fc6574aca1..6cdae3ab18 100644--- a/mobile/apps/locker/lib/ui/pages/scanner/scanner_capture_page.dart+++ b/mobile/apps/locker/lib/ui/pages/scanner/scanner_capture_page.dart@@ -1,6 +1,7 @@import 'dart:async';import 'dart:io';import 'dart:math' as math;+import 'dart:ui' as ui;import 'package:camera/camera.dart';import 'package:ente_components/ente_components.dart';@@ -13,6 +14,7 @@ import 'package:locker/services/scanner/auto_capture_controller.dart';import 'package:locker/services/scanner/scan_geometry.dart';import 'package:locker/services/scanner/scan_session_controller.dart';import 'package:locker/services/scanner/scanner_models.dart';+import 'package:locker/ui/pages/scanner/capture_flight.dart';import 'package:locker/ui/pages/scanner/scan_quad_overlay.dart';import 'package:locker/ui/pages/scanner/scanner_review_page.dart';import 'package:logging/logging.dart';@@ -44,6 +46,15 @@ class _ScannerCapturePageState extends State<ScannerCapturePage>bool _autoMode = true;bool _scannerInitFailed = false;+ final _previewKey = GlobalKey();+ final _flightLayerKey = GlobalKey();+ final _pagesButtonKey = GlobalKey();+ final List<_PendingCapture> _pending = [];+ final List<_ActiveFlight> _flights = [];+ int _captureSeq = 0;+ ScanQuad? _snapQuad;+ int _snapId = 0;+@overridevoid initState() {super.initState();@@ -77,6 +88,9 @@ class _ScannerCapturePageState extends State<ScannerCapturePage>_session.removeListener(_onSessionChanged);unawaited(_camera?.dispose());unawaited(_session.disposeSession());+ for (final capture in _pending) {+ capture.spec?.image.dispose();+ }unawaited(SystemChrome.setPreferredOrientations(const <DeviceOrientation>[]),);@@ -105,6 +119,8 @@ class _ScannerCapturePageState extends State<ScannerCapturePage>if (error != null) {showShortToast(context, context.strings.somethingWentWrong);}+ _reconcilePending(failed: error != null);+ setState(() {});}Future<void> _startCamera() async {@@ -237,17 +253,20 @@ class _ScannerCapturePageState extends State<ScannerCapturePage>Future<void> _capture() async {final camera = _camera;if (camera == null || _takingPicture) return;+ final quad = _stableQuad ?? ScanQuad.fullFrame();_autoCapture.notifyCaptureStarted();setState(() {_takingPicture = true;_stableQuad = null;+ _snapQuad = quad;+ _snapId++;});_stabilizer.reset();try {final shot = await camera.takePicture();final bytes = await shot.readAsBytes();unawaited(_deleteQuietly(File(shot.path)));- _session.addCapture(bytes);+ _onShotTaken(bytes, quad);} catch (e, s) {_logger.severe('Capture failed', e, s);if (mounted) {@@ -264,6 +283,163 @@ class _ScannerCapturePageState extends State<ScannerCapturePage>} catch (_) {}}+ void _onShotTaken(Uint8List bytes, ScanQuad quad) {+ final capture = _PendingCapture(_captureSeq++);+ _pending.add(capture);+ _session.addCapture(bytes);+ unawaited(_launchFlight(capture, bytes, quad));+ }++ Future<void> _launchFlight(+ _PendingCapture capture,+ Uint8List bytes,+ ScanQuad quad,+ ) async {+ final spec = await _buildFlightSpec(bytes, quad);+ if (!mounted) {+ spec?.image.dispose();+ return;+ }+ if (spec == null) {+ setState(() {+ capture.landed = true;+ _purgeResolved();+ });+ return;+ }+ capture.spec = spec;+ setState(() => _flights.add(_ActiveFlight(capture: capture, spec: spec)));+ }++ Future<CaptureFlightSpec?> _buildFlightSpec(+ Uint8List bytes,+ ScanQuad quad,+ ) async {+ final layer = _renderBox(_flightLayerKey);+ final preview = _renderBox(_previewKey);+ final thumb = _renderBox(_pagesButtonKey);+ if (layer == null || preview == null || thumb == null) return null;+ final previewRect =+ preview.localToGlobal(Offset.zero, ancestor: layer) & preview.size;+ final thumbRect =+ thumb.localToGlobal(Offset.zero, ancestor: layer) & thumb.size;+ final targetWidth =+ (previewRect.width * MediaQuery.devicePixelRatioOf(context)).round();+ final ui.Image image;+ try {+ final codec = await ui.instantiateImageCodec(+ bytes,+ targetWidth: targetWidth,+ );+ final frame = await codec.getNextFrame();+ codec.dispose();+ image = frame.image;+ } catch (e, s) {+ _logger.warning('Failed to decode capture preview', e, s);+ return null;+ }+ return CaptureFlightSpec(+ image: image,+ sourceCorners: [+ for (final corner in quad.corners)+ previewRect.topLeft ++ Offset(+ corner.dx * previewRect.width,+ corner.dy * previewRect.height,+ ),+ ],+ imageToLayer: coverImageTransform(+ Size(image.width.toDouble(), image.height.toDouble()),+ previewRect,+ ),+ target: thumbRect,+ targetRadius: Radii.md,+ targetBorder: _PagesButton.borderWidth,+ );+ }++ static RenderBox? _renderBox(GlobalKey key) {+ final box = key.currentContext?.findRenderObject();+ return box is RenderBox && box.hasSize ? box : null;+ }++ void _onFlightLanded(_ActiveFlight flight) {+ if (!mounted) return;+ setState(() {+ _flights.remove(flight);+ flight.capture.landed = true;+ _purgeResolved();+ });+ }++ void _reconcilePending({required bool failed}) {+ var markFailed = failed;+ var unresolved = _pending.where((capture) => !capture.resolved).length;+ while (unresolved > _session.pendingCount) {+ final oldest = _pending.firstWhere((capture) => !capture.resolved);+ if (markFailed) {+ oldest.failed = true;+ markFailed = false;+ } else {+ oldest.processed = true;+ }+ unresolved--;+ }+ _purgeResolved();+ }++ void _purgeResolved() {+ _PendingCapture? newestLanded;+ for (final capture in _pending) {+ if (capture.landed) newestLanded = capture;+ }+ for (final capture in _pending) {+ if (capture.landed && (capture.failed || capture != newestLanded)) {+ _releaseSnapshot(capture);+ }+ }+ _pending.removeWhere(+ (capture) => capture.landed && capture.resolved && capture.spec == null,+ );+ }++ static void _releaseSnapshot(_PendingCapture capture) {+ final image = capture.spec?.image;+ capture.spec = null;+ if (image != null) {+ unawaited(Future<void>.delayed(Motion.slow * 2, image.dispose));+ }+ }++ ({int count, Widget? thumbnail}) _pagesButtonState() {+ final hiddenPages = _pending+ .where((capture) => capture.processed && !capture.landed)+ .length;+ final shownPages = math.max(0, _session.pageCount - hiddenPages);+ final landedUnprocessed = _pending+ .where((capture) => capture.landed && !capture.resolved)+ .length;+ final showingSnapshot = [+ for (final capture in _pending)+ if (capture.landed && !capture.failed && capture.spec != null) capture,+ ];+ Widget? thumbnail;+ if (showingSnapshot.isNotEmpty) {+ final capture = showingSnapshot.last;+ thumbnail = CaptureSnapshotThumbnail(+ key: ValueKey('capture-${capture.id}'),+ spec: capture.spec!,+ );+ } else if (shownPages > 0) {+ final page = _session.pages[shownPages - 1];+ thumbnail = _ProcessedThumbnail(+ key: ValueKey(page.processedJpeg.path),+ page: page,+ );+ }+ return (count: shownPages + landedUnprocessed, thumbnail: thumbnail);+ }+void _toggleAutoMode() {setState(() => _autoMode = !_autoMode);_autoCapture.reset();@@ -297,6 +473,12 @@ class _ScannerCapturePageState extends State<ScannerCapturePage>if (saved == true) {navigator.pop(true);} else {+ setState(() {+ for (final capture in _pending) {+ _releaseSnapshot(capture);+ }+ _purgeResolved();+ });unawaited(_startCamera());}}@@ -304,6 +486,7 @@ class _ScannerCapturePageState extends State<ScannerCapturePage>@overrideWidget build(BuildContext context) {final colors = context.componentColors;+ final pages = _pagesButtonState();return Scaffold(backgroundColor: Colors.black,body: Stack(@@ -347,46 +530,58 @@ class _ScannerCapturePageState extends State<ScannerCapturePage>const Spacer(),SizedBox(height: 88,- child: ListenableBuilder(- listenable: _session,- builder: (context, _) => Stack(- alignment: Alignment.center,- children: [- _ShutterButton(- enabled:- _status == _CameraStatus.ready &&- !_takingPicture &&- _session.isServiceReady,- armingProgress: _autoMode- ? _autoCapture.progress- : 0,- armingColor: colors.primary,- onTap: _capture,- ),- Align(- alignment: Alignment.centerLeft,- child: _PagesButton(- session: _session,- accent: colors.primary,- onTap: _openReview,- ),+ child: Stack(+ alignment: Alignment.center,+ children: [+ _ShutterButton(+ enabled:+ _status == _CameraStatus.ready &&+ !_takingPicture &&+ _session.isServiceReady,+ armingProgress: _autoMode ? _autoCapture.progress : 0,+ armingColor: colors.primary,+ onTap: _capture,+ ),+ Align(+ alignment: Alignment.centerLeft,+ child: _PagesButton(+ key: _pagesButtonKey,+ count: pages.count,+ thumbnail: pages.thumbnail,+ accent: colors.primary,+ onTap: _openReview,),- Align(- alignment: Alignment.centerRight,- child: _DoneButton(- session: _session,- accent: colors.primary,- onTap: _openReview,- ),+ ),+ Align(+ alignment: Alignment.centerRight,+ child: _DoneButton(+ visible: pages.count > 0,+ accent: colors.primary,+ onTap: _openReview,),- ],- ),+ ),+ ],),),],),),),+ IgnorePointer(+ child: Stack(+ key: _flightLayerKey,+ fit: StackFit.expand,+ children: [+ for (final flight in _flights)+ CaptureFlightCard(+ key: ValueKey(flight.capture.id),+ spec: flight.spec,+ borderColor: colors.specialWhite,+ onLanded: () => _onFlightLanded(flight),+ ),+ ],+ ),+ ),],),);@@ -425,13 +620,21 @@ class _ScannerCapturePageState extends State<ScannerCapturePage>child: AspectRatio(aspectRatio: 1 / camera.value.aspectRatio,child: ClipRRect(+ key: _previewKey,borderRadius: BorderRadius.circular(Radii.sheet),child: Stack(fit: StackFit.expand,children: [CameraPreview(camera),ScanQuadOverlay(- quad: _takingPicture ? null : _stableQuad,+ quad: _takingPicture || _flights.isNotEmpty+ ? null+ : _stableQuad,+ color: colors.primary,+ ),+ CaptureSnapOverlay(+ quad: _snapQuad,+ snapId: _snapId,color: colors.primary,),],@@ -443,6 +646,69 @@ class _ScannerCapturePageState extends State<ScannerCapturePage>}}+class _ProcessedThumbnail extends StatelessWidget {+ const _ProcessedThumbnail({super.key, required this.page});++ static const _inset = CaptureFlightSpec.thumbnailInset;+ static const _zoom = 1 / (1 - 2 * _inset);++ final ScannedPage page;++ @override+ Widget build(BuildContext context) {+ return LayoutBuilder(+ builder: (context, constraints) {+ final box = constraints.biggest;+ final aspect = page.height == 0 ? 1.0 : page.width / page.height;+ final size = aspect < 1+ ? Size(box.width * _zoom, box.width * _zoom / aspect)+ : Size(box.height * _zoom * aspect, box.height * _zoom);+ return ClipRect(+ child: OverflowBox(+ alignment: Alignment.topCenter,+ maxWidth: double.infinity,+ maxHeight: double.infinity,+ child: Transform.translate(+ offset: Offset(0, -size.height * _inset),+ child: SizedBox.fromSize(+ size: size,+ child: Image(+ image: ResizeImage(+ FileImage(page.processedJpeg),+ height:+ (size.height * MediaQuery.devicePixelRatioOf(context))+ .round(),+ ),+ fit: BoxFit.fill,+ ),+ ),+ ),+ ),+ );+ },+ );+ }+}++class _PendingCapture {+ _PendingCapture(this.id);++ final int id;+ CaptureFlightSpec? spec;+ bool landed = false;+ bool processed = false;+ bool failed = false;++ bool get resolved => processed || failed;+}++class _ActiveFlight {+ const _ActiveFlight({required this.capture, required this.spec});++ final _PendingCapture capture;+ final CaptureFlightSpec spec;+}+class _CameraMessage extends StatelessWidget {const _CameraMessage({required this.message, required this.onRetry});@@ -651,7 +917,8 @@ class _AutoToggle extends StatelessWidget {class _SessionActionReveal extends StatelessWidget {const _SessionActionReveal({- required this.session,+ required this.visible,+ required this.revealDuration,required this.tooltip,required this.onTap,required this.child,@@ -659,19 +926,19 @@ class _SessionActionReveal extends StatelessWidget {static const size = 62.0;- final ScanSessionController session;+ final bool visible;+ final Duration revealDuration;final String tooltip;final VoidCallback onTap;final Widget child;@overrideWidget build(BuildContext context) {- final visible = session.pageCount > 0 || session.isProcessing;return IgnorePointer(ignoring: !visible,child: AnimatedScale(scale: visible ? 1 : 0,- duration: Motion.standard,+ duration: revealDuration,curve: visible ? Curves.easeOutBack : Curves.easeIn,child: Tooltip(message: tooltip,@@ -685,93 +952,150 @@ class _SessionActionReveal extends StatelessWidget {}}-class _PagesButton extends StatelessWidget {+class _PagesButton extends StatefulWidget {const _PagesButton({- required this.session,+ super.key,+ required this.count,+ required this.thumbnail,required this.accent,required this.onTap,});- static const _borderWidth = 2.0;+ static const borderWidth = 2.0;- final ScanSessionController session;+ final int count;+ final Widget? thumbnail;final Color accent;final VoidCallback onTap;+ @override+ State<_PagesButton> createState() => _PagesButtonState();+}++class _PagesButtonState extends State<_PagesButton>+ with SingleTickerProviderStateMixin {+ late final AnimationController _bounce = AnimationController(+ vsync: this,+ duration: const Duration(milliseconds: 320),+ );+ late final Animation<double> _scale = TweenSequence<double>([+ TweenSequenceItem(+ tween: Tween(+ begin: 1.0,+ end: 1.12,+ ).chain(CurveTween(curve: Curves.easeOut)),+ weight: 40,+ ),+ TweenSequenceItem(+ tween: Tween(+ begin: 1.12,+ end: 1.0,+ ).chain(CurveTween(curve: Curves.easeInOut)),+ weight: 60,+ ),+ ]).animate(_bounce);++ Duration _switchDuration = Duration.zero;++ @override+ void didUpdateWidget(_PagesButton oldWidget) {+ super.didUpdateWidget(oldWidget);+ if (widget.count > oldWidget.count) _bounce.forward(from: 0);+ if (widget.thumbnail?.key != oldWidget.thumbnail?.key) {+ _switchDuration = widget.thumbnail is CaptureSnapshotThumbnail+ ? Duration.zero+ : Motion.standard;+ }+ }++ @override+ void dispose() {+ _bounce.dispose();+ super.dispose();+ }++ static Widget _expandedLayout(Widget? current, List<Widget> previous) =>+ Stack(fit: StackFit.expand, children: [...previous, ?current]);+@overrideWidget build(BuildContext context) {final colors = context.componentColors;- final page = session.lastPage;return _SessionActionReveal(- session: session,+ visible: widget.count > 0,+ revealDuration: Duration.zero,tooltip: context.strings.review,- onTap: onTap,- child: Stack(- clipBehavior: Clip.none,- children: [- Positioned.fill(- child: Container(- decoration: BoxDecoration(- borderRadius: BorderRadius.circular(Radii.md),- color: Colors.black.withValues(alpha: 0.4),- border: Border.all(- color: colors.specialWhite,- width: _borderWidth,- ),- boxShadow: [- BoxShadow(- color: Colors.black.withValues(alpha: 0.35),- blurRadius: 10,- ),- ],- ),- child: ClipRRect(- borderRadius: BorderRadius.circular(Radii.md - _borderWidth),- child: page == null- ? Center(- child: SizedBox(- width: 24,- height: 24,- child: CircularProgressIndicator(- strokeWidth: 2.5,- color: colors.specialWhite,- ),- ),- )- : Image.file(- page.processedJpeg,- key: ValueKey(page.processedJpeg.path),- fit: BoxFit.cover,- alignment: Alignment.topCenter,- cacheHeight: (_SessionActionReveal.size * 3).round(),- ),- ),- ),- ),- if (session.pageCount > 0)- Positioned(- top: -Spacing.sm,- right: -Spacing.sm,+ onTap: widget.onTap,+ child: ScaleTransition(+ scale: _scale,+ child: Stack(+ clipBehavior: Clip.none,+ children: [+ Positioned.fill(child: Container(- padding: const EdgeInsets.all(Spacing.xs),- constraints: const BoxConstraints(minWidth: 24, minHeight: 24),decoration: BoxDecoration(- shape: BoxShape.circle,- color: accent,+ borderRadius: BorderRadius.circular(Radii.md),+ color: Colors.black.withValues(alpha: 0.4),border: Border.all(color: colors.specialWhite,- width: _borderWidth,+ width: _PagesButton.borderWidth,),+ boxShadow: [+ BoxShadow(+ color: Colors.black.withValues(alpha: 0.35),+ blurRadius: 10,+ ),+ ],),- child: Center(- child: Text(- '${session.pageCount}',- style: TextStyles.mini.copyWith(color: colors.specialWhite),+ child: ClipRRect(+ borderRadius: BorderRadius.circular(+ Radii.md - _PagesButton.borderWidth,+ ),+ child: AnimatedSwitcher(+ duration: _switchDuration,+ layoutBuilder: _expandedLayout,+ child:+ widget.thumbnail ??+ const SizedBox.expand(key: ValueKey('empty')),),),),),- ],+ if (widget.count > 0)+ Positioned(+ top: -Spacing.sm,+ right: -Spacing.sm,+ child: Container(+ padding: const EdgeInsets.all(Spacing.xs),+ constraints: const BoxConstraints(+ minWidth: 24,+ minHeight: 24,+ ),+ decoration: BoxDecoration(+ shape: BoxShape.circle,+ color: widget.accent,+ border: Border.all(+ color: colors.specialWhite,+ width: _PagesButton.borderWidth,+ ),+ ),+ child: Center(+ child: AnimatedSwitcher(+ duration: Motion.standard,+ transitionBuilder: (child, animation) =>+ ScaleTransition(scale: animation, child: child),+ child: Text(+ '${widget.count}',+ key: ValueKey(widget.count),+ style: TextStyles.mini.copyWith(+ color: colors.specialWhite,+ ),+ ),+ ),+ ),+ ),+ ),+ ],+ ),),);}@@ -779,12 +1103,12 @@ class _PagesButton extends StatelessWidget {class _DoneButton extends StatelessWidget {const _DoneButton({- required this.session,+ required this.visible,required this.accent,required this.onTap,});- final ScanSessionController session;+ final bool visible;final Color accent;final VoidCallback onTap;@@ -792,7 +1116,8 @@ class _DoneButton extends StatelessWidget {Widget build(BuildContext context) {final colors = context.componentColors;return _SessionActionReveal(- session: session,+ visible: visible,+ revealDuration: Motion.standard,tooltip: context.strings.done,onTap: onTap,child: Container(@@ -807,20 +1132,11 @@ class _DoneButton extends StatelessWidget {],),child: Center(- child: session.isProcessing- ? SizedBox(- width: 24,- height: 24,- child: CircularProgressIndicator(- strokeWidth: 2.5,- color: colors.specialWhite,- ),- )- : HugeIcon(- icon: HugeIcons.strokeRoundedTick02,- color: colors.specialWhite,- size: 30,- ),+ child: HugeIcon(+ icon: HugeIcons.strokeRoundedTick02,+ color: colors.specialWhite,+ size: 30,+ ),),),);