refactor: pdf/view_model/view_model.dart to smaller files

integration_test/export_flow_test.dart

@@ -7,7 +7,9 @@ import 'package:image/image.dart' as img;
 
 import 'package:pdf_signature/data/services/export_service.dart';
 import 'package:pdf_signature/data/services/export_providers.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/view_model.dart';
+import 'package:pdf_signature/ui/features/pdf/view_model/signature_library.dart';
+import 'package:pdf_signature/ui/features/pdf/view_model/signature_controller.dart';
+import 'package:pdf_signature/ui/features/pdf/view_model/pdf_controller.dart';
 import 'package:pdf_signature/ui/features/pdf/widgets/pdf_screen.dart';
 import 'package:pdf_signature/l10n/app_localizations.dart';
 

lib/app.dart

@@ -3,7 +3,7 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:flutter_localized_locales/flutter_localized_locales.dart';
 import 'package:pdf_signature/l10n/app_localizations.dart';
 import 'package:pdf_signature/ui/features/pdf/widgets/pdf_screen.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/view_model.dart';
+import 'package:pdf_signature/ui/features/pdf/view_model/pdf_controller.dart';
 import 'package:pdf_signature/ui/features/welcome/widgets/welcome_screen.dart';
 import 'data/services/preferences_providers.dart';
 import 'package:pdf_signature/ui/features/preferences/widgets/settings_screen.dart';

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

@@ -0,0 +1,172 @@
+import 'dart:typed_data';
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+
+import '../../../../data/model/model.dart';
+
+class PdfController extends StateNotifier<PdfState> {
+  PdfController() : super(PdfState.initial());
+  static const int samplePageCount = 5;
+
+  @visibleForTesting
+  void openSample() {
+    state = state.copyWith(
+      loaded: true,
+      pageCount: samplePageCount,
+      currentPage: 1,
+      pickedPdfPath: null,
+      signedPage: null,
+      placementsByPage: {},
+      placementImageByPage: {},
+      selectedPlacementIndex: null,
+    );
+  }
+
+  void openPicked({
+    required String path,
+    int pageCount = samplePageCount,
+    Uint8List? bytes,
+  }) {
+    state = state.copyWith(
+      loaded: true,
+      pageCount: pageCount,
+      currentPage: 1,
+      pickedPdfPath: path,
+      pickedPdfBytes: bytes,
+      signedPage: null,
+      placementsByPage: {},
+      placementImageByPage: {},
+      selectedPlacementIndex: null,
+    );
+  }
+
+  void jumpTo(int page) {
+    if (!state.loaded) return;
+    final clamped = page.clamp(1, state.pageCount);
+    state = state.copyWith(currentPage: clamped, selectedPlacementIndex: null);
+  }
+
+  // Set or clear the page that will receive the signature overlay.
+  void setSignedPage(int? page) {
+    if (!state.loaded) return;
+    if (page == null) {
+      state = state.copyWith(signedPage: null, selectedPlacementIndex: null);
+    } else {
+      final clamped = page.clamp(1, state.pageCount);
+      state = state.copyWith(signedPage: clamped, selectedPlacementIndex: null);
+    }
+  }
+
+  void setPageCount(int count) {
+    if (!state.loaded) return;
+    state = state.copyWith(pageCount: count.clamp(1, 9999));
+  }
+
+  // Multiple-signature helpers (rects are stored in normalized fractions 0..1
+  // relative to the page size: left/top/width/height are all 0..1)
+  void addPlacement({
+    required int page,
+    required Rect rect,
+    String image = 'default.png',
+  }) {
+    if (!state.loaded) return;
+    final p = page.clamp(1, state.pageCount);
+    final map = Map<int, List<Rect>>.from(state.placementsByPage);
+    final list = List<Rect>.from(map[p] ?? const []);
+    list.add(rect);
+    map[p] = list;
+    // Sync image mapping list
+    final imgMap = Map<int, List<String>>.from(state.placementImageByPage);
+    final imgList = List<String>.from(imgMap[p] ?? const []);
+    imgList.add(image);
+    imgMap[p] = imgList;
+    state = state.copyWith(
+      placementsByPage: map,
+      placementImageByPage: imgMap,
+      selectedPlacementIndex: null,
+    );
+  }
+
+  void removePlacement({required int page, required int index}) {
+    if (!state.loaded) return;
+    final p = page.clamp(1, state.pageCount);
+    final map = Map<int, List<Rect>>.from(state.placementsByPage);
+    final list = List<Rect>.from(map[p] ?? const []);
+    if (index >= 0 && index < list.length) {
+      list.removeAt(index);
+      // Sync image mapping
+      final imgMap = Map<int, List<String>>.from(state.placementImageByPage);
+      final imgList = List<String>.from(imgMap[p] ?? const []);
+      if (index >= 0 && index < imgList.length) {
+        imgList.removeAt(index);
+      }
+      if (list.isEmpty) {
+        map.remove(p);
+        imgMap.remove(p);
+      } else {
+        map[p] = list;
+        imgMap[p] = imgList;
+      }
+      state = state.copyWith(
+        placementsByPage: map,
+        placementImageByPage: imgMap,
+        selectedPlacementIndex: null,
+      );
+    }
+  }
+
+  // Update the rect of an existing placement on a page.
+  void updatePlacementRect({
+    required int page,
+    required int index,
+    required Rect rect,
+  }) {
+    if (!state.loaded) return;
+    final p = page.clamp(1, state.pageCount);
+    final map = Map<int, List<Rect>>.from(state.placementsByPage);
+    final list = List<Rect>.from(map[p] ?? const []);
+    if (index >= 0 && index < list.length) {
+      list[index] = rect;
+      map[p] = list;
+      state = state.copyWith(placementsByPage: map);
+    }
+  }
+
+  List<Rect> placementsOn(int page) {
+    return List<Rect>.from(state.placementsByPage[page] ?? const []);
+  }
+
+  void selectPlacement(int? index) {
+    if (!state.loaded) return;
+    // Only allow valid index on current page; otherwise clear
+    if (index == null) {
+      state = state.copyWith(selectedPlacementIndex: null);
+      return;
+    }
+    final list = state.placementsByPage[state.currentPage] ?? const [];
+    if (index >= 0 && index < list.length) {
+      state = state.copyWith(selectedPlacementIndex: index);
+    } else {
+      state = state.copyWith(selectedPlacementIndex: null);
+    }
+  }
+
+  void deleteSelectedPlacement() {
+    final idx = state.selectedPlacementIndex;
+    if (idx == null) return;
+    removePlacement(page: state.currentPage, index: idx);
+  }
+
+  // NOTE: Programmatic reassignment of images has been removed.
+
+  // Convenience to get image name for a placement
+  String? imageOfPlacement({required int page, required int index}) {
+    final list = state.placementImageByPage[page] ?? const [];
+    if (index < 0 || index >= list.length) return null;
+    return list[index];
+  }
+}
+
+final pdfProvider = StateNotifierProvider<PdfController, PdfState>(
+  (ref) => PdfController(),
+);

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

@@ -7,211 +7,8 @@ import 'package:image/image.dart' as img;
 import 'package:pdf_signature/l10n/app_localizations.dart';
 
 import '../../../../data/model/model.dart';
-
-class PdfController extends StateNotifier<PdfState> {
-  PdfController() : super(PdfState.initial());
-  static const int samplePageCount = 5;
-
-  @visibleForTesting
-  void openSample() {
-    state = state.copyWith(
-      loaded: true,
-      pageCount: samplePageCount,
-      currentPage: 1,
-      pickedPdfPath: null,
-      signedPage: null,
-      placementsByPage: {},
-      placementImageByPage: {},
-      selectedPlacementIndex: null,
-    );
-  }
-
-  void openPicked({
-    required String path,
-    int pageCount = samplePageCount,
-    Uint8List? bytes,
-  }) {
-    state = state.copyWith(
-      loaded: true,
-      pageCount: pageCount,
-      currentPage: 1,
-      pickedPdfPath: path,
-      pickedPdfBytes: bytes,
-      signedPage: null,
-      placementsByPage: {},
-      placementImageByPage: {},
-      selectedPlacementIndex: null,
-    );
-  }
-
-  void jumpTo(int page) {
-    if (!state.loaded) return;
-    final clamped = page.clamp(1, state.pageCount);
-    state = state.copyWith(currentPage: clamped, selectedPlacementIndex: null);
-  }
-
-  // Set or clear the page that will receive the signature overlay.
-  void setSignedPage(int? page) {
-    if (!state.loaded) return;
-    if (page == null) {
-      state = state.copyWith(signedPage: null, selectedPlacementIndex: null);
-    } else {
-      final clamped = page.clamp(1, state.pageCount);
-      state = state.copyWith(signedPage: clamped, selectedPlacementIndex: null);
-    }
-  }
-
-  void setPageCount(int count) {
-    if (!state.loaded) return;
-    state = state.copyWith(pageCount: count.clamp(1, 9999));
-  }
-
-  // Multiple-signature helpers (rects are stored in normalized fractions 0..1
-  // relative to the page size: left/top/width/height are all 0..1)
-  void addPlacement({
-    required int page,
-    required Rect rect,
-    String image = 'default.png',
-  }) {
-    if (!state.loaded) return;
-    final p = page.clamp(1, state.pageCount);
-    final map = Map<int, List<Rect>>.from(state.placementsByPage);
-    final list = List<Rect>.from(map[p] ?? const []);
-    list.add(rect);
-    map[p] = list;
-    // Sync image mapping list
-    final imgMap = Map<int, List<String>>.from(state.placementImageByPage);
-    final imgList = List<String>.from(imgMap[p] ?? const []);
-    imgList.add(image);
-    imgMap[p] = imgList;
-    state = state.copyWith(
-      placementsByPage: map,
-      placementImageByPage: imgMap,
-      selectedPlacementIndex: null,
-    );
-  }
-
-  void removePlacement({required int page, required int index}) {
-    if (!state.loaded) return;
-    final p = page.clamp(1, state.pageCount);
-    final map = Map<int, List<Rect>>.from(state.placementsByPage);
-    final list = List<Rect>.from(map[p] ?? const []);
-    if (index >= 0 && index < list.length) {
-      list.removeAt(index);
-      // Sync image mapping
-      final imgMap = Map<int, List<String>>.from(state.placementImageByPage);
-      final imgList = List<String>.from(imgMap[p] ?? const []);
-      if (index >= 0 && index < imgList.length) {
-        imgList.removeAt(index);
-      }
-      if (list.isEmpty) {
-        map.remove(p);
-        imgMap.remove(p);
-      } else {
-        map[p] = list;
-        imgMap[p] = imgList;
-      }
-      state = state.copyWith(
-        placementsByPage: map,
-        placementImageByPage: imgMap,
-        selectedPlacementIndex: null,
-      );
-    }
-  }
-
-  // Update the rect of an existing placement on a page.
-  void updatePlacementRect({
-    required int page,
-    required int index,
-    required Rect rect,
-  }) {
-    if (!state.loaded) return;
-    final p = page.clamp(1, state.pageCount);
-    final map = Map<int, List<Rect>>.from(state.placementsByPage);
-    final list = List<Rect>.from(map[p] ?? const []);
-    if (index >= 0 && index < list.length) {
-      list[index] = rect;
-      map[p] = list;
-      state = state.copyWith(placementsByPage: map);
-    }
-  }
-
-  List<Rect> placementsOn(int page) {
-    return List<Rect>.from(state.placementsByPage[page] ?? const []);
-  }
-
-  void selectPlacement(int? index) {
-    if (!state.loaded) return;
-    // Only allow valid index on current page; otherwise clear
-    if (index == null) {
-      state = state.copyWith(selectedPlacementIndex: null);
-      return;
-    }
-    final list = state.placementsByPage[state.currentPage] ?? const [];
-    if (index >= 0 && index < list.length) {
-      state = state.copyWith(selectedPlacementIndex: index);
-    } else {
-      state = state.copyWith(selectedPlacementIndex: null);
-    }
-  }
-
-  void deleteSelectedPlacement() {
-    final idx = state.selectedPlacementIndex;
-    if (idx == null) return;
-    removePlacement(page: state.currentPage, index: idx);
-  }
-
-  // NOTE: Programmatic reassignment of images has been removed.
-
-  // Convenience to get image name for a placement
-  String? imageOfPlacement({required int page, required int index}) {
-    final list = state.placementImageByPage[page] ?? const [];
-    if (index < 0 || index >= list.length) return null;
-    return list[index];
-  }
-}
-
-final pdfProvider = StateNotifierProvider<PdfController, PdfState>(
-  (ref) => PdfController(),
-);
-
-/// A simple library of signature images available to the user in the sidebar.
-class SignatureAsset {
-  final String id; // unique id
-  final Uint8List bytes;
-  final String? name; // optional display name (e.g., filename)
-  const SignatureAsset({required this.id, required this.bytes, this.name});
-}
-
-class SignatureLibraryController extends StateNotifier<List<SignatureAsset>> {
-  SignatureLibraryController() : super(const []);
-
-  String add(Uint8List bytes, {String? name}) {
-    // Always add a new asset (allow duplicates). This lets users create multiple cards
-    // even when loading the same image repeatedly for different adjustments/usages.
-    if (bytes.isEmpty) return '';
-    final id = DateTime.now().microsecondsSinceEpoch.toString();
-    state = List.of(state)
-      ..add(SignatureAsset(id: id, bytes: bytes, name: name));
-    return id;
-  }
-
-  void remove(String id) {
-    state = state.where((a) => a.id != id).toList(growable: false);
-  }
-
-  SignatureAsset? byId(String id) {
-    for (final a in state) {
-      if (a.id == id) return a;
-    }
-    return null;
-  }
-}
-
-final signatureLibraryProvider =
-    StateNotifierProvider<SignatureLibraryController, List<SignatureAsset>>(
-      (ref) => SignatureLibraryController(),
-    );
+import 'pdf_controller.dart';
+import 'signature_library.dart';
 
 class SignatureController extends StateNotifier<SignatureState> {
   SignatureController() : super(SignatureState.initial());

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

@@ -0,0 +1,40 @@
+import 'dart:typed_data';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+
+/// A simple library of signature images available to the user in the sidebar.
+class SignatureAsset {
+  final String id; // unique id
+  final Uint8List bytes;
+  final String? name; // optional display name (e.g., filename)
+  const SignatureAsset({required this.id, required this.bytes, this.name});
+}
+
+class SignatureLibraryController extends StateNotifier<List<SignatureAsset>> {
+  SignatureLibraryController() : super(const []);
+
+  String add(Uint8List bytes, {String? name}) {
+    // Always add a new asset (allow duplicates). This lets users create multiple cards
+    // even when loading the same image repeatedly for different adjustments/usages.
+    if (bytes.isEmpty) return '';
+    final id = DateTime.now().microsecondsSinceEpoch.toString();
+    state = List.of(state)
+      ..add(SignatureAsset(id: id, bytes: bytes, name: name));
+    return id;
+  }
+
+  void remove(String id) {
+    state = state.where((a) => a.id != id).toList(growable: false);
+  }
+
+  SignatureAsset? byId(String id) {
+    for (final a in state) {
+      if (a.id == id) return a;
+    }
+    return null;
+  }
+}
+
+final signatureLibraryProvider =
+    StateNotifierProvider<SignatureLibraryController, List<SignatureAsset>>(
+      (ref) => SignatureLibraryController(),
+    );

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

@@ -3,7 +3,7 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:pdf_signature/l10n/app_localizations.dart';
 
 import '../../../../data/model/model.dart';
-import '../view_model/view_model.dart';
+import '../view_model/signature_controller.dart';
 
 class AdjustmentsPanel extends ConsumerWidget {
   const AdjustmentsPanel({super.key, required this.sig});

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

@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:pdf_signature/l10n/app_localizations.dart';
 
-import '../view_model/view_model.dart';
+import '../view_model/signature_controller.dart';
 import 'adjustments_panel.dart';
 import 'rotated_signature_image.dart';
 

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

@@ -4,7 +4,8 @@ import 'package:pdf_signature/l10n/app_localizations.dart';
 import 'package:pdfrx/pdfrx.dart';
 
 import '../../../../data/services/export_providers.dart';
-import '../view_model/view_model.dart';
+import '../view_model/signature_controller.dart';
+import '../view_model/pdf_controller.dart';
 import 'signature_drag_data.dart';
 import 'pdf_mock_continuous_list.dart';
 import 'pdf_page_overlays.dart';

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

@@ -1,7 +1,8 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 
-import '../view_model/view_model.dart';
+import '../view_model/signature_controller.dart';
+import '../view_model/pdf_controller.dart';
 import 'signature_overlay.dart';
 
 /// Builds all overlays for a given page: placed signatures and the active one.

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

@@ -3,7 +3,7 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:pdfrx/pdfrx.dart';
 
 import '../../../../data/services/export_providers.dart';
-import '../view_model/view_model.dart';
+import '../view_model/pdf_controller.dart';
 
 class PdfPagesOverview extends ConsumerWidget {
   const PdfPagesOverview({super.key});

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

@@ -10,7 +10,9 @@ import 'package:multi_split_view/multi_split_view.dart';
 
 import '../../../../data/services/export_providers.dart';
 import 'package:image/image.dart' as img;
-import '../view_model/view_model.dart';
+import '../view_model/signature_controller.dart';
+import '../view_model/pdf_controller.dart';
+import '../view_model/signature_library.dart';
 import 'draw_canvas.dart';
 import 'pdf_toolbar.dart';
 import 'pdf_page_area.dart';

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

@@ -3,7 +3,7 @@ import 'package:flutter/services.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:pdf_signature/l10n/app_localizations.dart';
 
-import '../view_model/view_model.dart';
+import '../view_model/pdf_controller.dart';
 
 class PdfToolbar extends ConsumerStatefulWidget {
   const PdfToolbar({

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

@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import '../view_model/view_model.dart';
+import '../view_model/signature_library.dart';
 import 'signature_drag_data.dart';
 import '../../../common/menu_labels.dart';
 import 'rotated_signature_image.dart';

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

@@ -4,7 +4,8 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:pdf_signature/l10n/app_localizations.dart';
 
 import '../../../../data/services/export_providers.dart';
-import '../view_model/view_model.dart';
+import '../view_model/signature_controller.dart';
+import '../view_model/signature_library.dart';
 import 'image_editor_dialog.dart';
 import 'signature_card.dart';
 

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

@@ -5,7 +5,9 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:pdf_signature/l10n/app_localizations.dart';
 
 import '../../../../data/model/model.dart';
-import '../view_model/view_model.dart';
+import '../view_model/signature_controller.dart';
+import '../view_model/pdf_controller.dart';
+import '../view_model/signature_library.dart';
 import 'image_editor_dialog.dart';
 import '../../../common/menu_labels.dart';
 import 'rotated_signature_image.dart';

lib/ui/features/welcome/widgets/welcome_screen.dart

@@ -7,7 +7,8 @@ import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:pdf_signature/l10n/app_localizations.dart';
 
-import '../../pdf/view_model/view_model.dart';
+import '../../pdf/view_model/signature_controller.dart';
+import '../../pdf/view_model/pdf_controller.dart';
 // Settings dialog is provided via global AppBar in MyApp
 
 // Abstraction to make drop handling testable without constructing

test/features/step/a_drawn_signature_exists_in_the_canvas.dart

@@ -1,6 +1,6 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/view_model.dart';
+import 'package:pdf_signature/ui/features/pdf/view_model/signature_controller.dart';
 import '_world.dart';
 
 /// Usage: a drawn signature exists in the canvas

test/features/step/a_multipage_pdf_is_open.dart

@@ -1,6 +1,6 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/view_model.dart';
+import 'package:pdf_signature/ui/features/pdf/view_model/pdf_controller.dart';
 import '_world.dart';
 
 /// Usage: a multi-page PDF is open

test/features/step/a_pdf_is_open_and_contains_at_least_one_placed_signature.dart

@@ -1,7 +1,8 @@
 import 'dart:typed_data';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/view_model.dart';
+import 'package:pdf_signature/ui/features/pdf/view_model/signature_controller.dart';
+import 'package:pdf_signature/ui/features/pdf/view_model/pdf_controller.dart';
 import '_world.dart';
 
 /// Usage: a PDF is open and contains at least one placed signature

test/features/step/a_pdf_is_open_and_contains_multiple_placed_signatures_across_pages.dart

@@ -2,7 +2,8 @@ import 'dart:typed_data';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:flutter/material.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/view_model.dart';
+import 'package:pdf_signature/ui/features/pdf/view_model/signature_controller.dart';
+import 'package:pdf_signature/ui/features/pdf/view_model/pdf_controller.dart';
 import '_world.dart';
 
 /// Usage: a PDF is open and contains multiple placed signatures across pages

test/features/step/a_pdf_is_open_with_no_signatures_placed.dart

@@ -1,6 +1,7 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/view_model.dart';
+import 'package:pdf_signature/ui/features/pdf/view_model/signature_controller.dart';
+import 'package:pdf_signature/ui/features/pdf/view_model/pdf_controller.dart';
 import '_world.dart';
 
 /// Usage: a PDF is open with no signatures placed

test/features/step/a_pdf_page_is_selected_for_signing.dart

@@ -1,6 +1,6 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/view_model.dart';
+import 'package:pdf_signature/ui/features/pdf/view_model/pdf_controller.dart';
 import '_world.dart';
 
 /// Usage: a PDF page is selected for signing

test/features/step/a_sample_multipage_pdf5_pages_is_available.dart

@@ -1,6 +1,6 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/view_model.dart';
+import 'package:pdf_signature/ui/features/pdf/view_model/pdf_controller.dart';
 import '_world.dart';
 
 /// Usage: a sample multi-page PDF (5 pages) is available

test/features/step/a_signature_image_is_created.dart

@@ -1,6 +1,6 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/view_model.dart';
+import 'package:pdf_signature/ui/features/pdf/view_model/signature_controller.dart';
 import '_world.dart';
 
 /// Usage: a signature image is created

test/features/step/a_signature_image_is_loaded_or_drawn.dart

@@ -1,7 +1,7 @@
 import 'dart:typed_data';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/view_model.dart';
+import 'package:pdf_signature/ui/features/pdf/view_model/signature_controller.dart';
 import '_world.dart';
 
 /// Usage: a signature image is loaded or drawn

test/features/step/a_signature_image_is_placed_on_the_page.dart

@@ -1,7 +1,8 @@
 import 'dart:typed_data';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/view_model.dart';
+import 'package:pdf_signature/ui/features/pdf/view_model/signature_controller.dart';
+import 'package:pdf_signature/ui/features/pdf/view_model/pdf_controller.dart';
 import '_world.dart';
 
 /// Usage: a signature image is placed on the page

test/features/step/a_signature_image_is_selected.dart

@@ -1,7 +1,8 @@
 import 'dart:typed_data';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/view_model.dart';
+import 'package:pdf_signature/ui/features/pdf/view_model/signature_controller.dart';
+import 'package:pdf_signature/ui/features/pdf/view_model/pdf_controller.dart';
 import '_world.dart';
 
 /// Usage: a signature image is selected

test/features/step/a_signature_is_placed_on_page.dart

@@ -2,7 +2,8 @@ import 'dart:typed_data';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:flutter/material.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/view_model.dart';
+import 'package:pdf_signature/ui/features/pdf/view_model/signature_controller.dart';
+import 'package:pdf_signature/ui/features/pdf/view_model/pdf_controller.dart';
 import '_world.dart';
 
 /// Usage: a signature is placed on page {2}

test/features/step/a_signature_is_placed_with_a_position_and_size_relative_to_the_page.dart

@@ -2,7 +2,8 @@ import 'dart:typed_data';
 import 'dart:ui';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/view_model.dart';
+import 'package:pdf_signature/ui/features/pdf/view_model/signature_controller.dart';
+import 'package:pdf_signature/ui/features/pdf/view_model/pdf_controller.dart';
 import '_world.dart';
 
 /// Usage: a signature is placed with a position and size relative to the page

test/features/step/adjusting_one_instance_does_not_affect_the_others.dart

@@ -1,6 +1,6 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/view_model.dart';
+import 'package:pdf_signature/ui/features/pdf/view_model/pdf_controller.dart';
 import '_world.dart';
 
 /// Usage: adjusting one instance does not affect the others

test/features/step/all_placed_signatures_appear_on_their_corresponding_pages_in_the_output.dart

@@ -1,6 +1,6 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/view_model.dart';
+import 'package:pdf_signature/ui/features/pdf/view_model/pdf_controller.dart';
 import '_world.dart';
 
 /// Usage: all placed signatures appear on their corresponding pages in the output

test/features/step/an_empty_signature_canvas.dart

@@ -1,6 +1,6 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/view_model.dart';
+import 'package:pdf_signature/ui/features/pdf/view_model/signature_controller.dart';
 import '_world.dart';
 
 /// Usage: an empty signature canvas

test/features/step/both_signatures_are_shown_on_their_respective_pages.dart

@@ -1,6 +1,6 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/view_model.dart';
+import 'package:pdf_signature/ui/features/pdf/view_model/pdf_controller.dart';
 import '_world.dart';
 
 /// Usage: both signatures are shown on their respective pages

test/features/step/dragging_or_resizing_one_does_not_change_the_other.dart

@@ -1,7 +1,7 @@
 import 'dart:ui';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/view_model.dart';
+import 'package:pdf_signature/ui/features/pdf/view_model/pdf_controller.dart';
 import '_world.dart';
 
 /// Usage: dragging or resizing one does not change the other

test/features/step/each_signature_can_be_dragged_and_resized_independently.dart

@@ -1,6 +1,6 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/view_model.dart';
+import 'package:pdf_signature/ui/features/pdf/view_model/pdf_controller.dart';
 import '_world.dart';
 
 /// Usage: each signature can be dragged and resized independently

test/features/step/identical_signature_instances_appear_in_each_location.dart

@@ -1,6 +1,6 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/view_model.dart';
+import 'package:pdf_signature/ui/features/pdf/view_model/pdf_controller.dart';
 import '_world.dart';
 
 /// Usage: identical signature instances appear in each location

test/features/step/it_is_placed_on_the_selected_page.dart

@@ -1,6 +1,6 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/view_model.dart';
+import 'package:pdf_signature/ui/features/pdf/view_model/signature_controller.dart';
 import '_world.dart';
 
 /// Usage: it is placed on the selected page

test/features/step/multiple_strokes_were_drawn.dart

@@ -1,6 +1,6 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/view_model.dart';
+import 'package:pdf_signature/ui/features/pdf/view_model/signature_controller.dart';
 import '_world.dart';
 
 /// Usage: multiple strokes were drawn

test/features/step/nearwhite_background_becomes_transparent_in_the_preview.dart

@@ -2,7 +2,7 @@ import 'dart:typed_data';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:image/image.dart' as img;
-import 'package:pdf_signature/ui/features/pdf/view_model/view_model.dart';
+import 'package:pdf_signature/ui/features/pdf/view_model/signature_controller.dart';
 import '_world.dart';
 
 /// Usage: near-white background becomes transparent in the preview

test/features/step/only_the_selected_signature_is_removed.dart

@@ -1,6 +1,6 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/view_model.dart';
+import 'package:pdf_signature/ui/features/pdf/view_model/pdf_controller.dart';
 import '_world.dart';
 
 /// Usage: only the selected signature is removed

test/features/step/page_becomes_visible_in_the_scroll_area.dart

@@ -1,6 +1,6 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/view_model.dart';
+import 'package:pdf_signature/ui/features/pdf/view_model/pdf_controller.dart';
 import '_world.dart';
 
 /// Usage: page {5} becomes visible in the scroll area

test/features/step/page_is_displayed.dart

@@ -1,6 +1,6 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/view_model.dart';
+import 'package:pdf_signature/ui/features/pdf/view_model/pdf_controller.dart';
 import '_world.dart';
 
 /// Usage: page {1} is displayed

test/features/step/the_canvas_becomes_blank.dart

@@ -1,6 +1,6 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/view_model.dart';
+import 'package:pdf_signature/ui/features/pdf/view_model/signature_controller.dart';
 import '_world.dart';
 
 /// Usage: the canvas becomes blank

test/features/step/the_document_is_open.dart

@@ -1,6 +1,6 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/view_model.dart';
+import 'package:pdf_signature/ui/features/pdf/view_model/pdf_controller.dart';
 import '_world.dart';
 
 /// Usage: the document is open

test/features/step/the_first_page_is_displayed.dart

@@ -1,6 +1,6 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/view_model.dart';
+import 'package:pdf_signature/ui/features/pdf/view_model/pdf_controller.dart';
 import '_world.dart';
 
 /// Usage: the first page is displayed

test/features/step/the_go_to_input_cannot_be_used.dart

@@ -1,6 +1,6 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/view_model.dart';
+import 'package:pdf_signature/ui/features/pdf/view_model/pdf_controller.dart';
 import '_world.dart';
 
 /// Usage: the Go to input cannot be used

test/features/step/the_image_is_loaded_and_shown_as_a_signature_asset.dart

@@ -1,6 +1,6 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/view_model.dart';
+import 'package:pdf_signature/ui/features/pdf/view_model/signature_controller.dart';
 import '_world.dart';
 
 /// Usage: the image is loaded and shown as a signature asset

test/features/step/the_image_is_not_added_to_the_document.dart

@@ -1,6 +1,6 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/view_model.dart';
+import 'package:pdf_signature/ui/features/pdf/view_model/signature_controller.dart';
 import '_world.dart';
 
 /// Usage: the image is not added to the document

test/features/step/the_image_scales_proportionally.dart

@@ -1,6 +1,6 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/view_model.dart';
+import 'package:pdf_signature/ui/features/pdf/view_model/signature_controller.dart';
 import '_world.dart';
 
 /// Usage: the image scales proportionally

test/features/step/the_last_page_is_displayed_page.dart

@@ -1,6 +1,6 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/view_model.dart';
+import 'package:pdf_signature/ui/features/pdf/view_model/pdf_controller.dart';
 import '_world.dart';
 
 /// Usage: the last page is displayed (page {5})

test/features/step/the_last_stroke_is_removed.dart

@@ -1,6 +1,6 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/view_model.dart';
+import 'package:pdf_signature/ui/features/pdf/view_model/signature_controller.dart';
 import '_world.dart';
 
 /// Usage: the last stroke is removed

test/features/step/the_left_pages_overview_highlights_page.dart

@@ -1,6 +1,6 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/view_model.dart';
+import 'package:pdf_signature/ui/features/pdf/view_model/pdf_controller.dart';
 import '_world.dart';
 
 /// Usage: the left pages overview highlights page {5}

test/features/step/the_other_signatures_remain_unchanged.dart

@@ -1,6 +1,6 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/view_model.dart';
+import 'package:pdf_signature/ui/features/pdf/view_model/pdf_controller.dart';
 import '_world.dart';
 
 /// Usage: the other signatures remain unchanged

test/features/step/the_page_label_shows_page_of.dart

@@ -1,6 +1,6 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/view_model.dart';
+import 'package:pdf_signature/ui/features/pdf/view_model/pdf_controller.dart';
 import '_world.dart';
 
 /// Usage: the page label shows "Page {5} of {5}"

test/features/step/the_preview_updates_immediately.dart

@@ -1,6 +1,6 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/view_model.dart';
+import 'package:pdf_signature/ui/features/pdf/view_model/signature_controller.dart';
 import '_world.dart';
 
 /// Usage: the preview updates immediately

test/features/step/the_signature_is_stamped_at_the_exact_pdf_page_coordinates_and_size.dart

@@ -1,6 +1,6 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/view_model.dart';
+import 'package:pdf_signature/ui/features/pdf/view_model/signature_controller.dart';
 import '_world.dart';
 
 /// Usage: the signature is stamped at the exact PDF page coordinates and size

test/features/step/the_signature_on_page_is_shown_on_page.dart

@@ -1,6 +1,6 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/view_model.dart';
+import 'package:pdf_signature/ui/features/pdf/view_model/pdf_controller.dart';
 import '_world.dart';
 
 /// Usage: the signature on page {5} is shown on page {5}

test/features/step/the_signature_on_page_remains.dart

@@ -1,6 +1,6 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/view_model.dart';
+import 'package:pdf_signature/ui/features/pdf/view_model/pdf_controller.dart';
 import '_world.dart';
 
 /// Usage: the signature on page {2} remains

test/features/step/the_signature_remains_within_the_page_area.dart

@@ -1,6 +1,6 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/view_model.dart';
+import 'package:pdf_signature/ui/features/pdf/view_model/signature_controller.dart';
 import '_world.dart';
 
 /// Usage: the signature remains within the page area

test/features/step/the_signatures_appear_on_the_corresponding_page_in_the_output.dart

@@ -1,6 +1,7 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/view_model.dart';
+import 'package:pdf_signature/ui/features/pdf/view_model/signature_controller.dart';
+import 'package:pdf_signature/ui/features/pdf/view_model/pdf_controller.dart';
 import '_world.dart';
 
 /// Usage: the signatures appear on the corresponding page in the output

test/features/step/the_size_and_position_update_in_real_time.dart

@@ -1,6 +1,6 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/view_model.dart';
+import 'package:pdf_signature/ui/features/pdf/view_model/signature_controller.dart';
 import '_world.dart';
 
 /// Usage: the size and position update in real time

test/features/step/the_user_attempts_to_save.dart

@@ -1,6 +1,7 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/view_model.dart';
+import 'package:pdf_signature/ui/features/pdf/view_model/signature_controller.dart';
+import 'package:pdf_signature/ui/features/pdf/view_model/pdf_controller.dart';
 import '_world.dart';
 
 /// Usage: the user attempts to save

test/features/step/the_user_can_apply_or_reset_adjustments.dart

@@ -1,6 +1,6 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/view_model.dart';
+import 'package:pdf_signature/ui/features/pdf/view_model/signature_controller.dart';
 import '_world.dart';
 
 /// Usage: the user can apply or reset adjustments

test/features/step/the_user_can_move_to_the_next_or_previous_page.dart

@@ -1,6 +1,6 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/view_model.dart';
+import 'package:pdf_signature/ui/features/pdf/view_model/pdf_controller.dart';
 import '_world.dart';
 
 /// Usage: the user can move to the next or previous page

test/features/step/the_user_changes_contrast_and_brightness_controls.dart

@@ -1,6 +1,6 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/view_model.dart';
+import 'package:pdf_signature/ui/features/pdf/view_model/signature_controller.dart';
 import '_world.dart';
 
 /// Usage: the user changes contrast and brightness controls

test/features/step/the_user_chooses_a_signature_image_file.dart

@@ -1,7 +1,7 @@
 import 'dart:typed_data';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/view_model.dart';
+import 'package:pdf_signature/ui/features/pdf/view_model/signature_controller.dart';
 import '_world.dart';
 
 /// Usage: the user chooses a signature image file

test/features/step/the_user_chooses_undo.dart

@@ -1,6 +1,6 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/view_model.dart';
+import 'package:pdf_signature/ui/features/pdf/view_model/signature_controller.dart';
 import '_world.dart';
 
 /// Usage: the user chooses undo

test/features/step/the_user_clears_the_canvas.dart

@@ -1,6 +1,6 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/view_model.dart';
+import 'package:pdf_signature/ui/features/pdf/view_model/signature_controller.dart';
 import '_world.dart';
 
 /// Usage: the user clears the canvas

test/features/step/the_user_clicks_the_go_to_apply_button.dart

@@ -1,6 +1,6 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/view_model.dart';
+import 'package:pdf_signature/ui/features/pdf/view_model/pdf_controller.dart';
 import '_world.dart';
 
 /// Usage: the user clicks the Go to apply button

test/features/step/the_user_clicks_the_thumbnail_for_page.dart

@@ -1,6 +1,6 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/view_model.dart';
+import 'package:pdf_signature/ui/features/pdf/view_model/pdf_controller.dart';
 import '_world.dart';
 
 /// Usage: the user clicks the thumbnail for page {2}

test/features/step/the_user_deletes_one_selected_signature.dart

@@ -1,6 +1,6 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/view_model.dart';
+import 'package:pdf_signature/ui/features/pdf/view_model/pdf_controller.dart';
 import '_world.dart';
 
 /// Usage: the user deletes one selected signature

test/features/step/the_user_drags_handles_to_resize_and_drags_to_reposition.dart

@@ -1,6 +1,6 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/view_model.dart';
+import 'package:pdf_signature/ui/features/pdf/view_model/signature_controller.dart';
 import '_world.dart';
 
 /// Usage: the user drags handles to resize and drags to reposition

test/features/step/the_user_draws_strokes_and_confirms.dart

@@ -1,7 +1,7 @@
 import 'dart:typed_data';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/view_model.dart';
+import 'package:pdf_signature/ui/features/pdf/view_model/signature_controller.dart';
 import '_world.dart';
 
 /// Usage: the user draws strokes and confirms

test/features/step/the_user_enables_aspect_ratio_lock_and_resizes.dart

@@ -1,6 +1,6 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/view_model.dart';
+import 'package:pdf_signature/ui/features/pdf/view_model/signature_controller.dart';
 import '_world.dart';
 
 /// Usage: the user enables aspect ratio lock and resizes

test/features/step/the_user_enables_background_removal.dart

@@ -1,6 +1,6 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/view_model.dart';
+import 'package:pdf_signature/ui/features/pdf/view_model/signature_controller.dart';
 import '_world.dart';
 
 /// Usage: the user enables background removal

test/features/step/the_user_enters_into_the_go_to_input_and_applies_it.dart

@@ -1,6 +1,6 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/view_model.dart';
+import 'package:pdf_signature/ui/features/pdf/view_model/pdf_controller.dart';
 import '_world.dart';
 
 /// Usage: the user enters {99} into the Go to input and applies it

test/features/step/the_user_is_notified_of_the_issue.dart

@@ -1,6 +1,6 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/view_model.dart';
+import 'package:pdf_signature/ui/features/pdf/view_model/signature_controller.dart';
 import '_world.dart';
 
 /// Usage: the user is notified of the issue

test/features/step/the_user_jumps_to_page.dart

@@ -1,6 +1,6 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/view_model.dart';
+import 'package:pdf_signature/ui/features/pdf/view_model/pdf_controller.dart';
 import '_world.dart';
 
 /// Usage: the user jumps to page {2}

test/features/step/the_user_navigates_to_page_and_places_another_signature.dart

@@ -2,7 +2,8 @@ import 'dart:typed_data';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:flutter/material.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/view_model.dart';
+import 'package:pdf_signature/ui/features/pdf/view_model/signature_controller.dart';
+import 'package:pdf_signature/ui/features/pdf/view_model/pdf_controller.dart';
 import '_world.dart';
 
 /// Usage: the user navigates to page {3} and places another signature

test/features/step/the_user_places_a_signature_from_picture_on_page.dart

@@ -2,7 +2,8 @@ import 'dart:typed_data';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:flutter/material.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/view_model.dart';
+import 'package:pdf_signature/ui/features/pdf/view_model/signature_controller.dart';
+import 'package:pdf_signature/ui/features/pdf/view_model/pdf_controller.dart';
 import '_world.dart';
 
 /// Usage: the user places a signature from picture <second_image> on page <second_page>

test/features/step/the_user_places_a_signature_on_page.dart

@@ -2,7 +2,8 @@ import 'dart:typed_data';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:flutter/material.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/view_model.dart';
+import 'package:pdf_signature/ui/features/pdf/view_model/signature_controller.dart';
+import 'package:pdf_signature/ui/features/pdf/view_model/pdf_controller.dart';
 import '_world.dart';
 
 /// Usage: the user places a signature on page {1}

test/features/step/the_user_places_it_in_multiple_locations_in_the_document.dart

@@ -1,7 +1,7 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:flutter/material.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/view_model.dart';
+import 'package:pdf_signature/ui/features/pdf/view_model/pdf_controller.dart';
 import '_world.dart';
 
 /// Usage: the user places it in multiple locations in the document

test/features/step/the_user_places_two_signatures_on_the_same_page.dart

@@ -1,8 +1,8 @@
 import 'dart:typed_data';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:flutter/material.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/view_model.dart';
+import 'package:pdf_signature/ui/features/pdf/view_model/signature_controller.dart';
+import 'package:pdf_signature/ui/features/pdf/view_model/pdf_controller.dart';
 import '_world.dart';
 
 /// Usage: the user places two signatures on the same page

test/features/step/the_user_savesexports_the_document.dart

@@ -1,7 +1,8 @@
 import 'dart:typed_data';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/view_model.dart';
+import 'package:pdf_signature/ui/features/pdf/view_model/signature_controller.dart';
+import 'package:pdf_signature/ui/features/pdf/view_model/pdf_controller.dart';
 import '_world.dart';
 
 /// Usage: the user saves/exports the document

test/features/step/the_user_selects.dart

@@ -1,6 +1,6 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/view_model.dart';
+import 'package:pdf_signature/ui/features/pdf/view_model/pdf_controller.dart';
 import '_world.dart';
 
 /// Usage: the user selects "<file>"

test/features/step/the_user_types_into_the_go_to_input_and_presses_enter.dart

@@ -1,6 +1,6 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/view_model.dart';
+import 'package:pdf_signature/ui/features/pdf/view_model/pdf_controller.dart';
 import '_world.dart';
 
 /// Usage: the user types {3} into the Go to input and presses Enter

test/features/step/three_signatures_are_placed_on_the_current_page.dart

@@ -1,7 +1,7 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:flutter/material.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/view_model.dart';
+import 'package:pdf_signature/ui/features/pdf/view_model/pdf_controller.dart';
 import '_world.dart';
 
 /// Usage: three signatures are placed on the current page

test/widget/export_flow_test.dart

@@ -4,7 +4,8 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
 
 import 'package:pdf_signature/data/services/export_service.dart';
 import 'package:pdf_signature/data/services/export_providers.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/view_model.dart';
+import 'package:pdf_signature/ui/features/pdf/view_model/signature_controller.dart';
+import 'package:pdf_signature/ui/features/pdf/view_model/pdf_controller.dart';
 import 'package:pdf_signature/ui/features/pdf/widgets/pdf_screen.dart';
 import 'package:pdf_signature/l10n/app_localizations.dart';
 

test/widget/helpers.dart

@@ -5,7 +5,8 @@ import 'package:image/image.dart' as img;
 import 'dart:typed_data';
 
 import 'package:pdf_signature/ui/features/pdf/widgets/pdf_screen.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/view_model.dart';
+import 'package:pdf_signature/ui/features/pdf/view_model/signature_controller.dart';
+import 'package:pdf_signature/ui/features/pdf/view_model/pdf_controller.dart';
 import 'package:pdf_signature/data/services/export_providers.dart';
 import 'package:pdf_signature/l10n/app_localizations.dart';
 // preferences_providers.dart no longer exports pageViewModeProvider

test/widget/pdf_navigation_widget_test.dart

@@ -3,7 +3,7 @@ import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 
 import 'package:pdf_signature/ui/features/pdf/widgets/pdf_screen.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/view_model.dart';
+import 'package:pdf_signature/ui/features/pdf/view_model/pdf_controller.dart';
 import 'package:pdf_signature/data/model/model.dart';
 import 'package:pdf_signature/data/services/export_providers.dart';
 import 'package:pdf_signature/l10n/app_localizations.dart';

test/widget/pdf_page_area_early_jump_test.dart

@@ -3,7 +3,7 @@ import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 
 import 'package:pdf_signature/ui/features/pdf/widgets/pdf_page_area.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/view_model.dart';
+import 'package:pdf_signature/ui/features/pdf/view_model/pdf_controller.dart';
 import 'package:pdf_signature/data/services/export_providers.dart';
 import 'package:pdf_signature/l10n/app_localizations.dart';
 import 'package:pdf_signature/data/model/model.dart';

test/widget/pdf_page_area_jump_test.dart

@@ -3,7 +3,7 @@ import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 
 import 'package:pdf_signature/ui/features/pdf/widgets/pdf_page_area.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/view_model.dart';
+import 'package:pdf_signature/ui/features/pdf/view_model/pdf_controller.dart';
 import 'package:pdf_signature/data/services/export_providers.dart';
 import 'package:pdf_signature/l10n/app_localizations.dart';
 import 'package:pdf_signature/data/model/model.dart';

test/widget/pdf_page_area_test.dart

@@ -3,7 +3,7 @@ import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 
 import 'package:pdf_signature/ui/features/pdf/widgets/pdf_page_area.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/view_model.dart';
+import 'package:pdf_signature/ui/features/pdf/view_model/pdf_controller.dart';
 import 'package:pdf_signature/data/services/export_providers.dart';
 
 void main() {

test/widget/regression_signature_tests.dart

@@ -1,7 +1,9 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/view_model.dart';
+import 'package:pdf_signature/ui/features/pdf/view_model/signature_library.dart';
+import 'package:pdf_signature/ui/features/pdf/view_model/signature_controller.dart';
+import 'package:pdf_signature/ui/features/pdf/view_model/pdf_controller.dart';
 import 'package:pdf_signature/ui/features/pdf/widgets/pdf_screen.dart';
 
 import 'helpers.dart';

test/widget/welcome_drop_test.dart

@@ -6,7 +6,8 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
 
 import 'package:pdf_signature/l10n/app_localizations.dart';
 import 'package:pdf_signature/ui/features/welcome/widgets/welcome_screen.dart';
-import 'package:pdf_signature/ui/features/pdf/view_model/view_model.dart';
+import 'package:pdf_signature/ui/features/pdf/view_model/signature_controller.dart';
+import 'package:pdf_signature/ui/features/pdf/view_model/pdf_controller.dart';
 
 class _FakeDropReadable implements DropReadable {
   final String _name;