CHANGELOG.md

@@ -1,12 +0,0 @@
-
-## 1.1.1
-
-## 1.1.0
-
-* refactor to clear domain models
-* follow MVVM
-
-## 1.0.0
-
-* basic implementation
-* support localization

Dockerfile

@@ -20,7 +20,6 @@ RUN --mount=type=cache,target=/root/.pub-cache \
     rm -rf .dart_tool build && \
 	flutter pub get && \
 	flutter gen-l10n && \
-	flutter pub run build_runner build --delete-conflicting-outputs && \
 	flutter build web --release -O4 --wasm
 
 # Stage 2: Caddy (Alpine) to serve static files with SPA fallback

README.md

@@ -23,7 +23,7 @@ flutter analyze
 flutter test
 # > run integration tests
 flutter test integration_test/ -d <device_id>
-# dart run tool/run_integration_tests.dart --device=linux (necessary for linux)
+# dart run tool/run_integration_tests.dart --device=linux
 
 # dart run tool/gen_view_wireframe_md.dart
 # flutter pub run dead_code_analyzer
@@ -37,7 +37,6 @@ flutter run -d <device_id>
 #### Windows
 
 ```bash
-dart run pdfrx:remove_wasm_modules
 flutter build windows
 # create windows installer
 flutter pub run msix:create
@@ -71,7 +70,6 @@ Access your app at [http://localhost:8080](http://localhost:8080)
 For Linux
 
 ```bash
-dart run pdfrx:remove_wasm_modules
 flutter build linux
 cp -r build/linux/x64/release/bundle/ AppDir
 appimagetool-x86_64.AppImage AppDir

docs/meta-arch.md

@@ -94,5 +94,3 @@ Some rule of thumb:
   * whole app use its image object as image representation.
   * aware that minimize, encode/decode usage, because its has poor performance on web
   * `ColorFilterGenerator` can not replace `adjustColor` due to custom background removal algorithm need at last stage. It is GPU based, and offscreen-render then readback is not ideal.
-* [responsive_framework]
-  * RWD support

integration_test/export_flow_test.dart

@@ -1,35 +1,70 @@
-import 'dart:io';
-
-import 'package:file_selector/file_selector.dart' as fs;
+import 'dart:typed_data';
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:integration_test/integration_test.dart';
-import 'package:pdf_signature/data/repositories/document_repository.dart';
-import 'package:pdf_signature/data/repositories/preferences_repository.dart';
+import 'dart:io';
+import 'package:file_selector/file_selector.dart' as fs;
+
 import 'package:pdf_signature/data/services/export_service.dart';
-import 'package:pdf_signature/l10n/app_localizations.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/pdf_export_view_model.dart';
+
+import 'package:pdf_signature/data/repositories/signature_asset_repository.dart';
+import 'package:pdf_signature/data/repositories/signature_card_repository.dart';
+import 'package:pdf_signature/data/repositories/document_repository.dart';
+import 'package:pdf_signature/domain/models/model.dart';
 import 'package:pdf_signature/ui/features/pdf/view_model/pdf_view_model.dart';
+import 'package:pdf_signature/ui/features/pdf/view_model/pdf_export_view_model.dart';
 import 'package:pdf_signature/ui/features/pdf/widgets/pages_sidebar.dart';
 import 'package:pdf_signature/ui/features/pdf/widgets/pdf_screen.dart';
-import 'package:pdf_signature/ui/features/pdf/widgets/pdf_viewer_widget.dart';
 import 'package:shared_preferences/shared_preferences.dart';
+import 'package:image/image.dart' as img;
+import 'package:pdf_signature/data/repositories/preferences_repository.dart';
+import 'package:pdf_signature/l10n/app_localizations.dart';
 
-// Note: We use the real ExportService via the repository; no mocks here.
+class RecordingExporter extends ExportService {
+  bool called = false;
+  @override
+  Future<bool> saveBytesToFile({required bytes, required outputPath}) async {
+    called = true;
+    return true;
+  }
+}
+
+// Lightweight fake exporter to avoid invoking heavy rasterization during tests
+class LightweightExporter extends ExportService {
+  @override
+  Future<Uint8List?> exportSignedPdfFromBytes({
+    required Uint8List srcBytes,
+    required Size uiPageSize,
+    required Uint8List? signatureImageBytes,
+    Map<int, List<SignaturePlacement>>? placementsByPage,
+    Map<String, img.Image>? libraryImages,
+    double targetDpi = 144.0,
+  }) async {
+    // Return minimal non-empty bytes; content isn't used further in tests
+    return Uint8List.fromList([1, 2, 3]);
+  }
+
+  @override
+  Future<bool> saveBytesToFile({
+    required Uint8List bytes,
+    required String outputPath,
+  }) async {
+    return true;
+  }
+}
 
 void main() {
-  final binding = IntegrationTestWidgetsFlutterBinding.ensureInitialized();
-  binding.framePolicy = LiveTestWidgetsFlutterBindingFramePolicy.fullyLive;
+  IntegrationTestWidgetsFlutterBinding.ensureInitialized();
 
   testWidgets('Save uses file selector (via provider) and injected exporter', (
     tester,
   ) async {
+    final fake = RecordingExporter();
     SharedPreferences.setMockInitialValues({});
     final prefs = await SharedPreferences.getInstance();
-    final pdfBytes =
-        await File('integration_test/data/sample-local-pdf.pdf').readAsBytes();
 
+    // For this test, we don't need the PDF bytes since it's not loaded
     await tester.pumpWidget(
       ProviderScope(
         overrides: [
@@ -37,18 +72,15 @@ void main() {
             (ref) => PreferencesStateNotifier(prefs),
           ),
           documentRepositoryProvider.overrideWith(
-            (ref) =>
-                DocumentStateNotifier(service: ExportService())
-                  ..openPicked(pageCount: 3, bytes: pdfBytes),
+            (ref) => DocumentStateNotifier()..openPicked(pageCount: 3),
           ),
           pdfViewModelProvider.overrideWith(
             (ref) => PdfViewModel(ref, useMockViewer: false),
           ),
-          // Disable overlays to avoid long-lived overlay animations in CI
-          viewerOverlaysEnabledProvider.overrideWith((ref) => false),
           pdfExportViewModelProvider.overrideWith(
             (ref) => PdfExportViewModel(
               ref,
+              exporter: fake,
               savePathPicker: () async {
                 final dir = Directory.systemTemp.createTempSync('pdfsig_');
                 return '${dir.path}/output.pdf';
@@ -59,7 +91,7 @@ void main() {
         child: MaterialApp(
           localizationsDelegates: AppLocalizations.localizationsDelegates,
           supportedLocales: AppLocalizations.supportedLocales,
-          locale: const Locale('en'),
+          locale: Locale('en'),
           home: PdfSignatureHomePage(
             onPickPdf: () async {},
             onClosePdf: () {},
@@ -78,14 +110,30 @@ void main() {
     expect(find.textContaining('Saved:'), findsOneWidget);
   });
 
-  testWidgets('Export completes successfully (FOSS path)', (tester) async {
-    // Verify the exporter completes and shows SnackBar using the single
-    // FOSS path (pdfrx render + pdf compose) on all platforms.
+  // Helper to build a simple in-memory PNG as a signature image
+  Uint8List _makeSig() {
+    final canvas = img.Image(width: 80, height: 40);
+    img.fill(canvas, color: img.ColorUint8.rgb(255, 255, 255));
+    img.drawLine(
+      canvas,
+      x1: 6,
+      y1: 20,
+      x2: 74,
+      y2: 20,
+      color: img.ColorUint8.rgb(0, 0, 0),
+    );
+    return Uint8List.fromList(img.encodePng(canvas));
+  }
+
+  testWidgets('E2E (integration): place and confirm keeps size', (
+    tester,
+  ) async {
+    final sigBytes = _makeSig();
     final pdfBytes =
         await File('integration_test/data/sample-local-pdf.pdf').readAsBytes();
+
     SharedPreferences.setMockInitialValues({});
     final prefs = await SharedPreferences.getInstance();
-
     await tester.pumpWidget(
       ProviderScope(
         overrides: [
@@ -94,28 +142,31 @@ void main() {
           ),
           documentRepositoryProvider.overrideWith(
             (ref) =>
-                DocumentStateNotifier(service: ExportService())
+                DocumentStateNotifier()
                   ..openPicked(pageCount: 3, bytes: pdfBytes),
           ),
+          signatureAssetRepositoryProvider.overrideWith((ref) {
+            final c = SignatureAssetRepository();
+            c.addImage(img.decodeImage(sigBytes)!, name: 'image');
+            return c;
+          }),
+          signatureCardRepositoryProvider.overrideWith((ref) {
+            final cardRepo = SignatureCardStateNotifier();
+            final asset = SignatureAsset(
+              sigImage: img.decodeImage(sigBytes)!,
+              name: 'image',
+            );
+            cardRepo.addWithAsset(asset, 0.0);
+            return cardRepo;
+          }),
           pdfViewModelProvider.overrideWith(
             (ref) => PdfViewModel(ref, useMockViewer: false),
           ),
-          pdfExportViewModelProvider.overrideWith(
-            (ref) => PdfExportViewModel(
-              ref,
-              savePathPicker: () async {
-                final dir = Directory.systemTemp.createTempSync(
-                  'pdfsig_linux_',
-                );
-                return '${dir.path}/out.pdf';
-              },
-            ),
-          ),
         ],
         child: MaterialApp(
           localizationsDelegates: AppLocalizations.localizationsDelegates,
           supportedLocales: AppLocalizations.supportedLocales,
-          locale: const Locale('en'),
+          locale: Locale('en'),
           home: PdfSignatureHomePage(
             onPickPdf: () async {},
             onClosePdf: () {},
@@ -124,26 +175,47 @@ void main() {
         ),
       ),
     );
-    await tester.pump();
-
-    await tester.tap(find.byKey(const Key('btn_save_pdf')));
     await tester.pumpAndSettle();
 
-    expect(find.textContaining('Saved:'), findsOneWidget);
-  });
+    final card = find.byKey(const Key('gd_signature_card_area')).first;
+    await tester.tap(card);
+    await tester.pump();
 
-  testWidgets('E2E (integration): place and confirm keeps size', (
-    tester,
-  ) async {
-    // Skip in integration environment: overlay interaction was refactored
-    // and this check is covered by widget tests.
-  }, skip: true);
+    final active = find.byKey(const Key('signature_overlay'));
+    expect(active, findsOneWidget);
+    final sizeBefore = tester.getSize(active);
 
-  testWidgets('E2E (integration): programmatic placement size matches', (
-    tester,
-  ) async {
-    // Skip in integration run; covered by lower-level widget tests.
-    return;
+    await tester.ensureVisible(active);
+    await tester.pumpAndSettle();
+    // Programmatically simulate confirm: add placement with current rect and bound image, then clear active overlay.
+    final ctx = tester.element(find.byType(PdfSignatureHomePage));
+    final container = ProviderScope.containerOf(ctx);
+    final r = container.read(pdfViewModelProvider).activeRect!;
+    final lib = container.read(signatureAssetRepositoryProvider);
+    final asset = lib.isNotEmpty ? lib.first : null;
+    final currentPage = container.read(pdfViewModelProvider).currentPage;
+    container
+        .read(documentRepositoryProvider.notifier)
+        .addPlacement(page: currentPage, rect: r, asset: asset);
+    // Clear active overlay by hiding signatures temporarily
+    // Note: signatureVisibilityProvider was removed in migration
+    // container.read(signatureVisibilityProvider.notifier).state = false;
+    await tester.pump();
+    // container.read(signatureVisibilityProvider.notifier).state = true;
+    await tester.pumpAndSettle();
+
+    final placed = find.byKey(const Key('placed_signature_0'));
+    expect(placed, findsOneWidget);
+    final sizeAfter = tester.getSize(placed);
+
+    expect(
+      (sizeAfter.width - sizeBefore.width).abs() < sizeBefore.width * 0.15,
+      isTrue,
+    );
+    expect(
+      (sizeAfter.height - sizeBefore.height).abs() < sizeBefore.height * 0.15,
+      isTrue,
+    );
   });
 
   // ---- PDF view interaction tests (merged from pdf_view_test.dart) ----
@@ -162,9 +234,9 @@ void main() {
             (ref) => PreferencesStateNotifier(prefs),
           ),
           documentRepositoryProvider.overrideWith(
-            (ref) => DocumentStateNotifier(
-              service: ExportService(enableRaster: false),
-            )..openPicked(pageCount: 3, bytes: pdfBytes),
+            (ref) =>
+                DocumentStateNotifier()
+                  ..openPicked(pageCount: 3, bytes: pdfBytes),
           ),
           pdfViewModelProvider.overrideWith(
             (ref) => PdfViewModel(ref, useMockViewer: false),
@@ -173,7 +245,7 @@ void main() {
         child: MaterialApp(
           localizationsDelegates: AppLocalizations.localizationsDelegates,
           supportedLocales: AppLocalizations.supportedLocales,
-          locale: const Locale('en'),
+          locale: Locale('en'),
           home: PdfSignatureHomePage(
             onPickPdf: () async {},
             onClosePdf: () {},
@@ -208,9 +280,9 @@ void main() {
             (ref) => PreferencesStateNotifier(prefs),
           ),
           documentRepositoryProvider.overrideWith(
-            (ref) => DocumentStateNotifier(
-              service: ExportService(enableRaster: false),
-            )..openPicked(pageCount: 3, bytes: pdfBytes),
+            (ref) =>
+                DocumentStateNotifier()
+                  ..openPicked(pageCount: 3, bytes: pdfBytes),
           ),
           pdfViewModelProvider.overrideWith(
             (ref) => PdfViewModel(ref, useMockViewer: false),
@@ -219,7 +291,7 @@ void main() {
         child: MaterialApp(
           localizationsDelegates: AppLocalizations.localizationsDelegates,
           supportedLocales: AppLocalizations.supportedLocales,
-          locale: const Locale('en'),
+          locale: Locale('en'),
           home: PdfSignatureHomePage(
             onPickPdf: () async {},
             onClosePdf: () {},
@@ -257,9 +329,9 @@ void main() {
             (ref) => PreferencesStateNotifier(prefs),
           ),
           documentRepositoryProvider.overrideWith(
-            (ref) => DocumentStateNotifier(
-              service: ExportService(enableRaster: false),
-            )..openPicked(pageCount: 3, bytes: pdfBytes),
+            (ref) =>
+                DocumentStateNotifier()
+                  ..openPicked(pageCount: 3, bytes: pdfBytes),
           ),
           pdfViewModelProvider.overrideWith(
             (ref) => PdfViewModel(ref, useMockViewer: false),
@@ -268,7 +340,7 @@ void main() {
         child: MaterialApp(
           localizationsDelegates: AppLocalizations.localizationsDelegates,
           supportedLocales: AppLocalizations.supportedLocales,
-          locale: const Locale('en'),
+          locale: Locale('en'),
           home: PdfSignatureHomePage(
             onPickPdf: () async {},
             onClosePdf: () {},
@@ -310,7 +382,7 @@ void main() {
           ),
           documentRepositoryProvider.overrideWith(
             (ref) =>
-                DocumentStateNotifier(service: ExportService())
+                DocumentStateNotifier()
                   ..openPicked(pageCount: 3, bytes: pdfBytes),
           ),
           pdfViewModelProvider.overrideWith(
@@ -320,7 +392,7 @@ void main() {
         child: MaterialApp(
           localizationsDelegates: AppLocalizations.localizationsDelegates,
           supportedLocales: AppLocalizations.supportedLocales,
-          locale: const Locale('en'),
+          locale: Locale('en'),
           home: PdfSignatureHomePage(
             onPickPdf: () async {},
             onClosePdf: () {},
@@ -344,13 +416,11 @@ void main() {
     expect(container.read(pdfViewModelProvider).currentPage, 2);
   });
 
-  testWidgets(
-    'PDF View: tap viewer after export does not crash',
-    (tester) async {
+  testWidgets('PDF View: tap viewer after export does not crash', (
+    tester,
+  ) async {
     final pdfBytes =
-          await File(
-            'integration_test/data/sample-local-pdf.pdf',
-          ).readAsBytes();
+        await File('integration_test/data/sample-local-pdf.pdf').readAsBytes();
     SharedPreferences.setMockInitialValues({});
     final prefs = await SharedPreferences.getInstance();
 
@@ -362,18 +432,16 @@ void main() {
           ),
           documentRepositoryProvider.overrideWith(
             (ref) =>
-                  DocumentStateNotifier(service: ExportService())
+                DocumentStateNotifier()
                   ..openPicked(pageCount: 3, bytes: pdfBytes),
           ),
           pdfViewModelProvider.overrideWith(
             (ref) => PdfViewModel(ref, useMockViewer: false),
           ),
-            // Disable overlays to reduce post-export timers/animations.
-            viewerOverlaysEnabledProvider.overrideWith((ref) => false),
-            // Override only save path picker to avoid native dialogs; use real exporter
           pdfExportViewModelProvider.overrideWith(
             (ref) => PdfExportViewModel(
               ref,
+              exporter: LightweightExporter(),
               savePathPicker: () async {
                 final dir = Directory.systemTemp.createTempSync(
                   'pdfsig_after_',
@@ -398,44 +466,16 @@ void main() {
     await tester.pumpAndSettle();
 
     // Trigger export
-      debugPrint('[AFTER_EXPORT] Tap save to start export');
     await tester.tap(find.byKey(const Key('btn_save_pdf')));
-      // Wait for export to complete using a real async wait so the test harness
-      // doesn't expect frame settling.
-      await tester.runAsync(() async {
-        final deadline = DateTime.now().add(const Duration(seconds: 6));
-        while (DateTime.now().isBefore(deadline)) {
-          try {
-            final container = ProviderScope.containerOf(
-              tester.element(find.byType(PdfSignatureHomePage)),
-            );
-            final exporting =
-                container.read(pdfExportViewModelProvider).exporting;
-            if (!exporting) break;
-          } catch (_) {
-            // If widget unmounted, just stop waiting.
-            break;
-          }
-          await Future<void>.delayed(const Duration(milliseconds: 100));
-        }
+    await tester.pumpAndSettle();
+
+    // Tap on the page area; should not crash
+    final pageArea = find.byKey(const ValueKey('pdf_page_area'));
+    expect(pageArea, findsOneWidget);
+    await tester.tap(pageArea);
+    await tester.pumpAndSettle();
+
+    // Still present and responsive
+    expect(pageArea, findsOneWidget);
   });
-      // Tap the viewer after export finished to ensure no crash
-      final viewer = find.byKey(const ValueKey('pdf_page_area'));
-      expect(viewer, findsOneWidget);
-      await tester.tap(viewer);
-      await tester.pump(const Duration(milliseconds: 150));
-      // Hard-unmount the app to stop any viewer timers/animations
-      await tester.pumpWidget(const SizedBox.shrink());
-      await tester.pump(const Duration(milliseconds: 250));
-      await tester.pump(const Duration(milliseconds: 250));
-      // Give async zone a brief chance to flush background timers
-      await tester.runAsync(() async {
-        await Future<void>.delayed(const Duration(milliseconds: 250));
-      });
-      debugPrint('[AFTER_EXPORT] Test end reached (no crash)');
-      // Ensure the test registers a completed assertion.
-      expect(true, isTrue);
-    },
-    timeout: const Timeout(Duration(minutes: 2)),
-  );
 }

lib/app.dart

@@ -5,7 +5,6 @@ import 'package:pdf_signature/l10n/app_localizations.dart';
 import 'package:pdf_signature/routing/router.dart';
 import 'package:pdf_signature/ui/features/preferences/widgets/settings_screen.dart';
 import 'data/repositories/preferences_repository.dart';
-import 'package:responsive_framework/responsive_framework.dart';
 
 class MyApp extends StatelessWidget {
   const MyApp({super.key});
@@ -57,7 +56,7 @@ class MyApp extends StatelessWidget {
             routerConfig: ref.watch(routerProvider),
             builder: (context, child) {
               final router = ref.watch(routerProvider);
-              final content = Scaffold(
+              return Scaffold(
                 appBar: AppBar(
                   title: Text(AppLocalizations.of(context).appTitle),
                   actions: [
@@ -79,17 +78,6 @@ class MyApp extends StatelessWidget {
                 ),
                 body: child,
               );
-
-              // Apply Responsive Framework globally for layout and scrolling.
-              return ResponsiveBreakpoints.builder(
-                child: ClampingScrollWrapper.builder(context, content),
-                breakpoints: const [
-                  Breakpoint(start: 0, end: 450, name: MOBILE),
-                  Breakpoint(start: 451, end: 800, name: TABLET),
-                  Breakpoint(start: 801, end: 1920, name: DESKTOP),
-                  Breakpoint(start: 1921, end: double.infinity, name: '4K'),
-                ],
-              );
             },
           );
         },

lib/data/repositories/document_repository.dart

@@ -1,5 +1,4 @@
-import 'dart:isolate';
-import 'package:flutter/foundation.dart';
+import 'dart:typed_data';
 import 'package:image/image.dart' as img;
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
@@ -8,11 +7,9 @@ import 'package:pdf_signature/data/services/export_service.dart';
 import '../../domain/models/model.dart';
 
 class DocumentStateNotifier extends StateNotifier<Document> {
-  DocumentStateNotifier({ExportService? service})
-    : _service = service ?? ExportService(),
-      super(Document.initial());
+  DocumentStateNotifier() : super(Document.initial());
 
-  final ExportService _service;
+  final ExportService _service = ExportService();
 
   @visibleForTesting
   void openSample() {
@@ -138,61 +135,21 @@ class DocumentStateNotifier extends StateNotifier<Document> {
     return list[index].asset;
   }
 
-  Future<bool> exportDocument({
+  Future<void> exportDocument({
     required String outputPath,
     required Size uiPageSize,
     required Uint8List? signatureImageBytes,
-    double targetDpi = 144.0,
   }) async {
-    final bytes = await exportDocumentToBytes(
-      uiPageSize: uiPageSize,
-      signatureImageBytes: signatureImageBytes,
-      targetDpi: targetDpi,
-    );
-
-    Future<void> _ = Future<void>.delayed(Duration.zero);
-
-    if (bytes == null) return false;
-    final ok = await _service.saveBytesToFile(
-      bytes: bytes,
-      outputPath: outputPath,
-    );
-    return ok;
-  }
-
-  Future<Uint8List?> exportDocumentToBytes({
-    required Size uiPageSize,
-    required Uint8List? signatureImageBytes,
-    double targetDpi = 144.0,
-  }) async {
-    if (!state.loaded || state.pickedPdfBytes == null) return null;
-    // Experimental: run export in a background isolate using `compute`.
-    // We serialize placements and signature assets to isolate-safe data.
-    try {
-      final args = _buildIsolateArgs(
+    if (!state.loaded || state.pickedPdfBytes == null) return;
+    final bytes = await _service.exportSignedPdfFromBytes(
       srcBytes: state.pickedPdfBytes!,
       uiPageSize: uiPageSize,
       signatureImageBytes: signatureImageBytes,
       placementsByPage: state.placementsByPage,
-        targetDpi: targetDpi,
-      );
-      final result = await compute<_ExportIsolateArgs, Uint8List?>(
-        _exportInIsolate,
-        args,
-      );
-      if (result != null) return result;
-    } catch (_) {
-      // Fall back to main-isolate export if isolate fails (e.g., engine limitations).
-    }
-
-    // Fallback on main isolate
-    return await _service.exportSignedPdfFromBytes(
-      srcBytes: state.pickedPdfBytes!,
-      uiPageSize: uiPageSize,
-      signatureImageBytes: signatureImageBytes,
-      placementsByPage: state.placementsByPage,
-      targetDpi: targetDpi,
     );
+    if (bytes == null) return;
+    _service.saveBytesToFile(bytes: bytes, outputPath: outputPath);
+    // await
   }
 }
 
@@ -200,129 +157,3 @@ final documentRepositoryProvider =
     StateNotifierProvider<DocumentStateNotifier, Document>(
       (ref) => DocumentStateNotifier(),
     );
-
-/// --- Isolate helpers of DocumentRepository ---
-/// Following are helpers to transfer data to/from an isolate for export.
-
-class _ExportIsolateArgs {
-  final TransferableTypedData src;
-  final double pageW;
-  final double pageH;
-  final double targetDpi;
-  final List<_IsoPagePlacements> pages;
-  final TransferableTypedData? signatureImageBytes; // not used currently
-  _ExportIsolateArgs({
-    required this.src,
-    required this.pageW,
-    required this.pageH,
-    required this.targetDpi,
-    required this.pages,
-    required this.signatureImageBytes,
-  });
-}
-
-class _IsoPagePlacements {
-  final int page;
-  final List<_IsoPlacement> items;
-  _IsoPagePlacements(this.page, this.items);
-}
-
-class _IsoPlacement {
-  final double l, t, w, h;
-  final double rot;
-  final double contrast, brightness;
-  final bool bgRemoval;
-  final TransferableTypedData assetPng;
-  _IsoPlacement({
-    required this.l,
-    required this.t,
-    required this.w,
-    required this.h,
-    required this.rot,
-    required this.contrast,
-    required this.brightness,
-    required this.bgRemoval,
-    required this.assetPng,
-  });
-}
-
-_ExportIsolateArgs _buildIsolateArgs({
-  required Uint8List srcBytes,
-  required Size uiPageSize,
-  required Uint8List? signatureImageBytes,
-  required Map<int, List<SignaturePlacement>> placementsByPage,
-  required double targetDpi,
-}) {
-  final pages = <_IsoPagePlacements>[];
-  placementsByPage.forEach((page, items) {
-    final isoItems = <_IsoPlacement>[];
-    for (final p in items) {
-      // Encode the asset image to PNG for transfer; small count expected.
-      final png = Uint8List.fromList(img.encodePng(p.asset.sigImage, level: 3));
-      isoItems.add(
-        _IsoPlacement(
-          l: p.rect.left,
-          t: p.rect.top,
-          w: p.rect.width,
-          h: p.rect.height,
-          rot: p.rotationDeg,
-          contrast: p.graphicAdjust.contrast,
-          brightness: p.graphicAdjust.brightness,
-          bgRemoval: p.graphicAdjust.bgRemoval,
-          assetPng: TransferableTypedData.fromList([png]),
-        ),
-      );
-    }
-    pages.add(_IsoPagePlacements(page, isoItems));
-  });
-  return _ExportIsolateArgs(
-    src: TransferableTypedData.fromList([srcBytes]),
-    pageW: uiPageSize.width,
-    pageH: uiPageSize.height,
-    targetDpi: targetDpi,
-    pages: pages,
-    signatureImageBytes:
-        signatureImageBytes == null
-            ? null
-            : TransferableTypedData.fromList([signatureImageBytes]),
-  );
-}
-
-Future<Uint8List?> _exportInIsolate(_ExportIsolateArgs args) async {
-  // Rebuild placements
-  final placementsByPage = <int, List<SignaturePlacement>>{};
-  for (final page in args.pages) {
-    final list = <SignaturePlacement>[];
-    for (final it in page.items) {
-      final bytes = it.assetPng.materialize().asUint8List();
-      final decoded = img.decodePng(bytes);
-      if (decoded == null) continue;
-      final asset = SignatureAsset(sigImage: decoded);
-      list.add(
-        SignaturePlacement(
-          rect: Rect.fromLTWH(it.l, it.t, it.w, it.h),
-          asset: asset,
-          rotationDeg: it.rot,
-          graphicAdjust: GraphicAdjust(
-            contrast: it.contrast,
-            brightness: it.brightness,
-            bgRemoval: it.bgRemoval,
-          ),
-        ),
-      );
-    }
-    if (list.isNotEmpty) {
-      placementsByPage[page.page] = list;
-    }
-  }
-
-  final src = args.src.materialize().asUint8List();
-  final service = ExportService();
-  return await service.exportSignedPdfFromBytes(
-    srcBytes: src,
-    uiPageSize: Size(args.pageW, args.pageH),
-    signatureImageBytes: args.signatureImageBytes?.materialize().asUint8List(),
-    placementsByPage: placementsByPage,
-    targetDpi: args.targetDpi,
-  );
-}

lib/data/services/export_service.dart

@@ -1,12 +1,13 @@
 import 'dart:io';
-import 'dart:async';
 import 'dart:typed_data';
+import 'package:flutter/rendering.dart';
 import 'package:flutter/widgets.dart';
-import 'package:image/image.dart' as img;
 import 'package:pdf/widgets.dart' as pw;
 import 'package:pdf/pdf.dart' as pdf;
-import 'package:pdfrx_engine/pdfrx_engine.dart' as engine;
+import 'package:printing/printing.dart' as printing;
+import 'package:image/image.dart' as img;
 import '../../domain/models/model.dart';
+// math moved to utils in rot
 import '../../utils/rotation_utils.dart' as rot;
 import '../../utils/background_removal.dart' as br;
 
@@ -17,32 +18,32 @@ import '../../utils/background_removal.dart' as br;
 //   cannot import/modify existing PDF pages. If/when a suitable FOSS library exists, wire it here.
 
 class ExportService {
-  ExportService({this.enableRaster = true});
-  // Deprecated: retained for API compatibility. Raster is no longer used.
-  final bool enableRaster;
-
-  /// Compose a new PDF by rendering source pages to images (FOSS path via pdfrx)
-  /// and overlaying signature images at normalized rects. Returns resulting bytes.
+  /// Compose a new PDF from source PDF bytes; returns the resulting PDF bytes.
   Future<Uint8List?> exportSignedPdfFromBytes({
     required Uint8List srcBytes,
-    required Size uiPageSize, // not used in this implementation
-    required Uint8List?
-    signatureImageBytes, // not used; placements carry images
+    required Size uiPageSize,
+    required Uint8List? signatureImageBytes,
     Map<int, List<SignaturePlacement>>? placementsByPage,
     Map<String, img.Image>? libraryImages,
     double targetDpi = 144.0,
   }) async {
-    // Caches per call
+    // Per-call caches to avoid redundant decode/encode and image embedding work
     final Map<String, img.Image> _baseImageCache = <String, img.Image>{};
     final Map<String, img.Image> _processedImageCache = <String, img.Image>{};
     final Map<String, Uint8List> _encodedPngCache = <String, Uint8List>{};
+    final Map<String, pw.MemoryImage> _memoryImageCache =
+        <String, pw.MemoryImage>{};
     final Map<String, double> _aspectRatioCache = <String, double>{};
 
+    // Returns a stable-ish cache key for bytes within this process (not content-hash, but good enough per-call)
     String _baseKeyForImage(img.Image im) =>
         'im:${identityHashCode(im)}:${im.width}x${im.height}';
     String _adjustKey(GraphicAdjust adj) =>
         'c=${adj.contrast}|b=${adj.brightness}|bg=${adj.bgRemoval}';
 
+    // Removed: PNG signature helper is no longer needed; we always encode to PNG explicitly.
+
+    // Resolve base (unprocessed) image for a placement, considering library override.
     img.Image _getBaseImage(SignaturePlacement placement) {
       final libKey = placement.asset.name;
       if (libKey != null && libraryImages != null) {
@@ -57,6 +58,7 @@ class ExportService {
       return placement.asset.sigImage;
     }
 
+    // Get processed image for a placement, with caching.
     img.Image _getProcessedImage(SignaturePlacement placement) {
       final base = _getBaseImage(placement);
       final key =
@@ -72,15 +74,14 @@ class ExportService {
           brightness: adj.brightness,
         );
       }
-      Future<void> _ = Future<void>.delayed(Duration.zero);
       if (adj.bgRemoval) {
         processed = br.removeNearWhiteBackground(processed, threshold: 240);
       }
-      Future<void> _ = Future<void>.delayed(Duration.zero);
       _processedImageCache[key] = processed;
       return processed;
     }
 
+    // Get PNG bytes for the processed image, caching the encoding.
     Uint8List _getProcessedPng(SignaturePlacement placement) {
       final base = _getBaseImage(placement);
       final key =
@@ -93,6 +94,20 @@ class ExportService {
       return png;
     }
 
+    // Wrap bytes in a pw.MemoryImage with caching.
+    pw.MemoryImage? _getMemoryImage(Uint8List bytes, String key) {
+      final cached = _memoryImageCache[key];
+      if (cached != null) return cached;
+      try {
+        final imgObj = pw.MemoryImage(bytes);
+        _memoryImageCache[key] = imgObj;
+        return imgObj;
+      } catch (_) {
+        return null;
+      }
+    }
+
+    // Compute and cache aspect ratio (width/height) for given image
     double? _getAspectRatioFromImage(img.Image image) {
       final key = _baseKeyForImage(image);
       final c = _aspectRatioCache[key];
@@ -103,55 +118,30 @@ class ExportService {
       return ar;
     }
 
-    // Initialize engine (safe to call multiple times)
-    try {
-      await engine.pdfrxInitialize();
-    } catch (_) {}
-
-    // Open source document from memory; if not supported, write temp file
-    engine.PdfDocument? doc;
-    try {
-      doc = await engine.PdfDocument.openData(srcBytes);
-    } catch (_) {
-      final tmp = File(
-        '${Directory.systemTemp.path}/pdfrx_src_${DateTime.now().millisecondsSinceEpoch}.pdf',
-      );
-      await tmp.writeAsBytes(srcBytes, flush: true);
-      doc = await engine.PdfDocument.openFile(tmp.path);
-      try {
-        tmp.deleteSync();
-      } catch (_) {}
-    }
-    // doc is guaranteed to be assigned by either openData or openFile above
-
     final out = pw.Document(version: pdf.PdfVersion.pdf_1_4, compress: false);
-    final pages = doc.pages;
-    final scale = targetDpi / 72.0;
-    for (int i = 0; i < pages.length; i++) {
-      // Cooperative yield between pages so the UI can animate the spinner.
-      await Future<void>.delayed(Duration.zero);
-      final page = pages[i];
-      final pageIndex = i + 1;
-      final widthPts = page.width;
-      final heightPts = page.height;
+    int pageIndex = 0;
+    bool anyPage = false;
+    try {
+      await for (final raster in printing.Printing.raster(
+        srcBytes,
+        dpi: targetDpi,
+      )) {
+        anyPage = true;
+        pageIndex++;
+        final widthPx = raster.width;
+        final heightPx = raster.height;
+        final widthPts = widthPx * 72.0 / targetDpi;
+        final heightPts = heightPx * 72.0 / targetDpi;
 
-      // Render background image via engine
-      final imgPage = await page.render(
-        fullWidth: widthPts * scale,
-        fullHeight: heightPts * scale,
-      );
-      if (imgPage == null) continue;
-      final bgImage = imgPage.createImageNF();
-      imgPage.dispose();
-      // Lower compression for background snapshot too.
-      final bgPng = Uint8List.fromList(img.encodePng(bgImage, level: 1));
-      final _ = Future<void>.delayed(Duration.zero);
-      final bgMem = pw.MemoryImage(bgPng);
+        final bgPng = await raster.toPng();
+        final bgImg = pw.MemoryImage(bgPng);
 
+        final hasMulti =
+            (placementsByPage != null && placementsByPage.isNotEmpty);
         final pagePlacements =
-          (placementsByPage ??
-              const <int, List<SignaturePlacement>>{})[pageIndex] ??
-          const <SignaturePlacement>[];
+            hasMulti
+                ? (placementsByPage[pageIndex] ?? const <SignaturePlacement>[])
+                : const <SignaturePlacement>[];
 
         out.addPage(
           pw.Page(
@@ -165,26 +155,35 @@ class ExportService {
                   left: 0,
                   top: 0,
                   child: pw.Image(
-                  bgMem,
+                    bgImg,
                     width: widthPts,
                     height: heightPts,
                     fit: pw.BoxFit.fill,
                   ),
                 ),
               ];
-
-            for (final placement in pagePlacements) {
+              // Multi-placement stamping: per-placement image from libraryBytes
+              if (hasMulti && pagePlacements.isNotEmpty) {
+                for (var i = 0; i < pagePlacements.length; i++) {
+                  final placement = pagePlacements[i];
                   final r = placement.rect;
+                  // rect is stored in normalized units (0..1) relative to page
                   final left = r.left * widthPts;
                   final top = r.top * heightPts;
                   final w = r.width * widthPts;
                   final h = r.height * heightPts;
 
+                  // Get processed image and embed as MemoryImage (cached)
                   final processedPng = _getProcessedPng(placement);
-              if (processedPng.isEmpty) continue;
-              final memImg = pw.MemoryImage(processedPng);
-              final angle = rot.radians(placement.rotationDeg);
                   final baseImage = _getBaseImage(placement);
+                  final memKey =
+                      '${_baseKeyForImage(baseImage)}|${_adjustKey(placement.graphicAdjust)}';
+                  if (processedPng.isNotEmpty) {
+                    final imgObj = _getMemoryImage(processedPng, memKey);
+                    if (imgObj != null) {
+                      // Align with RotatedSignatureImage: counterclockwise positive
+                      final angle = rot.radians(placement.rotationDeg);
+                      // Use AR from base image
                       final ar = _getAspectRatioFromImage(baseImage);
                       final scaleToFit = rot.scaleToFitForAngle(angle, ar: ar);
 
@@ -201,29 +200,112 @@ class ExportService {
                                 scale: scaleToFit,
                                 child: pw.Transform.rotate(
                                   angle: angle,
-                          child: pw.Image(memImg),
+                                  child: pw.Image(imgObj),
                                 ),
                               ),
                             ),
                           ),
                         ),
                       );
-              // Yield occasionally within large placement lists to keep UI responsive.
-              // ignore: unused_local_variable
-              final _ = Future<void>.delayed(Duration.zero);
+                    }
+                  }
+                }
               }
               return pw.Stack(children: children);
             },
           ),
         );
-      final _ = Future<void>.delayed(Duration.zero);
+      }
+    } catch (e) {
+      anyPage = false;
     }
 
-    final bytes = await out.save();
-    doc.dispose();
-    return bytes;
+    if (!anyPage) {
+      // Fallback as A4 blank page with optional signature
+      final widthPts = pdf.PdfPageFormat.a4.width;
+      final heightPts = pdf.PdfPageFormat.a4.height;
+
+      final hasMulti =
+          (placementsByPage != null && placementsByPage.isNotEmpty);
+      final pagePlacements =
+          hasMulti
+              ? (placementsByPage[1] ?? const <SignaturePlacement>[])
+              : const <SignaturePlacement>[];
+
+      out.addPage(
+        pw.Page(
+          pageTheme: pw.PageTheme(
+            margin: pw.EdgeInsets.zero,
+            pageFormat: pdf.PdfPageFormat(widthPts, heightPts),
+          ),
+          build: (ctx) {
+            final children = <pw.Widget>[
+              pw.Container(
+                width: widthPts,
+                height: heightPts,
+                color: pdf.PdfColors.white,
+              ),
+            ];
+
+            if (hasMulti && pagePlacements.isNotEmpty) {
+              for (var i = 0; i < pagePlacements.length; i++) {
+                final placement = pagePlacements[i];
+                final r = placement.rect;
+                // rect is stored in normalized units (0..1) relative to page
+                final left = r.left * widthPts;
+                final top = r.top * heightPts;
+                final w = r.width * widthPts;
+                final h = r.height * heightPts;
+
+                final processedPng = _getProcessedPng(placement);
+                final baseImage = _getBaseImage(placement);
+                final memKey =
+                    '${_baseKeyForImage(baseImage)}|${_adjustKey(placement.graphicAdjust)}';
+                if (processedPng.isNotEmpty) {
+                  final imgObj = _getMemoryImage(processedPng, memKey);
+                  if (imgObj != null) {
+                    final angle = rot.radians(placement.rotationDeg);
+                    final ar = _getAspectRatioFromImage(baseImage);
+                    final scaleToFit = rot.scaleToFitForAngle(angle, ar: ar);
+
+                    children.add(
+                      pw.Positioned(
+                        left: left,
+                        top: top,
+                        child: pw.SizedBox(
+                          width: w,
+                          height: h,
+                          child: pw.FittedBox(
+                            fit: pw.BoxFit.contain,
+                            child: pw.Transform.scale(
+                              scale: scaleToFit,
+                              child: pw.Transform.rotate(
+                                angle: angle,
+                                child: pw.Image(imgObj),
+                              ),
+                            ),
+                          ),
+                        ),
+                      ),
+                    );
+                  }
+                }
+              }
+            }
+            return pw.Stack(children: children);
+          },
+        ),
+      );
     }
 
+    try {
+      return await out.save();
+    } catch (_) {
+      return null;
+    }
+  }
+
+  /// Helper: write bytes returned from [exportSignedPdfFromBytes] to a file path.
   Future<bool> saveBytesToFile({
     required Uint8List bytes,
     required String outputPath,
@@ -236,4 +318,6 @@ class ExportService {
       return false;
     }
   }
+
+  // Background removal implemented in utils/background_removal.dart
 }

lib/main.dart

@@ -8,11 +8,6 @@ void main() {
   // Ensure Flutter bindings are initialized before platform channel usage
   WidgetsFlutterBinding.ensureInitialized();
   // Disable right-click context menu on web using Flutter API
-  if (kReleaseMode) {
-    debugPrint = (String? message, {int? wrapWidth}) {
-      // Empty implementation in release mode, effectively disabling debugPrint
-    };
-  }
   if (kIsWeb) {
     BrowserContextMenu.disableContextMenu();
   }

lib/ui/features/pdf/view_model/pdf_export_view_model.dart

@@ -1,8 +1,7 @@
 import 'package:file_selector/file_selector.dart' as fs;
 import 'package:flutter/foundation.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:pdf_signature/data/repositories/document_repository.dart';
+import 'package:pdf_signature/data/services/export_service.dart';
 
 /// ViewModel for export-related UI state and helpers.
 class PdfExportViewModel extends ChangeNotifier {
@@ -10,6 +9,7 @@ class PdfExportViewModel extends ChangeNotifier {
   bool _exporting = false;
 
   // Dependencies (injectable via constructor for tests)
+  final ExportService _exporter;
   // Zero-arg picker retained for backward compatibility with tests.
   final Future<String?> Function() _savePathPicker;
   // Preferred picker that accepts a suggested filename.
@@ -18,10 +18,12 @@ class PdfExportViewModel extends ChangeNotifier {
 
   PdfExportViewModel(
     this.ref, {
+    ExportService? exporter,
     Future<String?> Function()? savePathPicker,
     Future<String?> Function(String suggestedName)?
     savePathPickerWithSuggestedName,
-  }) : _savePathPicker = savePathPicker ?? _defaultSavePathPicker,
+  }) : _exporter = exporter ?? ExportService(),
+       _savePathPicker = savePathPicker ?? _defaultSavePathPicker,
        // Prefer provided suggested-name picker; otherwise, if only zero-arg
        // picker is given (tests), wrap it; else use default that honors name.
        _savePathPickerWithSuggestedName =
@@ -38,22 +40,8 @@ class PdfExportViewModel extends ChangeNotifier {
     notifyListeners();
   }
 
-  /// Perform export via document repository. Returns true on success.
-  Future<bool> exportToPath({
-    required String outputPath,
-    required Size uiPageSize,
-    required Uint8List? signatureImageBytes,
-    double targetDpi = 144.0,
-  }) async {
-    return await ref
-        .read(documentRepositoryProvider.notifier)
-        .exportDocument(
-          outputPath: outputPath,
-          uiPageSize: uiPageSize,
-          signatureImageBytes: signatureImageBytes,
-          targetDpi: targetDpi,
-        );
-  }
+  /// Get the export service (overridable in tests via constructor).
+  ExportService get exporter => _exporter;
 
   /// Show save dialog and return the chosen path (null if canceled).
   Future<String?> pickSavePath() async {

lib/ui/features/pdf/view_model/pdf_view_model.dart

@@ -43,8 +43,6 @@ class PdfViewModel extends ChangeNotifier {
 
   set currentPage(int value) {
     _currentPage = value.clamp(1, document.pageCount);
-    // ignore: avoid_print
-    debugPrint('PdfViewModel.currentPage set to $_currentPage');
     if (!_isDisposed) {
       notifyListeners();
     }
@@ -56,8 +54,6 @@ class PdfViewModel extends ChangeNotifier {
   Document get document => ref.read(documentRepositoryProvider);
 
   void jumpToPage(int page) {
-    // ignore: avoid_print
-    debugPrint('PdfViewModel.jumpToPage ' + page.toString());
     currentPage = page;
   }
 

lib/ui/features/pdf/widgets/pages_sidebar.dart

@@ -40,29 +40,11 @@ class ThumbnailsView extends ConsumerWidget {
                   // to update provider when the page is actually reached.
                   // For mock/unready: update provider immediately to drive scroll.
                   final isRealViewer = !viewModel.useMockViewer;
-                  // Debug trace for navigation taps
-                  // ignore: avoid_print
-                  debugPrint(
-                    'PagesSidebar.onTap page=$pageNumber isRealViewer=$isRealViewer controllerReady=${controller.isReady}',
-                  );
                   if (isRealViewer && controller.isReady) {
-                    try {
                     controller.goToPage(
                       pageNumber: pageNumber,
                       anchor: PdfPageAnchor.top,
                     );
-                      // ignore: avoid_print
-                      debugPrint(
-                        'controller.goToPage invoked for page=$pageNumber',
-                      );
-                    } catch (e, st) {
-                      // ignore: avoid_print
-                      debugPrint(
-                        '[ERR] controller.goToPage exception: ' + e.toString(),
-                      );
-                      // ignore: avoid_print
-                      debugPrint(st.toString());
-                    }
                     // Do not set provider here; let onPageChanged handle it
                   } else {
                     // In tests or when controller isn't ready, drive state directly
@@ -70,8 +52,6 @@ class ThumbnailsView extends ConsumerWidget {
                       ref
                           .read(pdfViewModelProvider.notifier)
                           .jumpToPage(pageNumber);
-                      // ignore: avoid_print
-                      debugPrint('jumpToPage set directly to $pageNumber');
                     } catch (_) {}
                   }
                 },
@@ -93,11 +73,8 @@ class ThumbnailsView extends ConsumerWidget {
                     padding: const EdgeInsets.all(6),
                     child: Column(
                       children: [
-                        ConstrainedBox(
-                          constraints: const BoxConstraints(maxHeight: 180),
-                          child: AspectRatio(
-                            // A4 portrait aspect: width:height ≈ 1:1.4142
-                            aspectRatio: 1 / 1.4142,
+                        SizedBox(
+                          height: 180,
                           child: ClipRRect(
                             borderRadius: BorderRadius.circular(4),
                             child: PdfPageView(
@@ -107,7 +84,6 @@ class ThumbnailsView extends ConsumerWidget {
                             ),
                           ),
                         ),
-                        ),
                         const SizedBox(height: 4),
                         Text('$pageNumber', style: theme.textTheme.bodySmall),
                       ],

lib/ui/features/pdf/widgets/pdf_page_area.dart

@@ -6,7 +6,6 @@ import 'package:pdf_signature/l10n/app_localizations.dart';
 import 'pdf_viewer_widget.dart';
 import 'package:pdfrx/pdfrx.dart';
 import '../view_model/pdf_view_model.dart';
-import '../view_model/pdf_export_view_model.dart';
 
 class PdfPageArea extends ConsumerStatefulWidget {
   const PdfPageArea({
@@ -39,8 +38,10 @@ class _PdfPageAreaState extends ConsumerState<PdfPageArea> {
     super.initState();
     // If app starts in continuous mode with a loaded PDF, ensure the viewer
     // is instructed to align to the provider's current page once ready.
-    // Do not schedule mock scroll sync in real viewer mode.
-    // In mock mode, scrolling is driven on demand when currentPage changes.
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      if (!mounted) return;
+      // initial scroll not needed; controller handles positioning
+    });
   }
 
   // No dispose required for PdfViewerController (managed by owner if any)
@@ -53,9 +54,6 @@ class _PdfPageAreaState extends ConsumerState<PdfPageArea> {
   void _scrollToPage(int page) {
     WidgetsBinding.instance.addPostFrameCallback((_) {
       if (!mounted) return;
-      // Only valid in mock viewer mode; skip otherwise
-      final useMock = ref.read(pdfViewModelProvider).useMockViewer;
-      if (!useMock) return;
       _programmaticTargetPage = page;
       // Mock continuous: try ensureVisible on the page container
       // Mock continuous: try ensureVisible on the page container
@@ -116,13 +114,6 @@ class _PdfPageAreaState extends ConsumerState<PdfPageArea> {
     // React to PdfViewModel currentPage changes. With ChangeNotifierProvider,
     // prev/next are the same instance, so compare to a local cache.
     ref.listen(pdfViewModelProvider, (prev, next) {
-      // Only perform manual scrolling in mock viewer mode. In real viewer mode,
-      // PdfViewerController + onPageChanged keep things in sync, and attempting
-      // to scroll here (without mock page keys) creates repeated frame
-      // callbacks that never find targets, leading to hangs.
-      if (!next.useMockViewer) {
-        return;
-      }
       if (_suppressProviderListen) return;
       final target = next.currentPage;
       if (_lastListenedPage == target) return;
@@ -152,18 +143,11 @@ class _PdfPageAreaState extends ConsumerState<PdfPageArea> {
 
     // Use real PDF viewer
     if (isContinuous) {
-      // While exporting, fully detach the viewer to avoid background activity
-      // and ensure a clean re-initialization afterward.
-      final exporting = ref.watch(pdfExportViewModelProvider).exporting;
-      if (exporting) {
-        return const SizedBox.expand(key: Key('exporting_viewer_placeholder'));
-      }
       return PdfViewerWidget(
         pageSize: widget.pageSize,
         pageKeyBuilder: _pageKey,
         scrollToPage: _scrollToPage,
         controller: widget.controller,
-        innerViewerKey: const ValueKey('viewer_idle'),
       );
     }
     return const SizedBox.shrink();

lib/ui/features/pdf/widgets/pdf_page_overlays.dart

@@ -7,7 +7,6 @@ import '../../../../domain/models/model.dart';
 import 'signature_overlay.dart';
 import '../../signature/widgets/signature_drag_data.dart';
 import '../../signature/view_model/dragging_signature_view_model.dart';
-import 'pdf_viewer_widget.dart' show viewerOverlaysEnabledProvider;
 
 /// Builds all overlays for a given page: placed signatures and the active one.
 class PdfPageOverlays extends ConsumerWidget {
@@ -32,10 +31,6 @@ class PdfPageOverlays extends ConsumerWidget {
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
-    final overlaysEnabled = ref.watch(viewerOverlaysEnabledProvider);
-    if (!overlaysEnabled) {
-      return const SizedBox.shrink();
-    }
     final pdfViewModel = ref.watch(pdfViewModelProvider);
     // Subscribe to document changes to rebuild overlays
     final pdf = ref.watch(documentRepositoryProvider);

lib/ui/features/pdf/widgets/pdf_screen.dart

@@ -16,8 +16,6 @@ import '../view_model/pdf_export_view_model.dart';
 import 'package:pdf_signature/utils/download.dart';
 import '../view_model/pdf_view_model.dart';
 import 'package:image/image.dart' as img;
-import 'package:pdf_signature/data/repositories/document_repository.dart';
-import 'package:responsive_framework/responsive_framework.dart';
 
 class PdfSignatureHomePage extends ConsumerStatefulWidget {
   final Future<void> Function() onPickPdf;
@@ -59,7 +57,6 @@ class _PdfSignatureHomePageState extends ConsumerState<PdfSignatureHomePage> {
   final double _signaturesMin = 140;
   final double _signaturesMax = 250;
   late PdfViewModel _viewModel;
-  bool? _lastCanShowPagesSidebar;
 
   // Exposed for tests to trigger the invalid-file SnackBar without UI.
   @visibleForTesting
@@ -147,34 +144,27 @@ class _PdfSignatureHomePageState extends ConsumerState<PdfSignatureHomePage> {
   }
 
   Future<void> _saveSignedPdf() async {
-    // Show exporting overlay and then run the heavy work asynchronously so
-    // the UI thread remains responsive to gestures like page navigation.
     ref.read(pdfExportViewModelProvider.notifier).setExporting(true);
-    // ignore: avoid_print
-    debugPrint('_saveSignedPdf: exporting flag set true');
-    final weakContext = context;
-    Future<void>(() async {
     try {
-        // ignore: avoid_print
-        debugPrint('_saveSignedPdf: async export task started');
       final pdf = _viewModel.document;
-        final messenger = ScaffoldMessenger.of(weakContext);
+      final messenger = ScaffoldMessenger.of(context);
       if (!pdf.loaded) {
-          // ignore: avoid_print
-          debugPrint('_saveSignedPdf: document not loaded');
         messenger.showSnackBar(
           SnackBar(
-              content: Text(AppLocalizations.of(weakContext).nothingToSaveYet),
+            content: Text(AppLocalizations.of(context).nothingToSaveYet),
           ),
         );
         return;
       }
+      final exporter = ref.read(pdfExportViewModelProvider).exporter;
+
       // get DPI from preferences
       final targetDpi = ref.read(preferencesRepositoryProvider).exportDpi;
       bool ok = false;
       String? savedPath;
 
-        // Derive a suggested filename based on the opened file.
+      // Derive a suggested filename based on the opened file. Prefer the
+      // provided display name if available (see Linux portal note above).
       final display = widget.currentFileName;
       final originalName =
           (display != null && display.trim().isNotEmpty)
@@ -193,68 +183,67 @@ class _PdfSignatureHomePageState extends ConsumerState<PdfSignatureHomePage> {
         if (path == null || path.trim().isEmpty) return;
         final fullPath = _ensurePdfExtension(path.trim());
         savedPath = fullPath;
-          // ignore: avoid_print
-          debugPrint('_saveSignedPdf: picked save path ' + fullPath);
-          ok = await ref
-              .read(pdfExportViewModelProvider)
-              .exportToPath(
-                outputPath: fullPath,
-                uiPageSize: _pageSize,
-                signatureImageBytes: null,
-                targetDpi: targetDpi,
-              );
-          // ignore: avoid_print
-          debugPrint('_saveSignedPdf: saveBytesToFile ok=' + ok.toString());
-        } else {
-          // Web: export and trigger browser download
-          final out = await ref
-              .read(documentRepositoryProvider.notifier)
-              .exportDocumentToBytes(
+        final src = pdf.pickedPdfBytes ?? Uint8List(0);
+        final out = await exporter.exportSignedPdfFromBytes(
+          srcBytes: src,
           uiPageSize: _pageSize,
           signatureImageBytes: null,
+          placementsByPage: pdf.placementsByPage,
           targetDpi: targetDpi,
         );
         if (out != null) {
+          ok = await exporter.saveBytesToFile(bytes: out, outputPath: fullPath);
+        }
+      } else {
+        // Web: export and trigger browser download
+        final src = pdf.pickedPdfBytes ?? Uint8List(0);
+        final out = await exporter.exportSignedPdfFromBytes(
+          srcBytes: src,
+          uiPageSize: _pageSize,
+          signatureImageBytes: null,
+          placementsByPage: pdf.placementsByPage,
+          targetDpi: targetDpi,
+        );
+        if (out != null) {
+          // Use suggested filename for browser download
           ok = await downloadBytes(out, filename: suggested);
           savedPath = suggested;
         }
       }
       if (!kIsWeb) {
+        if (ok) {
           messenger.showSnackBar(
             SnackBar(
               content: Text(
-                ok
-                    ? AppLocalizations.of(
-                      weakContext,
-                    ).savedWithPath(savedPath ?? '')
-                    : AppLocalizations.of(weakContext).failedToSavePdf,
+                AppLocalizations.of(context).savedWithPath(savedPath ?? ''),
               ),
             ),
           );
-          // ignore: avoid_print
-          debugPrint('_saveSignedPdf: SnackBar shown ok=' + ok.toString());
         } else {
+          messenger.showSnackBar(
+            SnackBar(
+              content: Text(AppLocalizations.of(context).failedToSavePdf),
+            ),
+          );
+        }
+      } else {
+        // Web: show a toast-like confirmation
         messenger.showSnackBar(
           SnackBar(
             content: Text(
               ok
                   ? AppLocalizations.of(
-                      weakContext,
+                    context,
                   ).savedWithPath(savedPath ?? 'signed.pdf')
-                    : AppLocalizations.of(weakContext).failedToSavePdf,
+                  : AppLocalizations.of(context).failedToSavePdf,
             ),
           ),
         );
       }
     } finally {
-        if (mounted) {
       ref.read(pdfExportViewModelProvider.notifier).setExporting(false);
-          // ignore: avoid_print
-          debugPrint('_saveSignedPdf: exporting flag set false');
     }
   }
-    });
-  }
 
   String _ensurePdfExtension(String name) {
     if (!name.toLowerCase().endsWith('.pdf')) return '$name.pdf';
@@ -308,9 +297,7 @@ class _PdfSignatureHomePageState extends ConsumerState<PdfSignatureHomePage> {
         max: _pagesMax,
         builder:
             (context, area) => Offstage(
-              offstage:
-                  !(ResponsiveBreakpoints.of(context).largerThan(MOBILE) &&
-                      _showPagesSidebar),
+              offstage: !_showPagesSidebar,
               child: Consumer(
                 builder: (context, ref, child) {
                   final pdfViewModel = ref.watch(pdfViewModelProvider);
@@ -364,24 +351,6 @@ class _PdfSignatureHomePageState extends ConsumerState<PdfSignatureHomePage> {
     _applySidebarVisibility();
   }
 
-  @override
-  void didChangeDependencies() {
-    super.didChangeDependencies();
-    // Detect breakpoint changes from Responsive Framework and update areas once.
-    bool canShowPagesSidebar = true;
-    try {
-      canShowPagesSidebar = ResponsiveBreakpoints.of(
-        context,
-      ).largerThan(MOBILE);
-    } catch (_) {
-      canShowPagesSidebar = true;
-    }
-    if (_lastCanShowPagesSidebar != canShowPagesSidebar) {
-      _lastCanShowPagesSidebar = canShowPagesSidebar;
-      _applySidebarVisibility();
-    }
-  }
-
   @override
   void dispose() {
     _viewModel.controller.removeListener(_onControllerChanged);
@@ -390,67 +359,31 @@ class _PdfSignatureHomePageState extends ConsumerState<PdfSignatureHomePage> {
   }
 
   void _applySidebarVisibility() {
-    // Respect responsive layout: disable Pages sidebar on MOBILE.
-    bool canShowPagesSidebar = true;
-    try {
-      canShowPagesSidebar = ResponsiveBreakpoints.of(
-        context,
-      ).largerThan(MOBILE);
-    } catch (_) {
-      // If ResponsiveBreakpoints isn't available yet (e.g., during early init),
-      // fall back to allowing sidebars to avoid crashes; builders also guard.
-      canShowPagesSidebar = true;
-    }
-
     // Left pages sidebar
     final left = _splitController.areas[0];
-    final wantPagesVisible = _showPagesSidebar && canShowPagesSidebar;
-    final isPagesHidden =
-        (left.max == 1 && left.min == 0 && (left.size ?? 1) == 1);
-    if (wantPagesVisible) {
-      // Only expand if currently hidden; otherwise keep user's size.
-      if (isPagesHidden) {
+    if (_showPagesSidebar) {
       left.max = _pagesMax;
       left.min = _pagesMin;
       left.size = _lastPagesWidth.clamp(_pagesMin, _pagesMax);
     } else {
-        left.max = _pagesMax;
-        left.min = _pagesMin;
-        // Preserve current size (user may have adjusted it).
-        _lastPagesWidth = left.size ?? _lastPagesWidth;
-      }
-    } else {
-      // Only collapse if currently visible; remember current size for restore.
-      if (!isPagesHidden) {
       _lastPagesWidth = left.size ?? _lastPagesWidth;
       left.min = 0;
       left.max = 1;
       left.size = 1; // effectively hidden
     }
-    }
     // Right signatures sidebar
     final right = _splitController.areas[2];
-    final isSignaturesHidden =
-        (right.max == 1 && right.min == 0 && (right.size ?? 1) == 1);
     if (_showSignaturesSidebar) {
-      if (isSignaturesHidden) {
       right.max = _signaturesMax;
       right.min = _signaturesMin;
       right.size = _lastSignaturesWidth.clamp(_signaturesMin, _signaturesMax);
     } else {
-        right.max = _signaturesMax;
-        right.min = _signaturesMin;
-        _lastSignaturesWidth = right.size ?? _lastSignaturesWidth;
-      }
-    } else {
-      if (!isSignaturesHidden) {
       _lastSignaturesWidth = right.size ?? _lastSignaturesWidth;
       right.min = 0;
       right.max = 1;
       right.size = 1;
     }
   }
-  }
 
   @override
   Widget build(BuildContext context) {

lib/ui/features/pdf/widgets/pdf_toolbar.dart

@@ -2,7 +2,6 @@ import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:pdf_signature/l10n/app_localizations.dart';
-import 'package:responsive_framework/responsive_framework.dart';
 
 import 'package:pdf_signature/ui/features/pdf/view_model/pdf_view_model.dart';
 
@@ -68,16 +67,6 @@ class _PdfToolbarState extends ConsumerState<PdfToolbar> {
       builder: (context, constraints) {
         final bool compact = constraints.maxWidth < 260;
         final double gotoWidth = 50;
-        final bool isLargerThanMobile = ResponsiveBreakpoints.of(
-          context,
-        ).largerThan(MOBILE);
-        final String fileDisplay = () {
-          final path = widget.filePath;
-          if (path == null || path.isEmpty) return 'No file selected';
-          if (isLargerThanMobile) return path;
-          // Extract file name for mobile (supports both / and \ separators)
-          return path.split('/').last.split('\\').last;
-        }();
 
         // Center content of the toolbar
         final center = Wrap(
@@ -93,17 +82,16 @@ class _PdfToolbarState extends ConsumerState<PdfToolbar> {
                 children: [
                   const Icon(Icons.insert_drive_file, size: 18),
                   const SizedBox(width: 6),
-                  Flexible(
-                    child: ConstrainedBox(
+                  ConstrainedBox(
                     constraints: const BoxConstraints(maxWidth: 220),
                     child: Text(
-                        fileDisplay,
-                        maxLines: 1,
-                        softWrap: false,
+                      // if filePath not null
+                      widget.filePath != null
+                          ? widget.filePath!
+                          : 'No file selected',
                       overflow: TextOverflow.ellipsis,
                     ),
                   ),
-                  ),
                 ],
               ),
             ),
@@ -142,7 +130,6 @@ class _PdfToolbarState extends ConsumerState<PdfToolbar> {
                       ),
                     ],
                   ),
-                  if (ResponsiveBreakpoints.of(context).largerThan(MOBILE))
                   Wrap(
                     spacing: 6,
                     runSpacing: 4,
@@ -175,8 +162,6 @@ class _PdfToolbarState extends ConsumerState<PdfToolbar> {
                         ),
                     ],
                   ),
-
-                  if (ResponsiveBreakpoints.of(context).largerThan(MOBILE)) ...[
                   const SizedBox(width: 8),
                   Wrap(
                     crossAxisAlignment: WrapCrossAlignment.center,
@@ -189,9 +174,7 @@ class _PdfToolbarState extends ConsumerState<PdfToolbar> {
                       ),
                       Text(
                         //if not null
-                          widget.zoomLevel != null
-                              ? '${widget.zoomLevel}%'
-                              : '',
+                        widget.zoomLevel != null ? '${widget.zoomLevel}%' : '',
                         style: const TextStyle(fontSize: 12),
                       ),
                       IconButton(
@@ -204,7 +187,6 @@ class _PdfToolbarState extends ConsumerState<PdfToolbar> {
                   ),
                   SizedBox(width: 6),
                 ],
-                ],
               ),
             ],
           ],
@@ -212,7 +194,6 @@ class _PdfToolbarState extends ConsumerState<PdfToolbar> {
 
         return Row(
           children: [
-            if (ResponsiveBreakpoints.of(context).largerThan(MOBILE)) ...[
             IconButton(
               key: const Key('btn_toggle_pages_sidebar'),
               tooltip: 'Toggle pages overview',
@@ -226,7 +207,6 @@ class _PdfToolbarState extends ConsumerState<PdfToolbar> {
               ),
             ),
             const SizedBox(width: 8),
-            ],
             Expanded(child: center),
             const SizedBox(width: 8),
             IconButton(

lib/ui/features/pdf/widgets/pdf_viewer_widget.dart

@@ -6,10 +6,6 @@ import 'pdf_page_overlays.dart';
 import './pdf_mock_continuous_list.dart';
 import '../view_model/pdf_view_model.dart';
 
-// Provider to control whether viewer overlays (like scroll thumbs) are enabled.
-// Integration tests can override this to false to avoid long-running animations.
-final viewerOverlaysEnabledProvider = Provider<bool>((ref) => true);
-
 class PdfViewerWidget extends ConsumerStatefulWidget {
   const PdfViewerWidget({
     super.key,
@@ -17,15 +13,12 @@ class PdfViewerWidget extends ConsumerStatefulWidget {
     this.pageKeyBuilder,
     this.scrollToPage,
     required this.controller,
-    this.innerViewerKey,
   });
 
   final Size pageSize;
   final GlobalKey Function(int page)? pageKeyBuilder;
   final void Function(int page)? scrollToPage;
   final PdfViewerController controller;
-  // Optional key applied to the inner Pdfrx PdfViewer to force disposal/rebuild
-  final Key? innerViewerKey;
 
   @override
   ConsumerState<PdfViewerWidget> createState() => _PdfViewerWidgetState();
@@ -88,10 +81,11 @@ class _PdfViewerWidgetState extends ConsumerState<PdfViewerWidget> {
       );
     }
 
-    final overlaysEnabled = ref.watch(viewerOverlaysEnabledProvider);
     return PdfViewer(
       _documentRef!,
-      key: widget.innerViewerKey ?? const Key('pdf_continuous_mock_list'),
+      key: const Key(
+        'pdf_continuous_mock_list',
+      ), // Keep the same key for test compatibility
       controller: widget.controller,
       params: PdfViewerParams(
         onViewerReady: (document, controller) {
@@ -106,9 +100,7 @@ class _PdfViewerWidgetState extends ConsumerState<PdfViewerWidget> {
             ref.read(pdfViewModelProvider.notifier).jumpToPage(page);
           }
         },
-        viewerOverlayBuilder:
-            overlaysEnabled
-                ? (context, size, handle) {
+        viewerOverlayBuilder: (context, size, handle) {
           return [
             // Vertical scroll thumb on the right
             PdfViewerScrollThumb(
@@ -116,8 +108,7 @@ class _PdfViewerWidgetState extends ConsumerState<PdfViewerWidget> {
               orientation: ScrollbarOrientation.right,
               thumbSize: const Size(40, 25),
               thumbBuilder:
-                          (context, thumbSize, pageNumber, controller) =>
-                              Container(
+                  (context, thumbSize, pageNumber, controller) => Container(
                     color: Colors.black.withValues(alpha: 0.7),
                     child: Center(
                       child: Text(
@@ -136,8 +127,7 @@ class _PdfViewerWidgetState extends ConsumerState<PdfViewerWidget> {
               orientation: ScrollbarOrientation.bottom,
               thumbSize: const Size(40, 25),
               thumbBuilder:
-                          (context, thumbSize, pageNumber, controller) =>
-                              Container(
+                  (context, thumbSize, pageNumber, controller) => Container(
                     color: Colors.black.withValues(alpha: 0.7),
                     child: Center(
                       child: Text(
@@ -151,8 +141,7 @@ class _PdfViewerWidgetState extends ConsumerState<PdfViewerWidget> {
                   ),
             ),
           ];
-                }
-                : (context, size, handle) => const <Widget>[],
+        },
         // Per-page overlays to enable page-specific drag targets and placed signatures
         pageOverlaysBuilder: (context, pageRect, page) {
           return [

pubspec.yaml

@@ -16,7 +16,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 # In Windows, build-name is used as the major, minor, and patch parts
 # of the product and file versions while build-number is used as the build suffix.
-version: 1.1.0+1
+version: 1.0.0+1
 
 environment:
   sdk: ^3.7.0
@@ -41,25 +41,24 @@ dependencies:
   path_provider: ^2.1.5
   pdfrx: ^2.1.9
   pdf: ^3.10.8
-  # printing: ^5.14.2 # extension of pdf pkg
   hand_signature: ^3.1.0+2
   image: ^4.2.0
+  printing: ^5.14.2
   result_dart: ^2.1.1
   go_router: ^16.2.0
   flutter_localizations:
     sdk: flutter
   intl: any
   flutter_localized_locales: ^2.0.5
-  desktop_drop: ^0.6.1
+  desktop_drop: ^0.5.0
   multi_split_view: ^3.6.1
   freezed_annotation: ^3.1.0
   json_annotation: ^4.9.0
-  share_plus: ^12.0.0
+  share_plus: ^11.1.0
   logging: ^1.3.0
   riverpod_annotation: ^2.6.1
   colorfilter_generator: ^0.0.8
   flutter_box_transform: ^0.4.7
-  responsive_framework: ^1.5.1
   # disable_web_context_menu: ^1.1.0
   # ml_linalg: ^13.12.6
 

test/features/_test_helper.dart

@@ -40,6 +40,7 @@ Future<ProviderContainer> pumpApp(
 }) async {
   SharedPreferences.setMockInitialValues(initialPrefs);
   final prefs = await SharedPreferences.getInstance();
+  final fakeExport = FakeExportService();
   final container = ProviderContainer(
     overrides: [
       preferencesRepositoryProvider.overrideWith(
@@ -52,7 +53,11 @@ Future<ProviderContainer> pumpApp(
         (ref) => PdfViewModel(ref, useMockViewer: true),
       ),
       pdfExportViewModelProvider.overrideWith(
-        (ref) => PdfExportViewModel(ref, savePathPicker: () async => 'out.pdf'),
+        (ref) => PdfExportViewModel(
+          ref,
+          exporter: fakeExport,
+          savePathPicker: () async => 'out.pdf',
+        ),
       ),
     ],
   );

test/widget/export_flow_test.dart

@@ -6,6 +6,7 @@ import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 
+import 'package:pdf_signature/data/services/export_service.dart';
 import 'package:pdf_signature/ui/features/pdf/view_model/pdf_export_view_model.dart';
 import 'package:pdf_signature/data/repositories/preferences_repository.dart';
 import 'package:pdf_signature/ui/features/pdf/view_model/pdf_view_model.dart';
@@ -13,6 +14,33 @@ import 'package:pdf_signature/ui/features/pdf/view_model/pdf_view_model.dart';
 import 'package:pdf_signature/data/repositories/document_repository.dart';
 import 'package:pdf_signature/ui/features/pdf/widgets/pdf_screen.dart';
 import 'package:pdf_signature/l10n/app_localizations.dart';
+import 'package:image/image.dart' as img;
+import 'package:pdf_signature/domain/models/model.dart';
+
+class RecordingExporter extends ExportService {
+  bool called = false;
+  @override
+  Future<Uint8List?> exportSignedPdfFromBytes({
+    required Uint8List srcBytes,
+    required Size uiPageSize,
+    required Uint8List? signatureImageBytes,
+    Map<int, List<SignaturePlacement>>? placementsByPage,
+    Map<String, img.Image>? libraryImages,
+    double targetDpi = 144.0,
+  }) async {
+    // Return tiny dummy PDF bytes
+    return Uint8List.fromList([0x25, 0x50, 0x44, 0x46]); // "%PDF" header start
+  }
+
+  @override
+  Future<bool> saveBytesToFile({
+    required bytes,
+    required String outputPath,
+  }) async {
+    called = true;
+    return true;
+  }
+}
 
 void main() {
   testWidgets('Save uses file selector (via provider) and injected exporter', (
@@ -20,6 +48,7 @@ void main() {
   ) async {
     SharedPreferences.setMockInitialValues({});
     final prefs = await SharedPreferences.getInstance();
+    final fake = RecordingExporter();
     await tester.pumpWidget(
       ProviderScope(
         overrides: [
@@ -37,6 +66,7 @@ void main() {
           pdfExportViewModelProvider.overrideWith(
             (ref) => PdfExportViewModel(
               ref,
+              exporter: fake,
               savePathPicker: () async => 'C:/tmp/output.pdf',
             ),
           ),
@@ -61,6 +91,6 @@ void main() {
 
     // Expect success UI (localized)
     expect(find.textContaining('Saved:'), findsOneWidget);
-    // Basic assertion: a save flow completed and snackbar showed
+    expect(fake.called, isTrue);
   });
 }