fix: ajoute backup_service oublie lors du commit precedent

Le commit 543f54dc livrait l'ecran Statistiques qui importe
services/backup_service.dart, mais le service et son test n'avaient
jamais ete ajoutes a l'index : la branche poussee ne compilait pas.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>

CLAUDE.md

@@ -41,10 +41,12 @@ flutter test --coverage
 
 ## Features
 
-### Analyse de cibles de tir
+### Capture de cibles de tir
 - Support de cibles concentriques (anneaux) et silhouettes
 - Chargement d'images de cibles depuis la galerie ou la caméra
-- Détection automatique du centre et du rayon de la cible
+- Aperçu caméra avec aide au cadrage : détection OpenCV de la cible (mire)
+  et indicateur de parallélisme par accéléromètre (pitch/roll)
+- Écran de centrage/recadrage : rotation fine, déplacement pixel par pixel
 
 ### Calibration des cibles
 - Ajustement manuel du centre, du rayon et du nombre d'anneaux (1-10)
@@ -52,14 +54,13 @@ flutter test --coverage
 - Slider global pour redimensionner tous les anneaux proportionnellement
 - Visualisation en temps réel des zones de score
 
-### Détection d'impacts
-- **Ajout manuel** : cliquer sur l'image pour placer un impact
-- **Détection automatique** : algorithme de détection de blobs avec paramètres ajustables
-  - Seuil de luminosité
-  - Taille min/max des impacts
-  - Circularité minimale
-  - Ratio de remplissage (distingue les trous pleins des cercles vides)
-- **Détection par références** : sélectionner 2-4 impacts manuellement, l'algorithme apprend leurs caractéristiques et détecte les impacts similaires
+### Placement des impacts
+- **Éditeur d'impacts plein écran** : tap pour ajouter (y compris juste à côté
+  ou par-dessus un impact existant), appui long pour déplacer, pincer pour zoomer
+- Un tap n'ouvre jamais d'édition de score : le score reste calculé
+  automatiquement d'après la position de l'impact
+- Le placement est entièrement manuel ; le bouton ↻ de l'écran de synthèse
+  efface tous les impacts sans toucher à la calibration
 
 ### Calcul des scores
 - Score automatique basé sur la position de l'impact dans les zones
@@ -79,6 +80,19 @@ flutter test --coverage
 - **Distribution régionale** : répartition des tirs par quadrant
 - Filtrage par période : session, semaine, mois, toutes les sessions
 
+### Sauvegarde (export / import JSON)
+- Bouton **Exporter** en bas de l'écran Statistiques : génère un fichier JSON
+  (sessions + cibles + impacts + calibration, armurerie + entretien, et un
+  instantané des statistiques calculées) puis ouvre la feuille de partage du
+  système (`share_plus`) pour l'envoyer où l'on veut
+- Option « Inclure les photos des cibles » : photos encodées en base64 dans le
+  JSON (sauvegarde complète mais fichier lourd) ; sans elles le fichier reste léger
+- Bouton **Importer** (`file_selector`) : aperçu du contenu avant confirmation,
+  puis fusion avec les données existantes — même identifiant = mise à jour,
+  donc réimporter deux fois ne crée pas de doublon et rien n'est effacé
+- Les statistiques ne sont pas réimportées : elles sont recalculées à partir des
+  sessions. Elles figurent dans le fichier pour être exploitables telles quelles
+
 ### Historique des sessions
 - Sauvegarde des sessions avec date, score, notes
 - Visualisation des sessions passées
@@ -120,3 +134,4 @@ session_list_item.dart	  Item de liste représentant une session
 history_chart.dart	      Graphique d'évolution des 10 dernières sessions
 statistics_screen.dart	  Écran statistiques avec filtrage par période
 heat_map_widget.dart	    Heat map avec gradient bleu→rouge
+backup_service.dart	      Export/import JSON des sessions, stats et armurerie

analyze_log.txt

@@ -1,31 +0,0 @@
-Analyzing bully...                                              
-
-   info - Statements in an if should be enclosed in a block - lib\features\analysis\analysis_screen.dart:122:17 - curly_braces_in_flow_control_structures
-   info - 'withOpacity' is deprecated and shouldn't be used. Use .withValues() to avoid precision loss - lib\features\analysis\analysis_screen.dart:650:51 - deprecated_member_use
-warning - The declaration '_showAddShotHint' isn't referenced - lib\features\analysis\analysis_screen.dart:1083:8 - unused_element
-warning - The declaration '_showAutoDetectDialog' isn't referenced - lib\features\analysis\analysis_screen.dart:1120:8 - unused_element
-warning - Unused import: 'widgets/target_type_selector.dart' - lib\features\capture\capture_screen.dart:16:8 - unused_import
-   info - The private field _selectedType could be 'final' - lib\features\capture\capture_screen.dart:28:14 - prefer_final_fields
-   info - 'scale' is deprecated and shouldn't be used. Use scaleByVector3, scaleByVector4, or scaleByDouble instead - lib\features\crop\crop_screen.dart:141:25 - deprecated_member_use
-   info - The import of 'package:flutter/foundation.dart' is unnecessary because all of the used elements are also provided by the import of 'package:flutter/material.dart' - lib\features\statistics\statistics_screen.dart:8:8 - unnecessary_import
-warning - The declaration '_buildLegendItem' isn't referenced - lib\features\statistics\statistics_screen.dart:309:10 - unused_element
-   info - Unnecessary use of string interpolation - lib\features\statistics\statistics_screen.dart:408:15 - unnecessary_string_interpolations
-   info - Don't invoke 'print' in production code - lib\services\image_processing_service.dart:192:7 - avoid_print
-   info - Don't invoke 'print' in production code - lib\services\image_processing_service.dart:239:7 - avoid_print
-   info - Don't invoke 'print' in production code - lib\services\image_processing_service.dart:246:9 - avoid_print
-   info - Don't invoke 'print' in production code - lib\services\image_processing_service.dart:278:9 - avoid_print
-   info - Don't invoke 'print' in production code - lib\services\image_processing_service.dart:289:11 - avoid_print
-   info - Don't invoke 'print' in production code - lib\services\image_processing_service.dart:292:11 - avoid_print
-   info - Don't invoke 'print' in production code - lib\services\image_processing_service.dart:297:9 - avoid_print
-   info - Don't invoke 'print' in production code - lib\services\image_processing_service.dart:332:7 - avoid_print
-   info - Don't invoke 'print' in production code - lib\services\image_processing_service.dart:336:7 - avoid_print
-   info - Don't invoke 'print' in production code - lib\services\image_processing_service.dart:683:7 - avoid_print
-   info - Don't invoke 'print' in production code - lib\services\image_processing_service.dart:725:7 - avoid_print
-   info - Don't invoke 'print' in production code - lib\services\image_processing_service.dart:736:7 - avoid_print
-warning - The declaration '_detectDarkSpotsAdaptive' isn't referenced - lib\services\image_processing_service.dart:780:15 - unused_element
-   info - Don't invoke 'print' in production code - lib\services\opencv_impact_detection_service.dart:104:5 - avoid_print
-   info - Don't invoke 'print' in production code - lib\services\opencv_impact_detection_service.dart:116:5 - avoid_print
-   info - Don't invoke 'print' in production code - lib\services\target_detection_service.dart:297:7 - avoid_print
-   info - Don't invoke 'print' in production code - lib\services\target_detection_service.dart:342:7 - avoid_print
-
-27 issues found. (ran in 1.9s)

analyze_results_fixed.txt

@@ -1,37 +0,0 @@
-Analyzing bully...                                              
-
-   info - Don't invoke 'print' in production code - lib\features\analysis\analysis_provider.dart:553:7 - avoid_print
-   info - The private field _selectedType could be 'final' - lib\features\capture\capture_screen.dart:27:14 - prefer_final_fields
-   info - 'scale' is deprecated and shouldn't be used. Use scaleByVector3, scaleByVector4, or scaleByDouble instead - lib\features\crop\crop_screen.dart:142:25 - deprecated_member_use
-   info - Statements in an if should be enclosed in a block - lib\services\distortion_correction_service.dart:566:11 - curly_braces_in_flow_control_structures
-   info - Don't invoke 'print' in production code - lib\services\distortion_correction_service.dart:639:7 - avoid_print
-   info - Don't invoke 'print' in production code - lib\services\distortion_correction_service.dart:764:7 - avoid_print
-   info - Don't invoke 'print' in production code - lib\services\distortion_correction_service.dart:825:9 - avoid_print
-   info - Don't invoke 'print' in production code - lib\services\distortion_correction_service.dart:953:7 - avoid_print
-   info - Don't invoke 'print' in production code - lib\services\distortion_correction_service.dart:1015:9 - avoid_print
-   info - Don't invoke 'print' in production code - lib\services\distortion_correction_service.dart:1063:7 - avoid_print
-   info - Don't invoke 'print' in production code - lib\services\image_processing_service.dart:192:7 - avoid_print
-   info - Don't invoke 'print' in production code - lib\services\image_processing_service.dart:239:7 - avoid_print
-   info - Don't invoke 'print' in production code - lib\services\image_processing_service.dart:246:9 - avoid_print
-   info - Don't invoke 'print' in production code - lib\services\image_processing_service.dart:278:9 - avoid_print
-   info - Don't invoke 'print' in production code - lib\services\image_processing_service.dart:289:11 - avoid_print
-   info - Don't invoke 'print' in production code - lib\services\image_processing_service.dart:292:11 - avoid_print
-   info - Don't invoke 'print' in production code - lib\services\image_processing_service.dart:297:9 - avoid_print
-   info - Don't invoke 'print' in production code - lib\services\image_processing_service.dart:332:7 - avoid_print
-   info - Don't invoke 'print' in production code - lib\services\image_processing_service.dart:336:7 - avoid_print
-   info - Don't invoke 'print' in production code - lib\services\image_processing_service.dart:683:7 - avoid_print
-   info - Don't invoke 'print' in production code - lib\services\image_processing_service.dart:725:7 - avoid_print
-   info - Don't invoke 'print' in production code - lib\services\image_processing_service.dart:736:7 - avoid_print
-warning - The declaration '_detectDarkSpotsAdaptive' isn't referenced - lib\services\image_processing_service.dart:780:15 - unused_element
-   info - Don't invoke 'print' in production code - lib\services\target_detection_service.dart:328:7 - avoid_print
-   info - Don't invoke 'print' in production code - lib\services\target_detection_service.dart:377:7 - avoid_print
-   info - Don't invoke 'print' in production code - lib\services\target_detection_service.dart:414:7 - avoid_print
-   info - Don't invoke 'print' in production code - lib\services\yolo_impact_detection_service.dart:23:9 - avoid_print
-   info - Don't invoke 'print' in production code - lib\services\yolo_impact_detection_service.dart:29:7 - avoid_print
-   info - Don't invoke 'print' in production code - lib\services\yolo_impact_detection_service.dart:31:7 - avoid_print
-   info - Don't invoke 'print' in production code - lib\services\yolo_impact_detection_service.dart:67:7 - avoid_print
-   info - Don't invoke 'print' in production code - tests\opencv_quad_test.dart:4:3 - avoid_print
-   info - Don't invoke 'print' in production code - tests\opencv_quad_test.dart:5:3 - avoid_print
-   info - Don't invoke 'print' in production code - tests\opencv_quad_test.dart:6:3 - avoid_print
-   info - Don't invoke 'print' in production code - tests\test_homography.dart:4:3 - avoid_print
-

analyze_utf8.txt

@@ -1,38 +0,0 @@
-Analyzing bully...                                              
-
-   info - Don't invoke 'print' in production code - lib\features\analysis\analysis_provider.dart:392:7 - avoid_print
-   info - Don't invoke 'print' in production code - lib\features\analysis\analysis_provider.dart:596:7 - avoid_print
-   info - The private field _selectedType could be 'final' - lib\features\capture\capture_screen.dart:27:14 - prefer_final_fields
-   info - 'scale' is deprecated and shouldn't be used. Use scaleByVector3, scaleByVector4, or scaleByDouble instead - lib\features\crop\crop_screen.dart:142:25 - deprecated_member_use
-   info - Statements in an if should be enclosed in a block - lib\services\distortion_correction_service.dart:566:11 - curly_braces_in_flow_control_structures
-   info - Don't invoke 'print' in production code - lib\services\distortion_correction_service.dart:639:7 - avoid_print
-   info - Don't invoke 'print' in production code - lib\services\distortion_correction_service.dart:764:7 - avoid_print
-   info - Don't invoke 'print' in production code - lib\services\distortion_correction_service.dart:825:9 - avoid_print
-   info - Don't invoke 'print' in production code - lib\services\distortion_correction_service.dart:953:7 - avoid_print
-   info - Don't invoke 'print' in production code - lib\services\distortion_correction_service.dart:1015:9 - avoid_print
-   info - Don't invoke 'print' in production code - lib\services\distortion_correction_service.dart:1063:7 - avoid_print
-   info - Don't invoke 'print' in production code - lib\services\image_processing_service.dart:192:7 - avoid_print
-   info - Don't invoke 'print' in production code - lib\services\image_processing_service.dart:239:7 - avoid_print
-   info - Don't invoke 'print' in production code - lib\services\image_processing_service.dart:246:9 - avoid_print
-   info - Don't invoke 'print' in production code - lib\services\image_processing_service.dart:278:9 - avoid_print
-   info - Don't invoke 'print' in production code - lib\services\image_processing_service.dart:289:11 - avoid_print
-   info - Don't invoke 'print' in production code - lib\services\image_processing_service.dart:292:11 - avoid_print
-   info - Don't invoke 'print' in production code - lib\services\image_processing_service.dart:297:9 - avoid_print
-   info - Don't invoke 'print' in production code - lib\services\image_processing_service.dart:332:7 - avoid_print
-   info - Don't invoke 'print' in production code - lib\services\image_processing_service.dart:336:7 - avoid_print
-   info - Don't invoke 'print' in production code - lib\services\image_processing_service.dart:683:7 - avoid_print
-   info - Don't invoke 'print' in production code - lib\services\image_processing_service.dart:725:7 - avoid_print
-   info - Don't invoke 'print' in production code - lib\services\image_processing_service.dart:736:7 - avoid_print
-warning - The declaration '_detectDarkSpotsAdaptive' isn't referenced - lib\services\image_processing_service.dart:780:15 - unused_element
-   info - Don't invoke 'print' in production code - lib\services\target_detection_service.dart:328:7 - avoid_print
-   info - Don't invoke 'print' in production code - lib\services\target_detection_service.dart:377:7 - avoid_print
-   info - Don't invoke 'print' in production code - lib\services\target_detection_service.dart:414:7 - avoid_print
-   info - Don't invoke 'print' in production code - lib\services\yolo_impact_detection_service.dart:23:9 - avoid_print
-   info - Don't invoke 'print' in production code - lib\services\yolo_impact_detection_service.dart:29:7 - avoid_print
-   info - Don't invoke 'print' in production code - lib\services\yolo_impact_detection_service.dart:31:7 - avoid_print
-   info - Don't invoke 'print' in production code - lib\services\yolo_impact_detection_service.dart:67:7 - avoid_print
-   info - Don't invoke 'print' in production code - tests\opencv_quad_test.dart:4:3 - avoid_print
-   info - Don't invoke 'print' in production code - tests\opencv_quad_test.dart:5:3 - avoid_print
-   info - Don't invoke 'print' in production code - tests\opencv_quad_test.dart:6:3 - avoid_print
-   info - Don't invoke 'print' in production code - tests\test_homography.dart:4:3 - avoid_print
-

backendia/.gitignore

@@ -13,8 +13,7 @@ dashboard/out/
 .env.test.local
 .env.production.local
 
-# Database
-backendia/uploads/data/database.sqlite
+# Database (contient des données utilisateurs — jamais dans git)
 *.sqlite
 *.sqlite-journal
 
@@ -23,7 +22,6 @@ uploads/images/*
 !uploads/images/.gitkeep
 uploads/data/*
 !uploads/data/.gitkeep
-!uploads/data/database.sqlite
 exports/*
 !exports/.gitkeep
 

backendia/exports/archive_2026-04-29T13-34-48-508Z/data/photo-1777452200161-140195750.json

@@ -1,116 +0,0 @@
-{
-  "session_id": "session_1777452202935",
-  "timestamp": "2026-04-29T08:43:22.943303",
-  "device_info": {
-    "model": "google sdk_gphone64_x86_64",
-    "os": "Android 16"
-  },
-  "target_metadata": {
-    "type": "concentric",
-    "distance_meters": 25,
-    "weapon": "Unknown"
-  },
-  "plotting": {
-    "target_corners": [
-      {
-        "norm_x": 0.09999999999999998,
-        "norm_y": 0.09999999999999998
-      },
-      {
-        "norm_x": 0.9,
-        "norm_y": 0.09999999999999998
-      },
-      {
-        "norm_x": 0.9,
-        "norm_y": 0.9
-      },
-      {
-        "norm_x": 0.09999999999999998,
-        "norm_y": 0.9
-      }
-    ],
-    "impacts": [
-      {
-        "id": 1,
-        "label": "bullet_hole",
-        "score": 6,
-        "coords": {
-          "norm_x": 0.3934941044560185,
-          "norm_y": 0.665676540798611
-        }
-      },
-      {
-        "id": 2,
-        "label": "bullet_hole",
-        "score": 5,
-        "coords": {
-          "norm_x": 0.6055302372685185,
-          "norm_y": 0.6953124999999999
-        }
-      },
-      {
-        "id": 3,
-        "label": "bullet_hole",
-        "score": 8,
-        "coords": {
-          "norm_x": 0.5981137876157407,
-          "norm_y": 0.5249565972222221
-        }
-      },
-      {
-        "id": 4,
-        "label": "bullet_hole",
-        "score": 6,
-        "coords": {
-          "norm_x": 0.6759033203125,
-          "norm_y": 0.4786376953125
-        }
-      },
-      {
-        "id": 5,
-        "label": "bullet_hole",
-        "score": 9,
-        "coords": {
-          "norm_x": 0.48608398437499994,
-          "norm_y": 0.5490315755208333
-        }
-      },
-      {
-        "id": 6,
-        "label": "bullet_hole",
-        "score": 9,
-        "coords": {
-          "norm_x": 0.5101625795717593,
-          "norm_y": 0.43238661024305547
-        }
-      },
-      {
-        "id": 7,
-        "label": "bullet_hole",
-        "score": 7,
-        "coords": {
-          "norm_x": 0.6296079282407407,
-          "norm_y": 0.4203152126736111
-        }
-      },
-      {
-        "id": 8,
-        "label": "bullet_hole",
-        "score": 9,
-        "coords": {
-          "norm_x": 0.46386718749999994,
-          "norm_y": 0.48046875
-        }
-      },
-      {
-        "id": 9,
-        "label": "bullet_hole",
-        "score": 6,
-        "coords": {
-          "norm_x": 0.3379521122685185,
-          "norm_y": 0.4397786458333333
-        }
-      }
-    ]
-  }
-}

backendia/exports/archive_2026-04-29T13-34-48-508Z/data/photo-1777452478470-134185918.json

@@ -1,116 +0,0 @@
-{
-  "session_id": "session_1777452481252",
-  "timestamp": "2026-04-29T08:48:01.259705",
-  "device_info": {
-    "model": "google sdk_gphone64_x86_64",
-    "os": "Android 16"
-  },
-  "target_metadata": {
-    "type": "concentric",
-    "distance_meters": 25,
-    "weapon": "Unknown"
-  },
-  "plotting": {
-    "target_corners": [
-      {
-        "norm_x": 0.09999999999999998,
-        "norm_y": 0.09999999999999998
-      },
-      {
-        "norm_x": 0.9,
-        "norm_y": 0.09999999999999998
-      },
-      {
-        "norm_x": 0.9,
-        "norm_y": 0.9
-      },
-      {
-        "norm_x": 0.09999999999999998,
-        "norm_y": 0.9
-      }
-    ],
-    "impacts": [
-      {
-        "id": 1,
-        "label": "bullet_hole",
-        "score": 6,
-        "coords": {
-          "norm_x": 0.3934941044560185,
-          "norm_y": 0.665676540798611
-        }
-      },
-      {
-        "id": 2,
-        "label": "bullet_hole",
-        "score": 5,
-        "coords": {
-          "norm_x": 0.6055302372685185,
-          "norm_y": 0.6953124999999999
-        }
-      },
-      {
-        "id": 3,
-        "label": "bullet_hole",
-        "score": 8,
-        "coords": {
-          "norm_x": 0.5981137876157407,
-          "norm_y": 0.5249565972222221
-        }
-      },
-      {
-        "id": 4,
-        "label": "bullet_hole",
-        "score": 6,
-        "coords": {
-          "norm_x": 0.6759033203125,
-          "norm_y": 0.4786376953125
-        }
-      },
-      {
-        "id": 5,
-        "label": "bullet_hole",
-        "score": 9,
-        "coords": {
-          "norm_x": 0.48608398437499994,
-          "norm_y": 0.5490315755208333
-        }
-      },
-      {
-        "id": 6,
-        "label": "bullet_hole",
-        "score": 9,
-        "coords": {
-          "norm_x": 0.5101625795717593,
-          "norm_y": 0.43238661024305547
-        }
-      },
-      {
-        "id": 7,
-        "label": "bullet_hole",
-        "score": 7,
-        "coords": {
-          "norm_x": 0.6296079282407407,
-          "norm_y": 0.4203152126736111
-        }
-      },
-      {
-        "id": 8,
-        "label": "bullet_hole",
-        "score": 9,
-        "coords": {
-          "norm_x": 0.46386718749999994,
-          "norm_y": 0.48046875
-        }
-      },
-      {
-        "id": 9,
-        "label": "bullet_hole",
-        "score": 6,
-        "coords": {
-          "norm_x": 0.3379521122685185,
-          "norm_y": 0.4397786458333333
-        }
-      }
-    ]
-  }
-}

backendia/exports/archive_2026-04-29T13-34-48-508Z/data/photo-1777452610834-998848199.json

@@ -1,44 +0,0 @@
-{
-  "session_id": "session_1777452613625",
-  "timestamp": "2026-04-29T08:50:13.631206",
-  "device_info": {
-    "model": "google sdk_gphone64_x86_64",
-    "os": "Android 16"
-  },
-  "target_metadata": {
-    "type": "concentric",
-    "distance_meters": 25,
-    "weapon": "Unknown"
-  },
-  "plotting": {
-    "target_corners": [
-      {
-        "norm_x": 0.09999999999999998,
-        "norm_y": 0.09999999999999998
-      },
-      {
-        "norm_x": 0.9,
-        "norm_y": 0.09999999999999998
-      },
-      {
-        "norm_x": 0.9,
-        "norm_y": 0.9
-      },
-      {
-        "norm_x": 0.09999999999999998,
-        "norm_y": 0.9
-      }
-    ],
-    "impacts": [
-      {
-        "id": 1,
-        "label": "bullet_hole",
-        "score": 10,
-        "coords": {
-          "norm_x": 0.49810836226851846,
-          "norm_y": 0.4981011284722222
-        }
-      }
-    ]
-  }
-}

backendia/exports/archive_2026-04-29T13-34-48-508Z/data/photo-1777463306078-559049531.json

@@ -1,144 +0,0 @@
-{
-  "session_id": "session_1777463308809",
-  "wallet_hash": "cc60fcaa5ef7fdc9be3dd1adba4157fa6dfae2845da45b830b5ef2b7f473d887",
-  "timestamp": "2026-04-29T11:48:28.834236",
-  "device_info": {
-    "model": "google sdk_gphone64_x86_64",
-    "os": "Android 16"
-  },
-  "target_metadata": {
-    "type": "concentric",
-    "distance_meters": 25,
-    "weapon": "Unknown"
-  },
-  "plotting": {
-    "target_corners": [
-      {
-        "norm_x": 0.09999999999999998,
-        "norm_y": 0.09999999999999998
-      },
-      {
-        "norm_x": 0.9,
-        "norm_y": 0.09999999999999998
-      },
-      {
-        "norm_x": 0.9,
-        "norm_y": 0.9
-      },
-      {
-        "norm_x": 0.09999999999999998,
-        "norm_y": 0.9
-      }
-    ],
-    "impacts": [
-      {
-        "id": 1,
-        "label": "bullet_hole",
-        "score": 6,
-        "coords": {
-          "norm_x": 0.38424660011574074,
-          "norm_y": 0.3666042751736111
-        }
-      },
-      {
-        "id": 2,
-        "label": "bullet_hole",
-        "score": 7,
-        "coords": {
-          "norm_x": 0.6055302372685185,
-          "norm_y": 0.396240234375
-        }
-      },
-      {
-        "id": 3,
-        "label": "bullet_hole",
-        "score": 7,
-        "coords": {
-          "norm_x": 0.5860903139467593,
-          "norm_y": 0.5999620225694443
-        }
-      },
-      {
-        "id": 4,
-        "label": "bullet_hole",
-        "score": 6,
-        "coords": {
-          "norm_x": 0.33517433449074074,
-          "norm_y": 0.5592041015625
-        }
-      },
-      {
-        "id": 5,
-        "label": "bullet_hole",
-        "score": 8,
-        "coords": {
-          "norm_x": 0.6073612919560185,
-          "norm_y": 0.5101047092013888
-        }
-      },
-      {
-        "id": 6,
-        "label": "bullet_hole",
-        "score": 9,
-        "coords": {
-          "norm_x": 0.432373046875,
-          "norm_y": 0.46663411458333337
-        }
-      },
-      {
-        "id": 7,
-        "label": "bullet_hole",
-        "score": 9,
-        "coords": {
-          "norm_x": 0.45181297019675926,
-          "norm_y": 0.5564236111111112
-        }
-      },
-      {
-        "id": 8,
-        "label": "bullet_hole",
-        "score": 10,
-        "coords": {
-          "norm_x": 0.5221860532407407,
-          "norm_y": 0.48792860243055547
-        }
-      },
-      {
-        "id": 9,
-        "label": "bullet_hole",
-        "score": 3,
-        "coords": {
-          "norm_x": 0.6564335575810184,
-          "norm_y": 0.7536349826388888
-        }
-      },
-      {
-        "id": 10,
-        "label": "bullet_hole",
-        "score": 5,
-        "coords": {
-          "norm_x": 0.4712528935185185,
-          "norm_y": 0.7018229166666666
-        }
-      },
-      {
-        "id": 11,
-        "label": "bullet_hole",
-        "score": 5,
-        "coords": {
-          "norm_x": 0.3981327763310185,
-          "norm_y": 0.7018229166666666
-        }
-      },
-      {
-        "id": 12,
-        "label": "bullet_hole",
-        "score": 2,
-        "coords": {
-          "norm_x": 0.48144531249999994,
-          "norm_y": 0.8212483723958334
-        }
-      }
-    ]
-  }
-}

backendia/exports/archive_2026-04-29T13-34-48-508Z/data/photo-1777463700977-483303168.json

@@ -1,117 +0,0 @@
-{
-  "session_id": "session_1777463703756",
-  "wallet_hash": "cc60fcaa5ef7fdc9be3dd1adba4157fa6dfae2845da45b830b5ef2b7f473d887",
-  "timestamp": "2026-04-29T11:55:03.765285",
-  "device_info": {
-    "model": "google sdk_gphone64_x86_64",
-    "os": "Android 16"
-  },
-  "target_metadata": {
-    "type": "concentric",
-    "distance_meters": 25,
-    "weapon": "Unknown"
-  },
-  "plotting": {
-    "target_corners": [
-      {
-        "norm_x": 0.09999999999999998,
-        "norm_y": 0.09999999999999998
-      },
-      {
-        "norm_x": 0.9,
-        "norm_y": 0.09999999999999998
-      },
-      {
-        "norm_x": 0.9,
-        "norm_y": 0.9
-      },
-      {
-        "norm_x": 0.09999999999999998,
-        "norm_y": 0.9
-      }
-    ],
-    "impacts": [
-      {
-        "id": 1,
-        "label": "bullet_hole",
-        "score": 7,
-        "coords": {
-          "norm_x": 0.38424660011574074,
-          "norm_y": 0.45178222656249994
-        }
-      },
-      {
-        "id": 2,
-        "label": "bullet_hole",
-        "score": 5,
-        "coords": {
-          "norm_x": 0.6518247251157407,
-          "norm_y": 0.3638237847222222
-        }
-      },
-      {
-        "id": 3,
-        "label": "bullet_hole",
-        "score": 6,
-        "coords": {
-          "norm_x": 0.5490415219907407,
-          "norm_y": 0.66845703125
-        }
-      },
-      {
-        "id": 4,
-        "label": "bullet_hole",
-        "score": 6,
-        "coords": {
-          "norm_x": 0.405517578125,
-          "norm_y": 0.6758490668402777
-        }
-      },
-      {
-        "id": 5,
-        "label": "bullet_hole",
-        "score": 3,
-        "coords": {
-          "norm_x": 0.7268066406249999,
-          "norm_y": 0.6758490668402777
-        }
-      },
-      {
-        "id": 6,
-        "label": "bullet_hole",
-        "score": 9,
-        "coords": {
-          "norm_x": 0.5471806278935185,
-          "norm_y": 0.529568142361111
-        }
-      },
-      {
-        "id": 7,
-        "label": "bullet_hole",
-        "score": 8,
-        "coords": {
-          "norm_x": 0.44720504195601846,
-          "norm_y": 0.5980631510416666
-        }
-      },
-      {
-        "id": 8,
-        "label": "bullet_hole",
-        "score": 8,
-        "coords": {
-          "norm_x": 0.45458984375,
-          "norm_y": 0.4221462673611111
-        }
-      },
-      {
-        "id": 9,
-        "label": "bullet_hole",
-        "score": 7,
-        "coords": {
-          "norm_x": 0.5203251591435185,
-          "norm_y": 0.3638237847222222
-        }
-      }
-    ]
-  }
-}

backendia/exports/archive_2026-04-29T13-34-48-508Z/data/photo-1777464153541-625226221.json

@@ -1,117 +0,0 @@
-{
-  "session_id": "session_1777464156234",
-  "wallet_hash": "cc60fcaa5ef7fdc9be3dd1adba4157fa6dfae2845da45b830b5ef2b7f473d887",
-  "timestamp": "2026-04-29T12:02:36.255849",
-  "device_info": {
-    "model": "google sdk_gphone64_x86_64",
-    "os": "Android 16"
-  },
-  "target_metadata": {
-    "type": "concentric",
-    "distance_meters": 25,
-    "weapon": "Unknown"
-  },
-  "plotting": {
-    "target_corners": [
-      {
-        "norm_x": 0.09999999999999998,
-        "norm_y": 0.09999999999999998
-      },
-      {
-        "norm_x": 0.9,
-        "norm_y": 0.09999999999999998
-      },
-      {
-        "norm_x": 0.9,
-        "norm_y": 0.9
-      },
-      {
-        "norm_x": 0.09999999999999998,
-        "norm_y": 0.9
-      }
-    ],
-    "impacts": [
-      {
-        "id": 1,
-        "label": "bullet_hole",
-        "score": 7,
-        "coords": {
-          "norm_x": 0.38424660011574074,
-          "norm_y": 0.45178222656249994
-        }
-      },
-      {
-        "id": 2,
-        "label": "bullet_hole",
-        "score": 5,
-        "coords": {
-          "norm_x": 0.6518247251157407,
-          "norm_y": 0.3638237847222222
-        }
-      },
-      {
-        "id": 3,
-        "label": "bullet_hole",
-        "score": 6,
-        "coords": {
-          "norm_x": 0.5490415219907407,
-          "norm_y": 0.66845703125
-        }
-      },
-      {
-        "id": 4,
-        "label": "bullet_hole",
-        "score": 6,
-        "coords": {
-          "norm_x": 0.405517578125,
-          "norm_y": 0.6758490668402777
-        }
-      },
-      {
-        "id": 5,
-        "label": "bullet_hole",
-        "score": 3,
-        "coords": {
-          "norm_x": 0.7268066406249999,
-          "norm_y": 0.6758490668402777
-        }
-      },
-      {
-        "id": 6,
-        "label": "bullet_hole",
-        "score": 9,
-        "coords": {
-          "norm_x": 0.5471806278935185,
-          "norm_y": 0.529568142361111
-        }
-      },
-      {
-        "id": 7,
-        "label": "bullet_hole",
-        "score": 8,
-        "coords": {
-          "norm_x": 0.44720504195601846,
-          "norm_y": 0.5980631510416666
-        }
-      },
-      {
-        "id": 8,
-        "label": "bullet_hole",
-        "score": 8,
-        "coords": {
-          "norm_x": 0.45458984375,
-          "norm_y": 0.4221462673611111
-        }
-      },
-      {
-        "id": 9,
-        "label": "bullet_hole",
-        "score": 7,
-        "coords": {
-          "norm_x": 0.5203251591435185,
-          "norm_y": 0.3638237847222222
-        }
-      }
-    ]
-  }
-}

backendia/exports/archive_2026-04-29T13-34-48-508Z/data/photo-1777464604476-656835279.json

@@ -1,180 +0,0 @@
-{
-  "session_id": "session_1777464607256",
-  "wallet_hash": "cc60fcaa5ef7fdc9be3dd1adba4157fa6dfae2845da45b830b5ef2b7f473d887",
-  "timestamp": "2026-04-29T12:10:07.260954",
-  "device_info": {
-    "model": "google sdk_gphone64_x86_64",
-    "os": "Android 16"
-  },
-  "target_metadata": {
-    "type": "concentric",
-    "distance_meters": 25,
-    "weapon": "Unknown"
-  },
-  "plotting": {
-    "target_corners": [
-      {
-        "norm_x": 0.09999999999999998,
-        "norm_y": 0.09999999999999998
-      },
-      {
-        "norm_x": 0.9,
-        "norm_y": 0.09999999999999998
-      },
-      {
-        "norm_x": 0.9,
-        "norm_y": 0.9
-      },
-      {
-        "norm_x": 0.09999999999999998,
-        "norm_y": 0.9
-      }
-    ],
-    "impacts": [
-      {
-        "id": 1,
-        "label": "bullet_hole",
-        "score": 3,
-        "coords": {
-          "norm_x": 0.31570457175925926,
-          "norm_y": 0.7388509114583333
-        }
-      },
-      {
-        "id": 2,
-        "label": "bullet_hole",
-        "score": 5,
-        "coords": {
-          "norm_x": 0.3184814453125,
-          "norm_y": 0.6489935980902778
-        }
-      },
-      {
-        "id": 3,
-        "label": "bullet_hole",
-        "score": 6,
-        "coords": {
-          "norm_x": 0.3110966435185185,
-          "norm_y": 0.529568142361111
-        }
-      },
-      {
-        "id": 4,
-        "label": "bullet_hole",
-        "score": 6,
-        "coords": {
-          "norm_x": 0.31570457175925926,
-          "norm_y": 0.4416097005208333
-        }
-      },
-      {
-        "id": 5,
-        "label": "bullet_hole",
-        "score": 4,
-        "coords": {
-          "norm_x": 0.31570457175925926,
-          "norm_y": 0.34252929687499994
-        }
-      },
-      {
-        "id": 6,
-        "label": "bullet_hole",
-        "score": 3,
-        "coords": {
-          "norm_x": 0.32589699074074074,
-          "norm_y": 0.2332763671875
-        }
-      },
-      {
-        "id": 7,
-        "label": "bullet_hole",
-        "score": 3,
-        "coords": {
-          "norm_x": 0.45458984375,
-          "norm_y": 0.19624837239583331
-        }
-      },
-      {
-        "id": 8,
-        "label": "bullet_hole",
-        "score": 3,
-        "coords": {
-          "norm_x": 0.5981137876157407,
-          "norm_y": 0.23049587673611108
-        }
-      },
-      {
-        "id": 9,
-        "label": "bullet_hole",
-        "score": 5,
-        "coords": {
-          "norm_x": 0.6907045717592593,
-          "norm_y": 0.3546006944444444
-        }
-      },
-      {
-        "id": 10,
-        "label": "bullet_hole",
-        "score": 5,
-        "coords": {
-          "norm_x": 0.699951171875,
-          "norm_y": 0.48046875
-        }
-      },
-      {
-        "id": 11,
-        "label": "bullet_hole",
-        "score": 7,
-        "coords": {
-          "norm_x": 0.6268310546874999,
-          "norm_y": 0.5416395399305556
-        }
-      },
-      {
-        "id": 12,
-        "label": "bullet_hole",
-        "score": 9,
-        "coords": {
-          "norm_x": 0.49072265624999994,
-          "norm_y": 0.5610351562499999
-        }
-      },
-      {
-        "id": 13,
-        "label": "bullet_hole",
-        "score": 8,
-        "coords": {
-          "norm_x": 0.4203495732060185,
-          "norm_y": 0.536960177951389
-        }
-      },
-      {
-        "id": 14,
-        "label": "bullet_hole",
-        "score": 6,
-        "coords": {
-          "norm_x": 0.5370180483217593,
-          "norm_y": 0.6879204644097222
-        }
-      },
-      {
-        "id": 15,
-        "label": "bullet_hole",
-        "score": 3,
-        "coords": {
-          "norm_x": 0.6175537109375,
-          "norm_y": 0.7601453993055556
-        }
-      },
-      {
-        "id": 16,
-        "label": "bullet_hole",
-        "score": 1,
-        "coords": {
-          "norm_x": 0.7027280454282406,
-          "norm_y": 0.8406439887152777
-        }
-      }
-    ]
-  }
-}

backendia/exports/archive_2026-04-30T12-53-35-219Z/data/.gitkeep

@@ -1 +0,0 @@
-# Keep directory structure

backendia/exports/archive_2026-04-30T12-53-35-219Z/data/photo-1777553550008-681509771.json

@@ -1,270 +0,0 @@
-{
-  "session_id": "session_1777553535029",
-  "wallet_hash": "cc60fcaa5ef7fdc9be3dd1adba4157fa6dfae2845da45b830b5ef2b7f473d887",
-  "timestamp": "2026-04-30T12:52:15.048830",
-  "device_info": {
-    "model": "google sdk_gphone64_x86_64",
-    "os": "Android 16"
-  },
-  "target_metadata": {
-    "type": "concentric",
-    "distance_meters": 25,
-    "weapon": "Unknown"
-  },
-  "plotting": {
-    "target_corners": [
-      {
-        "norm_x": 0.09999999999999998,
-        "norm_y": 0.09999999999999998
-      },
-      {
-        "norm_x": 0.9,
-        "norm_y": 0.09999999999999998
-      },
-      {
-        "norm_x": 0.9,
-        "norm_y": 0.9
-      },
-      {
-        "norm_x": 0.09999999999999998,
-        "norm_y": 0.9
-      }
-    ],
-    "impacts": [
-      {
-        "id": 1,
-        "label": "bullet_hole",
-        "score": 0,
-        "coords": {
-          "norm_x": 0.17681929976851848,
-          "norm_y": 0.8851318359375
-        }
-      },
-      {
-        "id": 2,
-        "label": "bullet_hole",
-        "score": 0,
-        "coords": {
-          "norm_x": 0.17681929976851848,
-          "norm_y": 0.7721489800347222
-        }
-      },
-      {
-        "id": 3,
-        "label": "bullet_hole",
-        "score": 1,
-        "coords": {
-          "norm_x": 0.17959617332175923,
-          "norm_y": 0.6888020833333334
-        }
-      },
-      {
-        "id": 4,
-        "label": "bullet_hole",
-        "score": 2,
-        "coords": {
-          "norm_x": 0.17959617332175923,
-          "norm_y": 0.6342095269097222
-        }
-      },
-      {
-        "id": 5,
-        "label": "bullet_hole",
-        "score": 2,
-        "coords": {
-          "norm_x": 0.17959617332175923,
-          "norm_y": 0.560153537326389
-        }
-      },
-      {
-        "id": 6,
-        "label": "bullet_hole",
-        "score": 2,
-        "coords": {
-          "norm_x": 0.17959617332175923,
-          "norm_y": 0.5138346354166666
-        }
-      },
-      {
-        "id": 7,
-        "label": "bullet_hole",
-        "score": 2,
-        "coords": {
-          "norm_x": 0.1814579716435185,
-          "norm_y": 0.45273166232638884
-        }
-      },
-      {
-        "id": 8,
-        "label": "bullet_hole",
-        "score": 2,
-        "coords": {
-          "norm_x": 0.18701171875,
-          "norm_y": 0.3878987630208333
-        }
-      },
-      {
-        "id": 9,
-        "label": "bullet_hole",
-        "score": 1,
-        "coords": {
-          "norm_x": 0.18887351707175926,
-          "norm_y": 0.2925482855902778
-        }
-      },
-      {
-        "id": 10,
-        "label": "bullet_hole",
-        "score": 0,
-        "coords": {
-          "norm_x": 0.2036747685185185,
-          "norm_y": 0.20085991753472218
-        }
-      },
-      {
-        "id": 11,
-        "label": "bullet_hole",
-        "score": 0,
-        "coords": {
-          "norm_x": 0.27035499855324074,
-          "norm_y": 0.16200086805555558
-        }
-      },
-      {
-        "id": 12,
-        "label": "bullet_hole",
-        "score": 1,
-        "coords": {
-          "norm_x": 0.37588523582175926,
-          "norm_y": 0.1546088324652778
-        }
-      },
-      {
-        "id": 13,
-        "label": "bullet_hole",
-        "score": 2,
-        "coords": {
-          "norm_x": 0.46292136863425926,
-          "norm_y": 0.1518283420138889
-        }
-      },
-      {
-        "id": 14,
-        "label": "bullet_hole",
-        "score": 1,
-        "coords": {
-          "norm_x": 0.6814579716435185,
-          "norm_y": 0.1499294704861111
-        }
-      },
-      {
-        "id": 15,
-        "label": "bullet_hole",
-        "score": 2,
-        "coords": {
-          "norm_x": 0.5509033203125,
-          "norm_y": 0.1546088324652778
-        }
-      },
-      {
-        "id": 16,
-        "label": "bullet_hole",
-        "score": 1,
-        "coords": {
-          "norm_x": 0.6156919126157407,
-          "norm_y": 0.1546088324652778
-        }
-      },
-      {
-        "id": 17,
-        "label": "bullet_hole",
-        "score": 1,
-        "coords": {
-          "norm_x": 0.7703251591435185,
-          "norm_y": 0.2360568576388889
-        }
-      },
-      {
-        "id": 18,
-        "label": "bullet_hole",
-        "score": 4,
-        "coords": {
-          "norm_x": 0.7110595703125,
-          "norm_y": 0.3536512586805555
-        }
-      },
-      {
-        "id": 19,
-        "label": "bullet_hole",
-        "score": 7,
-        "coords": {
-          "norm_x": 0.6027524594907407,
-          "norm_y": 0.4129231770833333
-        }
-      },
-      {
-        "id": 20,
-        "label": "bullet_hole",
-        "score": 9,
-        "coords": {
-          "norm_x": 0.4823911313657407,
-          "norm_y": 0.4304877387152777
-        }
-      },
-      {
-        "id": 21,
-        "label": "bullet_hole",
-        "score": 7,
-        "coords": {
-          "norm_x": 0.39627097800925926,
-          "norm_y": 0.43509928385416663
-        }
-      },
-      {
-        "id": 22,
-        "label": "bullet_hole",
-        "score": 5,
-        "coords": {
-          "norm_x": 0.289794921875,
-          "norm_y": 0.43238661024305547
-        }
-      },
-      {
-        "id": 23,
-        "label": "bullet_hole",
-        "score": 2,
-        "coords": {
-          "norm_x": 0.7166440610532407,
-          "norm_y": 0.7693684895833333
-        }
-      },
-      {
-        "id": 24,
-        "label": "bullet_hole",
-        "score": 3,
-        "coords": {
-          "norm_x": 0.7314453125,
-          "norm_y": 0.7008734809027778
-        }
-      },
-      {
-        "id": 25,
-        "label": "bullet_hole",
-        "score": 1,
-        "coords": {
-          "norm_x": 0.7879331235532407,
-          "norm_y": 0.7601453993055556
-        }
-      },
-      {
-        "id": 26,
-        "label": "bullet_hole",
-        "score": 0,
-        "coords": {
-          "norm_x": 0.736083984375,
-          "norm_y": 0.828640407986111
-        }
-      }
-    ]
-  }
-}

backendia/exports/archive_2026-04-30T12-53-35-219Z/images/.gitkeep

@@ -1 +0,0 @@
-# Keep directory structure

backendia/uploads/data/photo-1777554021433-285233602.json

@@ -1,90 +0,0 @@
-{
-  "session_id": "session_1777554006515",
-  "wallet_hash": "cc60fcaa5ef7fdc9be3dd1adba4157fa6dfae2845da45b830b5ef2b7f473d887",
-  "timestamp": "2026-04-30T13:00:06.519693",
-  "device_info": {
-    "model": "google sdk_gphone64_x86_64",
-    "os": "Android 16"
-  },
-  "target_metadata": {
-    "type": "concentric",
-    "distance_meters": 25,
-    "weapon": "Unknown"
-  },
-  "plotting": {
-    "target_corners": [
-      {
-        "norm_x": 0.09999999999999998,
-        "norm_y": 0.09999999999999998
-      },
-      {
-        "norm_x": 0.9,
-        "norm_y": 0.09999999999999998
-      },
-      {
-        "norm_x": 0.9,
-        "norm_y": 0.9
-      },
-      {
-        "norm_x": 0.09999999999999998,
-        "norm_y": 0.9
-      }
-    ],
-    "impacts": [
-      {
-        "id": 1,
-        "label": "bullet_hole",
-        "score": 5,
-        "coords": {
-          "norm_x": 0.267578125,
-          "norm_y": 0.5554741753472222
-        }
-      },
-      {
-        "id": 2,
-        "label": "bullet_hole",
-        "score": 7,
-        "coords": {
-          "norm_x": 0.5712583188657407,
-          "norm_y": 0.3592800564236111
-        }
-      },
-      {
-        "id": 3,
-        "label": "bullet_hole",
-        "score": 4,
-        "coords": {
-          "norm_x": 0.7555239076967593,
-          "norm_y": 0.5703938802083333
-        }
-      },
-      {
-        "id": 4,
-        "label": "bullet_hole",
-        "score": 4,
-        "coords": {
-          "norm_x": 0.6666259765625,
-          "norm_y": 0.6759168836805556
-        }
-      },
-      {
-        "id": 5,
-        "label": "bullet_hole",
-        "score": 9,
-        "coords": {
-          "norm_x": 0.5490415219907407,
-          "norm_y": 0.5212944878472222
-        }
-      },
-      {
-        "id": 6,
-        "label": "bullet_hole",
-        "score": 8,
-        "coords": {
-          "norm_x": 0.4897768373842592,
-          "norm_y": 0.39352756076388895
-        }
-      }
-    ]
-  }
-}

lib/app.dart

@@ -27,7 +27,7 @@ class BullyApp extends StatelessWidget {
             Locale('fr', 'FR'), // Français
           ],
           locale: const Locale('fr', 'FR'), // Force l'interface en français
-          home: const MainNavigationHolder(),
+          home: MainNavigationHolder(key: mainNavKey),
         );
       },
     );

lib/data/database/database_helper.dart

@@ -380,17 +380,71 @@ class DatabaseHelper {
       limit: limit,
       offset: offset,
     );
+    if (sessionMaps.isEmpty) return [];
 
-    final sessions = <Session>[];
-    for (final sessionMap in sessionMaps) {
-      final sessionId = sessionMap['id'] as String;
-      final session = await getSession(sessionId);
-      if (session != null) {
-        sessions.add(session);
-      }
+    // 3 requêtes groupées au lieu d'une cascade par session puis par analyse
+    // (N+1) : l'ancien code refaisait un getSession complet pour chaque ligne,
+    // ce qui ralentissait l'accueil/historique/stats au fil des mois.
+    final sessionIds = sessionMaps.map((m) => m['id'] as String).toList();
+    final analysisMaps = await _queryIn(
+      db,
+      AppConstants.targetAnalysesTable,
+      'session_id',
+      sessionIds,
+    );
+    final analysisIds = analysisMaps.map((m) => m['id'] as String).toList();
+    final shotMaps = await _queryIn(
+      db,
+      AppConstants.shotsTable,
+      'analysis_id',
+      analysisIds,
+    );
+
+    final shotsByAnalysis = <String, List<Shot>>{};
+    for (final map in shotMaps) {
+      (shotsByAnalysis[map['analysis_id'] as String] ??= [])
+          .add(Shot.fromMap(map));
     }
 
-    return sessions;
+    final analysesBySession = <String, List<TargetAnalysis>>{};
+    for (final map in analysisMaps) {
+      final analysis = TargetAnalysis.fromMap(
+        map,
+        shotsByAnalysis[map['id'] as String] ?? [],
+      );
+      (analysesBySession[map['session_id'] as String] ??= []).add(analysis);
+    }
+
+    return sessionMaps
+        .map((m) =>
+            Session.fromMap(m, analysesBySession[m['id'] as String] ?? []))
+        .toList();
+  }
+
+  /// SELECT * FROM [table] WHERE [column] IN (values), découpé par paquets
+  /// de 500 pour rester sous la limite de variables d'une requête SQLite (999).
+  Future<List<Map<String, Object?>>> _queryIn(
+    Database db,
+    String table,
+    String column,
+    List<String> values,
+  ) async {
+    if (values.isEmpty) return [];
+    const chunkSize = 500;
+    final results = <Map<String, Object?>>[];
+    for (var i = 0; i < values.length; i += chunkSize) {
+      final chunk = values.sublist(
+        i,
+        i + chunkSize > values.length ? values.length : i + chunkSize,
+      );
+      final placeholders = List.filled(chunk.length, '?').join(',');
+      results.addAll(await db.query(
+        table,
+        where: '$column IN ($placeholders)',
+        whereArgs: chunk,
+      ));
+    }
+    return results;
   }
 
   Future<int> deleteSession(String id) async {
@@ -536,6 +590,16 @@ class DatabaseHelper {
     );
   }
 
+  /// Toutes les entrées de maintenance, armes confondues (export/sauvegarde).
+  Future<List<MaintenanceEntry>> getAllMaintenance() async {
+    final db = await database;
+    final maps = await db.query(
+      AppConstants.maintenanceTable,
+      orderBy: 'date DESC',
+    );
+    return List.generate(maps.length, (i) => MaintenanceEntry.fromMap(maps[i]));
+  }
+
   Future<List<MaintenanceEntry>> getMaintenanceForWeapon(String weaponId) async {
     final db = await database;
     final maps = await db.query(

lib/data/repositories/session_repository.dart

@@ -131,6 +131,29 @@ class SessionRepository {
     return await _databaseHelper.getStatistics();
   }
 
+  /// Enregistre une session déjà construite (import de sauvegarde).
+  /// Les identifiants existants sont écrasés : réimporter deux fois la même
+  /// sauvegarde ne crée pas de doublons.
+  Future<void> saveSession(Session session) async {
+    await _databaseHelper.insertSession(session);
+  }
+
+  /// Copie une image dans le dossier des cibles de l'app (import de sauvegarde).
+  Future<String> saveImageBytes(List<int> bytes, String extension) async {
+    final appDir = await getApplicationDocumentsDirectory();
+    final imagesDir = Directory(path.join(appDir.path, 'target_images'));
+
+    if (!await imagesDir.exists()) {
+      await imagesDir.create(recursive: true);
+    }
+
+    final fileName = '${_uuid.v4()}$extension';
+    final destPath = path.join(imagesDir.path, fileName);
+    await File(destPath).writeAsBytes(bytes);
+
+    return destPath;
+  }
+
   String generateId() {
     return _uuid.v4();
   }
@@ -170,6 +193,11 @@ class SessionRepository {
     return await _databaseHelper.getAllWeapons();
   }
 
+  /// Enregistre une arme déjà construite (import de sauvegarde).
+  Future<void> saveWeapon(Weapon weapon) async {
+    await _databaseHelper.insertWeapon(weapon);
+  }
+
   Future<void> updateWeapon(Weapon weapon) async {
     await _databaseHelper.updateWeapon(weapon);
   }
@@ -208,6 +236,16 @@ class SessionRepository {
     return await _databaseHelper.getMaintenanceForWeapon(weaponId);
   }
 
+  /// Tout l'historique de maintenance de l'armurerie (export de sauvegarde).
+  Future<List<MaintenanceEntry>> getAllMaintenance() async {
+    return await _databaseHelper.getAllMaintenance();
+  }
+
+  /// Enregistre une entrée de maintenance déjà construite (import).
+  Future<void> saveMaintenanceEntry(MaintenanceEntry entry) async {
+    await _databaseHelper.insertMaintenance(entry);
+  }
+
   Future<void> deleteMaintenanceEntry(String id) async {
     await _databaseHelper.deleteMaintenance(id);
   }

lib/features/analysis/analysis_provider.dart

@@ -1,8 +1,8 @@
 /// Gestionnaire d'état pour l'analyse des cibles (ChangeNotifier).
 ///
-/// Gère le workflow complet d'analyse : chargement d'image, détection de cible,
-/// gestion des impacts (manuels et automatiques), calcul des scores,
-/// analyse de groupement et sauvegarde des sessions.
+/// Gère le workflow complet d'analyse : chargement d'image, gestion des
+/// impacts placés manuellement, calcul des scores, analyse de groupement
+/// et sauvegarde des sessions.
 library;
 
 import 'dart:io';
@@ -13,37 +13,25 @@ import '../../data/models/target_analysis.dart';
 import '../../data/models/shot.dart';
 import '../../data/models/target_type.dart';
 import '../../data/repositories/session_repository.dart';
-import '../../services/target_detection_service.dart';
 import '../../services/score_calculator_service.dart';
 import '../../services/grouping_analyzer_service.dart';
-import '../../services/distortion_correction_service.dart';
-import '../../services/opencv_target_service.dart';
 import '../../services/ai_export_service.dart';
 
 enum AnalysisState { initial, loading, success, error }
 
 class AnalysisProvider extends ChangeNotifier {
-  final TargetDetectionService _detectionService;
   final ScoreCalculatorService _scoreCalculatorService;
   final GroupingAnalyzerService _groupingAnalyzerService;
   final SessionRepository _sessionRepository;
-  final DistortionCorrectionService _distortionService;
-  final OpenCVTargetService _opencvTargetService;
   final Uuid _uuid = const Uuid();
 
   AnalysisProvider({
-    required TargetDetectionService detectionService,
     required ScoreCalculatorService scoreCalculatorService,
     required GroupingAnalyzerService groupingAnalyzerService,
     required SessionRepository sessionRepository,
-    DistortionCorrectionService? distortionService,
-    OpenCVTargetService? opencvTargetService,
-  }) : _detectionService = detectionService,
-        _scoreCalculatorService = scoreCalculatorService,
+  })  : _scoreCalculatorService = scoreCalculatorService,
         _groupingAnalyzerService = groupingAnalyzerService,
-        _sessionRepository = sessionRepository,
-        _distortionService = distortionService ?? DistortionCorrectionService(),
-        _opencvTargetService = opencvTargetService ?? OpenCVTargetService();
+        _sessionRepository = sessionRepository;
 
   AnalysisState _state = AnalysisState.initial;
   String? _errorMessage;
@@ -53,7 +41,7 @@ class AnalysisProvider extends ChangeNotifier {
   // AJOUT PROTECTION DU PLOTTING : Stockage permanent de la rotation du Crop
   double _cropRotation = 0.0;
 
-  // Target detection results
+  // Target calibration
   double _targetCenterX = 0.5;
   double _targetCenterY = 0.5;
   double _targetRadius = 0.4;
@@ -71,15 +59,6 @@ class AnalysisProvider extends ChangeNotifier {
   // Grouping results
   GroupingResult? _groupingResult;
 
-  // Reference-based detection
-  List<Shot> _referenceImpacts = [];
-  ImpactCharacteristics? _learnedCharacteristics;
-
-  // Distortion correction
-  bool _distortionCorrectionEnabled = false;
-  DistortionParameters? _distortionParams;
-  String? _correctedImagePath;
-
   // Getters
   AnalysisState get state => _state;
   String? get errorMessage => _errorMessage;
@@ -100,21 +79,6 @@ class AnalysisProvider extends ChangeNotifier {
 
   int get totalScore => _scoreResult?.totalScore ?? 0;
   int get shotCount => _shots.length;
-  List<Shot> get referenceImpacts => List.unmodifiable(_referenceImpacts);
-  ImpactCharacteristics? get learnedCharacteristics => _learnedCharacteristics;
-  bool get hasLearnedCharacteristics => _learnedCharacteristics != null;
-
-  // Distortion correction getters
-  bool get distortionCorrectionEnabled => _distortionCorrectionEnabled;
-  DistortionParameters? get distortionParams => _distortionParams;
-  String? get correctedImagePath => _correctedImagePath;
-  bool get hasDistortion => _distortionParams?.needsCorrection ?? false;
-
-  /// Retourne le chemin de l'image à afficher (corrigée si activée, originale sinon)
-  String? get displayImagePath =>
-      _distortionCorrectionEnabled && _correctedImagePath != null
-          ? _correctedImagePath
-          : _imagePath;
 
   /// Modifie et mémorise la rotation de l'image pour le Plotting
   void setCropRotation(double rotation) {
@@ -122,16 +86,13 @@ class AnalysisProvider extends ChangeNotifier {
     notifyListeners();
   }
 
-  /// Analyze an image
-  ///
-  /// [autoAnalyze] determines if we should run automatic detection immediately.
-  /// If false, only the image is loaded and default target parameters are set.
+  /// Charge l'image et initialise les paramètres de cible par défaut.
+  /// Le placement des impacts et la calibration se font ensuite manuellement.
   Future<void> analyzeImage(
-      String imagePath,
-      TargetType targetType, {
-        bool autoAnalyze = true,
-        Offset? manualCenter,
-      }) async {
+    String imagePath,
+    TargetType targetType, {
+    Offset? manualCenter,
+  }) async {
     _state = AnalysisState.loading;
     _imagePath = imagePath;
     _targetType = targetType;
@@ -147,54 +108,12 @@ class AnalysisProvider extends ChangeNotifier {
       _imageAspectRatio = frame.image.width / frame.image.height;
       frame.image.dispose();
 
-      if (!autoAnalyze) {
-        // Just setup default values without running detection
-        _targetCenterX = manualCenter?.dx ?? 0.5;
-        _targetCenterY = manualCenter?.dy ?? 0.5;
-        _targetRadius = 0.4;
-        _targetInnerRadius = 0.04;
+      _targetCenterX = manualCenter?.dx ?? 0.5;
+      _targetCenterY = manualCenter?.dy ?? 0.5;
+      _targetRadius = 0.4;
+      _targetInnerRadius = 0.04;
 
-        // Initialize empty shots list
-        _shots = [];
-
-        _state = AnalysisState.success;
-        notifyListeners();
-        return;
-      }
-
-      final result = await _detectionService.detectTargetAsync(
-        imagePath,
-        targetType,
-      );
-
-      if (!result.success) {
-        _state = AnalysisState.error;
-        _errorMessage = result.errorMessage;
-        notifyListeners();
-        return;
-      }
-
-      _targetCenterX = result.centerX;
-      _targetCenterY = result.centerY;
-      _targetRadius = result.radius;
-      _targetInnerRadius = result.radius * 0.1;
-
-      // Create shots from detected impacts
-      _shots = result.impacts.map((impact) {
-        return Shot(
-          id: _uuid.v4(),
-          x: impact.x,
-          y: impact.y,
-          score: impact.suggestedScore,
-          analysisId: '',
-        );
-      }).toList();
-
-      // Calculate scores
-      _recalculateScores();
-
-      // Calculate grouping
-      _recalculateGrouping();
+      _shots = [];
 
       _state = AnalysisState.success;
       notifyListeners();
@@ -216,22 +135,18 @@ class AnalysisProvider extends ChangeNotifier {
     notifyListeners();
   }
 
-  /// Remove a shot
-  void removeShot(String shotId) {
-    _shots.removeWhere((shot) => shot.id == shotId);
+  /// Efface tous les impacts en un clic (bouton ↻ de l'écran Synthèse).
+  /// La calibration (centre, rayon, anneaux) n'est pas touchée.
+  void clearShots() {
+    _shots.clear();
     _recalculateScores();
     _recalculateGrouping();
     notifyListeners();
   }
 
-  /// Move a shot to a new position
-  void moveShot(String shotId, double newX, double newY) {
-    final index = _shots.indexWhere((shot) => shot.id == shotId);
-    if (index == -1) return;
-
-    final newScore = _calculateShotScore(newX, newY);
-    _shots[index] = _shots[index].copyWith(x: newX, y: newY, score: newScore);
-
+  /// Remove a shot
+  void removeShot(String shotId) {
+    _shots.removeWhere((shot) => shot.id == shotId);
     _recalculateScores();
     _recalculateGrouping();
     notifyListeners();
@@ -247,276 +162,17 @@ class AnalysisProvider extends ChangeNotifier {
     notifyListeners();
   }
 
-  /// Auto-detect impacts using image processing
-  Future<int> autoDetectImpacts({
-    int darkThreshold = 80,
-    int minImpactSize = 20,
-    int maxImpactSize = 500,
-    double minCircularity = 0.6,
-    double minFillRatio = 0.5,
-    bool clearExisting = false,
-  }) async {
-    if (_imagePath == null || _targetType == null) return 0;
-
-    final settings = ImpactDetectionSettings(
-      darkThreshold: darkThreshold,
-      minImpactSize: minImpactSize,
-      maxImpactSize: maxImpactSize,
-      minCircularity: minCircularity,
-      minFillRatio: minFillRatio,
-    );
-
-    final detectedImpacts = _detectionService.detectImpactsOnly(
-      _imagePath!,
-      _targetType!,
-      _targetCenterX,
-      _targetCenterY,
-      _targetRadius,
-      _ringCount,
-      settings,
-    );
-
-    if (clearExisting) {
-      _shots.clear();
-    }
-
-    // Add detected impacts as shots
-    for (final impact in detectedImpacts) {
-      final score = _calculateShotScore(impact.x, impact.y);
-      final shot = Shot(
-        id: _uuid.v4(),
-        x: impact.x,
-        y: impact.y,
-        score: score,
-        analysisId: '',
-      );
-      _shots.add(shot);
-    }
-
-    _recalculateScores();
-    _recalculateGrouping();
-    notifyListeners();
-
-    return detectedImpacts.length;
-  }
-
-  /// Auto-detect impacts using OpenCV (Hough Circles + Contours)
-  Future<int> autoDetectImpactsWithOpenCV({
-    double cannyThreshold1 = 50,
-    double cannyThreshold2 = 150,
-    double minDist = 20,
-    double param1 = 100,
-    double param2 = 30,
-    int minRadius = 5,
-    int maxRadius = 50,
-    int minSize = 5,
-    int maxSize = 1000,
-    int blurSize = 5,
-    bool useContourDetection = true,
-    double minCircularity = 0.6,
-    double minContourArea = 50,
-    double maxContourArea = 5000,
-    bool clearExisting = false,
-  }) async {
-    if (_imagePath == null || _targetType == null) return 0;
-
-    final settings = OpenCVDetectionSettings(
-      cannyThreshold1: cannyThreshold1,
-      cannyThreshold2: cannyThreshold2,
-      minDist: minDist,
-      param1: param1,
-      param2: param2,
-      minRadius: minRadius,
-      maxRadius: maxRadius,
-      blurSize: blurSize,
-      useContourDetection: useContourDetection,
-      minCircularity: minCircularity,
-      minContourArea: minContourArea,
-      maxContourArea: maxContourArea,
-    );
-
-    final detectedImpacts = _detectionService.detectImpactsWithOpenCV(
-      _imagePath!,
-      _targetType!,
-      _targetCenterX,
-      _targetCenterY,
-      _targetRadius,
-      _ringCount,
-      settings: settings,
-    );
-
-    if (clearExisting) {
-      _shots.clear();
-    }
-
-    // Add detected impacts as shots
-    for (final impact in detectedImpacts) {
-      final score = _calculateShotScore(impact.x, impact.y);
-      final shot = Shot(
-        id: _uuid.v4(),
-        x: impact.x,
-        y: impact.y,
-        score: score,
-        analysisId: '',
-      );
-      _shots.add(shot);
-    }
-
-    _recalculateScores();
-    _recalculateGrouping();
-    notifyListeners();
-
-    return detectedImpacts.length;
-  }
-
-  /// Detect impacts with OpenCV using reference points
-  Future<int> detectFromReferencesWithOpenCV({
-    double tolerance = 2.0,
-    bool clearExisting = false,
-  }) async {
-    if (_imagePath == null ||
-        _targetType == null ||
-        _referenceImpacts.length < 2) {
-      return 0;
-    }
-
-    // Convertir les références
-    final references = _referenceImpacts
-        .map((shot) => ReferenceImpact(x: shot.x, y: shot.y))
-        .toList();
-
-    final detectedImpacts = _detectionService
-        .detectImpactsWithOpenCVFromReferences(
-      _imagePath!,
-      _targetType!,
-      _targetCenterX,
-      _targetCenterY,
-      _targetRadius,
-      _ringCount,
-      references,
-      tolerance: tolerance,
-    );
-
-    if (clearExisting) {
-      _shots.clear();
-    }
-
-    // Add detected impacts as shots
-    for (final impact in detectedImpacts) {
-      final score = _calculateShotScore(impact.x, impact.y);
-      final shot = Shot(
-        id: _uuid.v4(),
-        x: impact.x,
-        y: impact.y,
-        score: score,
-        analysisId: '',
-      );
-      _shots.add(shot);
-    }
-
-    _recalculateScores();
-    _recalculateGrouping();
-    notifyListeners();
-
-    return detectedImpacts.length;
-  }
-
-  /// Add a reference impact for calibrated detection
-  void addReferenceImpact(double x, double y) {
-    final score = _calculateShotScore(x, y);
-    final shot = Shot(id: _uuid.v4(), x: x, y: y, score: score, analysisId: '');
-    _referenceImpacts.add(shot);
-    notifyListeners();
-  }
-
-  /// Remove a reference impact
-  void removeReferenceImpact(String shotId) {
-    _referenceImpacts.removeWhere((shot) => shot.id == shotId);
-    _learnedCharacteristics = null;
-    notifyListeners();
-  }
-
-  /// Clear all reference impacts
-  void clearReferenceImpacts() {
-    _referenceImpacts.clear();
-    _learnedCharacteristics = null;
-    notifyListeners();
-  }
-
-  /// Learn characteristics from reference impacts
-  bool learnFromReferences() {
-    if (_imagePath == null || _referenceImpacts.length < 2) return false;
-
-    final references = _referenceImpacts
-        .map((shot) => ReferenceImpact(x: shot.x, y: shot.y))
-        .toList();
-
-    _learnedCharacteristics = _detectionService.analyzeReferenceImpacts(
-      _imagePath!,
-      references,
-    );
-
-    notifyListeners();
-    return _learnedCharacteristics != null;
-  }
-
-  /// Auto-detect impacts using learned reference characteristics
-  Future<int> detectFromReferences({
-    double tolerance = 2.0,
-    bool clearExisting = false,
-  }) async {
-    if (_imagePath == null ||
-        _targetType == null ||
-        _learnedCharacteristics == null) {
-      return 0;
-    }
-
-    final detectedImpacts = _detectionService.detectImpactsFromReferences(
-      _imagePath!,
-      _targetType!,
-      _targetCenterX,
-      _targetCenterY,
-      _targetRadius,
-      _ringCount,
-      _learnedCharacteristics!,
-      tolerance: tolerance,
-    );
-
-    if (clearExisting) {
-      _shots.clear();
-    }
-
-    // Add detected impacts as shots
-    for (final impact in detectedImpacts) {
-      final score = _calculateShotScore(impact.x, impact.y);
-      final shot = Shot(
-        id: _uuid.v4(),
-        x: impact.x,
-        y: impact.y,
-        score: score,
-        analysisId: '',
-      );
-      _shots.add(shot);
-    }
-
-    _recalculateScores();
-    _recalculateGrouping();
-    notifyListeners();
-
-    return detectedImpacts.length;
-  }
-
   /// Adjust target position
   void adjustTargetPosition(
-      double centerX,
-      double centerY,
-      double innerRadius,
-      double radius, {
-        int? ringCount,
-        List<double>? ringRadii,
-        double zoomScale = 1.0,
-        Offset offset = Offset.zero,
-      }) {
+    double centerX,
+    double centerY,
+    double innerRadius,
+    double radius, {
+    int? ringCount,
+    List<double>? ringRadii,
+    double zoomScale = 1.0,
+    Offset offset = Offset.zero,
+  }) {
     _targetCenterX = (centerX - offset.dx) / zoomScale;
     _targetCenterY = (centerY - offset.dy) / zoomScale;
     _targetRadius = radius / zoomScale;
@@ -539,118 +195,6 @@ class AnalysisProvider extends ChangeNotifier {
     notifyListeners();
   }
 
-  /// Auto-calibrate target using OpenCV
-  Future<bool> autoCalibrateTarget() async {
-    if (_imagePath == null) return false;
-
-    try {
-      // 1. Attempt to correct perspective/distortion first
-      final correctedPath = await _distortionService
-          .correctPerspectiveWithConcentricMesh(_imagePath!);
-
-      if (correctedPath != _imagePath) {
-        _imagePath = correctedPath;
-        _correctedImagePath = correctedPath;
-        _distortionCorrectionEnabled = true;
-        _imageAspectRatio = 1.0;
-        notifyListeners();
-      }
-
-      // 2. Detect the target on the straight/corrected image
-      final result = await _opencvTargetService.detectTarget(_imagePath!);
-
-      if (result.success) {
-        adjustTargetPosition(
-          result.centerX,
-          result.centerY,
-          result.radius * 0.1,
-          result.radius,
-        );
-        return true;
-      }
-      return false;
-    } catch (e) {
-      debugPrint('Auto-calibration error: $e');
-      return false;
-    }
-  }
-
-  /// Calcule les paramètres de distorsion basés sur la calibration actuelle
-  void calculateDistortion() {
-    _distortionParams = _distortionService.calculateDistortionFromCalibration(
-      targetCenterX: _targetCenterX,
-      targetCenterY: _targetCenterY,
-      targetRadius: _targetRadius,
-      imageAspectRatio: _imageAspectRatio,
-    );
-    notifyListeners();
-  }
-
-  /// Applique la correction de distorsion à l'image
-  /// Crée une nouvelle image corrigée et la sauvegarde
-  Future<void> applyDistortionCorrection() async {
-    if (_imagePath == null || _distortionParams == null) return;
-
-    try {
-      _correctedImagePath = await _distortionService.applyCorrection(
-        _imagePath!,
-        _distortionParams!,
-      );
-      _distortionCorrectionEnabled = true;
-      notifyListeners();
-    } catch (e) {
-      _errorMessage = 'Erreur lors de la correction: $e';
-      notifyListeners();
-    }
-  }
-
-  /// Active ou désactive l'affichage de l'image corrigée
-  void setDistortionCorrectionEnabled(bool enabled) {
-    if (enabled && _correctedImagePath == null && _distortionParams != null) {
-      // Si on active mais pas encore d'image corrigée, la créer
-      applyDistortionCorrection();
-    } else {
-      _distortionCorrectionEnabled = enabled;
-      notifyListeners();
-    }
-  }
-
-  /// Calcule ET applique la correction pour un feedback immédiat
-  Future<void> calculateAndApplyDistortion() async {
-    // 1. Calcul des paramètres (votre code actuel)
-    _distortionParams = _distortionService.calculateDistortionFromCalibration(
-      targetCenterX: _targetCenterX,
-      targetCenterY: _targetCenterY,
-      targetRadius: _targetRadius,
-      imageAspectRatio: _imageAspectRatio,
-    );
-
-    // 2. Vérification si une correction est réellement nécessaire
-    if (_distortionParams != null && _distortionParams!.needsCorrection) {
-      // 3. Application immédiate de la transformation (méthode asynchrone)
-      await applyDistortionCorrection();
-    } else {
-      notifyListeners();
-    }
-  }
-
-  Future<void> runFullDistortionWorkflow() async {
-    _state = AnalysisState.loading;
-    notifyListeners();
-
-    try {
-      calculateDistortion();
-      await applyDistortionCorrection();
-      _distortionCorrectionEnabled = true;
-      _state = AnalysisState.success;
-    } catch (e) {
-      _errorMessage = "Erreur de rendu : $e";
-      _state = AnalysisState.error;
-    } finally {
-      notifyListeners();
-    }
-  }
-
   int _calculateShotScore(double x, double y) {
     if (_targetType == TargetType.concentric) {
       return _scoreCalculatorService.calculateConcentricScore(
@@ -694,8 +238,14 @@ class AnalysisProvider extends ChangeNotifier {
     _groupingResult = _groupingAnalyzerService.analyzeGrouping(_shots);
   }
 
-  /// Exporte l'image et le json vers le backend IA
-  Future<bool> exportToAiBackend() async {
+  /// Exporte l'image et le json vers le backend IA.
+  /// [sessionId], [distance] et [weapon] proviennent du SessionProvider de
+  /// l'écran appelant, pour que le dataset contienne les vraies métadonnées.
+  Future<bool> exportToAiBackend({
+    String? sessionId,
+    int? distance,
+    String? weapon,
+  }) async {
     if (_imagePath == null || _targetType == null) {
       _errorMessage = "Impossible d'export : image ou type de cible manquant.";
       notifyListeners();
@@ -709,12 +259,14 @@ class AnalysisProvider extends ChangeNotifier {
 
     final success = await service.exportData(
       imagePath: _imagePath!,
-      sessionId: 'export',
+      sessionId: sessionId ?? 'export',
       targetType: _targetType!,
       targetCenterX: _targetCenterX,
       targetCenterY: _targetCenterY,
       targetRadius: _targetRadius,
       shots: _shots,
+      distanceMeters: distance ?? 25,
+      weaponName: weapon ?? 'Unknown',
     );
 
     _state = AnalysisState.success;
@@ -807,11 +359,6 @@ class AnalysisProvider extends ChangeNotifier {
     _shots = [];
     _scoreResult = null;
     _groupingResult = null;
-    _referenceImpacts = [];
-    _learnedCharacteristics = null;
-    _distortionCorrectionEnabled = false;
-    _distortionParams = null;
-    _correctedImagePath = null;
     notifyListeners();
   }
 
@@ -833,4 +380,4 @@ class AnalysisProvider extends ChangeNotifier {
       notifyListeners();
     }
   }
-}
+}

lib/features/analysis/analysis_screen.dart

@@ -1,7 +1,9 @@
-/// Écran principal de Plotting et d'analyse - Interface centrale de traitement des cibles.
+/// Écran principal de Synthèse et d'analyse - Interface centrale de traitement des cibles.
 ///
 /// Affiche d'abord la calibration de la cible, puis l'overlay des anneaux et impacts détectés.
-/// Permet le calcul des scores et statistiques de groupement (Plotting).
+/// Permet le calcul des scores et statistiques de groupement (Synthèse), et
+/// c'est de là que l'on termine la session. L'ajout des impacts, lui, se fait
+/// dans l'éditeur d'impacts plein écran.
 library;
 
 import 'dart:io';
@@ -9,14 +11,14 @@ import 'dart:math' as math;
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 
+import '../../main_navigation_holder.dart';
 import '../../core/constants/app_constants.dart';
 import '../../core/theme/app_theme.dart';
 import '../../data/models/target_type.dart';
-import '../../data/models/shot.dart';
 import '../../data/repositories/session_repository.dart';
-import '../../services/target_detection_service.dart';
 import '../../services/score_calculator_service.dart';
 import '../../services/grouping_analyzer_service.dart';
+import '../../services/wallet_identity_service.dart';
 import '../session/session_provider.dart';
 import 'analysis_provider.dart';
 import 'impact_editor_screen.dart';
@@ -60,7 +62,6 @@ class AnalysisScreen extends StatelessWidget {
     return ChangeNotifierProvider(
       create: (context) {
         final p = AnalysisProvider(
-          detectionService: context.read<TargetDetectionService>(),
           scoreCalculatorService: context.read<ScoreCalculatorService>(),
           groupingAnalyzerService: context.read<GroupingAnalyzerService>(),
           sessionRepository: context.read<SessionRepository>(),
@@ -72,7 +73,6 @@ class AnalysisScreen extends StatelessWidget {
         p.analyzeImage(
           imagePath,
           targetType,
-          autoAnalyze: false,
           manualCenter: manualCenterOffset,
         );
         return p;
@@ -110,19 +110,17 @@ class _AnalysisScreenContentState extends State<_AnalysisScreenContent> {
 
   // Forcé à TRUE pour démarrer sur l'ajustement des cercles
   bool _isCalibrating = true;
-  bool _isSelectingReferences = false;
   bool _isAtBottom = false;
 
+  // Affichage du réglage manuel de l'espacement des anneaux.
+  bool _showSpacing = false;
+
   final ScrollController _scrollController = ScrollController();
-  final TransformationController _transformationController =
-  TransformationController();
   final GlobalKey _imageKey = GlobalKey();
-  double _currentZoomScale = 1.0;
 
   @override
   void initState() {
     super.initState();
-    _transformationController.addListener(_onTransformChanged);
     _scrollController.addListener(_onScroll);
   }
 
@@ -140,32 +138,22 @@ class _AnalysisScreenContentState extends State<_AnalysisScreenContent> {
 
   @override
   void dispose() {
-    _transformationController.removeListener(_onTransformChanged);
-    _transformationController.dispose();
     _scrollController.removeListener(_onScroll);
     _scrollController.dispose();
     super.dispose();
   }
 
-  void _onTransformChanged() {
-    final scale = _transformationController.value.getMaxScaleOnAxis();
-    if (scale != _currentZoomScale) {
-      setState(() {
-        _currentZoomScale = scale;
-      });
-    }
-  }
-
-  /// Repasse en mode calibration en réinitialisant le zoom de l'InteractiveViewer.
+  /// Repasse en mode calibration.
   ///
-  /// Sans cette remise à zéro, le facteur de zoom accumulé en mode Plotting
-  /// persiste dans le TransformationController et se réapplique au retour,
-  /// ce qui faisait "zoomer" légèrement la photo. On repart donc toujours
-  /// d'une transformation identité (zoom 1.0).
+  /// La cible du mode Synthèse est désormais un élément fixe (aucun zoom à
+  /// réinitialiser) : on se contente donc de rebasculer l'état.
   void _enterCalibration() {
-    _transformationController.value = Matrix4.identity();
-    _currentZoomScale = 1.0;
-    setState(() => _isCalibrating = true);
+    setState(() {
+      _isCalibrating = true;
+      // La calibration est reconstruite à neuf (espacement manuel désactivé) :
+      // on aligne l'état du panneau pour ne pas afficher un mode inactif.
+      _showSpacing = false;
+    });
   }
 
   /// Ouvre l'éditeur d'impacts (plein écran) en PARTAGEANT le provider courant.
@@ -174,10 +162,11 @@ class _AnalysisScreenContentState extends State<_AnalysisScreenContent> {
   /// exactement le même AnalysisProvider que cet écran : les impacts ajoutés,
   /// déplacés ou supprimés sont donc immédiatement répercutés ici.
   ///
-  /// Au retour : si l'utilisateur a validé (résultat true) on bascule en mode
-  /// Plotting (lecture seule) ; sinon on repasse en calibration.
+  /// Au retour, quel que soit le résultat (validation OU retour arrière), on
+  /// revient TOUJOURS sur la Synthèse. L'éditeur d'impacts n'est ouvert que
+  /// depuis la Synthèse : il doit donc y ramener, jamais sur la calibration.
   Future<void> _openImpactEditor(AnalysisProvider provider) async {
-    final validated = await Navigator.of(context).push<bool>(
+    await Navigator.of(context).push<bool>(
       MaterialPageRoute(
         builder: (_) => ChangeNotifierProvider<AnalysisProvider>.value(
           value: provider,
@@ -188,14 +177,9 @@ class _AnalysisScreenContentState extends State<_AnalysisScreenContent> {
 
     if (!mounted) return;
 
-    if (validated == true) {
-      setState(() {
-        _isCalibrating = false;
-        _isSelectingReferences = false;
-      });
-    } else {
-      _enterCalibration();
-    }
+    setState(() {
+      _isCalibrating = false;
+    });
   }
 
   /// Chemin à utiliser pour repartir dans le CropScreen lors d'un retour arrière.
@@ -208,6 +192,181 @@ class _AnalysisScreenContentState extends State<_AnalysisScreenContent> {
     return widget.originalImagePath ?? provider.imagePath!;
   }
 
+  /// Panneau de réglages de la calibration (taille + espacement).
+  ///
+  /// Rendu AU-DESSUS de l'image (et non plus en surimpression) pour ne pas
+  /// masquer la cible. Les valeurs affichées viennent du provider ; les
+  /// modifications sont poussées dans l'état de [TargetCalibration] via sa clé.
+  Widget _buildCalibrationSettings(AnalysisProvider provider) {
+    final radius = provider.targetRadius.clamp(
+      TargetCalibrationState.minRadius,
+      TargetCalibrationState.maxRadius,
+    );
+    final spacing =
+        (provider.targetRadius > 0
+                ? provider.targetInnerRadius / provider.targetRadius
+                : 0.1)
+            .clamp(
+              TargetCalibrationState.minSpacing,
+              TargetCalibrationState.maxSpacing,
+            );
+
+    return Padding(
+      padding: const EdgeInsets.fromLTRB(12, 0, 12, 4),
+      child: Column(
+        mainAxisSize: MainAxisSize.min,
+        children: [
+          SizedBox(
+            height: 36,
+            child: Row(
+              children: [
+                const Text(
+                  'Taille',
+                  style: TextStyle(fontSize: 12, fontWeight: FontWeight.bold),
+                ),
+                const SizedBox(width: 4),
+                const Icon(Icons.zoom_out, size: 16),
+                Expanded(
+                  child: Slider(
+                    value: radius,
+                    min: TargetCalibrationState.minRadius,
+                    max: TargetCalibrationState.maxRadius,
+                    activeColor: AppTheme.primaryColor,
+                    onChanged: (value) =>
+                        _calibrationKey.currentState?.setRadius(value),
+                  ),
+                ),
+                const Icon(Icons.zoom_in, size: 16),
+              ],
+            ),
+          ),
+          SizedBox(
+            height: 32,
+            child: Row(
+              children: [
+                const Expanded(
+                  child: Text(
+                    'Options d\'espacement avancées',
+                    style: TextStyle(fontSize: 11, fontWeight: FontWeight.w500),
+                  ),
+                ),
+                Switch(
+                  value: _showSpacing,
+                  materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
+                  onChanged: (value) {
+                    setState(() => _showSpacing = value);
+                    _calibrationKey.currentState?.setSpacingMode(value);
+                  },
+                ),
+              ],
+            ),
+          ),
+          if (_showSpacing)
+            SizedBox(
+              height: 36,
+              child: Row(
+                children: [
+                  const Text(
+                    'Espacement',
+                    style: TextStyle(fontSize: 12, fontWeight: FontWeight.bold),
+                  ),
+                  const SizedBox(width: 4),
+                  const Icon(Icons.compress, size: 16),
+                  Expanded(
+                    child: Slider(
+                      value: spacing,
+                      min: TargetCalibrationState.minSpacing,
+                      max: TargetCalibrationState.maxSpacing,
+                      activeColor: Colors.orange,
+                      onChanged: (value) =>
+                          _calibrationKey.currentState?.setSpacingRatio(value),
+                    ),
+                  ),
+                  const Icon(Icons.expand, size: 16),
+                  IconButton(
+                    icon: const Icon(Icons.refresh, size: 20),
+                    tooltip: 'Réinitialiser l\'espacement',
+                    constraints: const BoxConstraints(),
+                    padding: const EdgeInsets.symmetric(horizontal: 8),
+                    onPressed: () =>
+                        _calibrationKey.currentState?.resetSpacing(),
+                  ),
+                ],
+              ),
+            ),
+        ],
+      ),
+    );
+  }
+
+  /// Indication affichée sous le titre en mode Synthèse.
+  ///
+  /// Rien n'indiquait comment ajouter un impact une fois la calibration
+  /// validée : ce rappel pointe vers le geste (toucher la cible).
+  Widget _buildSyntheseHint(AnalysisProvider provider) {
+    final hasShots = provider.shotCount > 0;
+
+    return Padding(
+      padding: const EdgeInsets.fromLTRB(16, 0, 16, 8),
+      child: Row(
+        mainAxisAlignment: MainAxisAlignment.center,
+        children: [
+          Icon(
+            hasShots ? Icons.touch_app : Icons.add_location_alt,
+            size: 16,
+            color: AppTheme.primaryColor,
+          ),
+          const SizedBox(width: 6),
+          Flexible(
+            child: Text(
+              hasShots
+                  ? 'Touchez la cible pour modifier vos impacts'
+                  : 'Touchez la cible pour placer vos impacts',
+              style: const TextStyle(fontSize: 13, fontWeight: FontWeight.w500),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+
+  /// Bouton flottant du bas de l'écran.
+  ///
+  /// En calibration : VALIDER. En synthèse : tant qu'aucun impact n'est placé,
+  /// on ne propose pas de terminer la session mais de placer un impact (le
+  /// bouton ouvre l'éditeur, comme un tap sur la cible).
+  Widget _buildBottomAction(BuildContext context, AnalysisProvider provider) {
+    if (_isCalibrating) {
+      return FloatingActionButton.extended(
+        // Même bouton bleu flottant que « TERMINER LA SESSION » :
+        // on fige la calibration puis on bascule sur la Synthèse.
+        onPressed: () {
+          _calibrationKey.currentState?.commitCalibration();
+          setState(() => _isCalibrating = false);
+        },
+        backgroundColor: AppTheme.primaryColor,
+        icon: const Icon(Icons.check),
+        label: const Text('VALIDER'),
+      );
+    }
+
+    if (provider.shotCount == 0) {
+      return FloatingActionButton.extended(
+        onPressed: () => _openImpactEditor(provider),
+        backgroundColor: AppTheme.primaryColor,
+        icon: const Icon(Icons.add_location_alt),
+        label: const Text('PLACER UN IMPACT'),
+      );
+    }
+
+    return FloatingActionButton.extended(
+      onPressed: () => _showSaveSessionDialog(context, provider),
+      backgroundColor: AppTheme.primaryColor,
+      icon: const Icon(Icons.save),
+      label: const Text('TERMINER LA SESSION'),
+    );
+  }
+
   @override
   Widget build(BuildContext context) {
     final provider = context.watch<AnalysisProvider>();
@@ -216,10 +375,10 @@ class _AnalysisScreenContentState extends State<_AnalysisScreenContent> {
         ? sessionProvider.targetCount + 1
         : null;
 
-    final titlePrefix = _isCalibrating ? 'Calibration' : 'Plotting';
+    final titlePrefix = _isCalibrating ? 'Calibration' : 'Synthèse';
     final title = targetNumber != null
         ? '$titlePrefix - Cible $targetNumber'
-        : (_isCalibrating ? 'Calibration' : 'Plotting du Tir');
+        : (_isCalibrating ? 'Calibration' : 'Synthèse du Tir');
 
     return Scaffold(
       appBar: AppBar(
@@ -243,39 +402,12 @@ class _AnalysisScreenContentState extends State<_AnalysisScreenContent> {
                 ),
               );
             } else {
-              // Retour Plotting -> Calibration : on réinitialise le zoom.
+              // Retour Synthèse -> Calibration : on réinitialise le zoom.
               _enterCalibration();
             }
           },
         ),
-        actions: [
-          if (!_isCalibrating && !_isSelectingReferences)
-            IconButton(
-              icon: const Icon(Icons.refresh),
-              onPressed: () => provider.analyzeImage(
-                context.read<AnalysisProvider>().imagePath!,
-                context.read<AnalysisProvider>().targetType!,
-              ),
-            ),
-          if (_isCalibrating)
-            TextButton(
-              onPressed: () {
-                // On fige la calibration courante AVANT d'ouvrir l'éditeur,
-                // puis on passe sur l'écran d'édition d'impacts plein écran
-                // (zoom fiable + placement). Le mode Plotting (lecture seule)
-                // s'affichera au retour si l'utilisateur valide.
-                _calibrationKey.currentState?.commitCalibration();
-                _openImpactEditor(context.read<AnalysisProvider>());
-              },
-              child: const Text(
-                'VALIDER',
-                style: TextStyle(
-                  color: Colors.white,
-                  fontWeight: FontWeight.bold,
-                ),
-              ),
-            ),
-        ],
+        actions: const [],
       ),
       body: Stack(
         children: [
@@ -283,21 +415,20 @@ class _AnalysisScreenContentState extends State<_AnalysisScreenContent> {
             controller: _scrollController,
             child: Column(
               children: [
-                Padding(
-                  padding: const EdgeInsets.all(AppConstants.defaultPadding),
-                  child: Column(
-                    crossAxisAlignment: CrossAxisAlignment.start,
-                    children: [
-                      if (provider.state == AnalysisState.loading)
-                        const Center(
-                          child: Padding(
-                            padding: EdgeInsets.symmetric(vertical: 8.0),
-                            child: CircularProgressIndicator(),
-                          ),
-                        ),
-                    ],
+                // Plus de bloc vide au-dessus de l'image : l'indicateur n'occupe
+                // de la place que pendant le chargement.
+                if (provider.state == AnalysisState.loading)
+                  const Padding(
+                    padding: EdgeInsets.symmetric(vertical: 8.0),
+                    child: Center(child: CircularProgressIndicator()),
                   ),
-                ),
+
+                // Réglages de calibration : au-dessus de la photo pour ne rien
+                // masquer de la cible.
+                if (_isCalibrating)
+                  _buildCalibrationSettings(provider)
+                else
+                  _buildSyntheseHint(provider),
 
                 AspectRatio(
                   aspectRatio: provider.imageAspectRatio,
@@ -315,7 +446,6 @@ class _AnalysisScreenContentState extends State<_AnalysisScreenContent> {
                                   widget.cropOffset?.dy ?? 0.0,
                                   0.0,
                                 )
-                                ..scale(1.0, 1.0)
                                 ..rotateZ(
                                   (provider.cropRotation) *
                                       (math.pi / 180),
@@ -368,27 +498,6 @@ class _AnalysisScreenContentState extends State<_AnalysisScreenContent> {
                     padding: const EdgeInsets.all(AppConstants.defaultPadding),
                     child: Column(
                       children: [
-                        Card(
-                          color: AppTheme.primaryColor.withValues(alpha: 0.18),
-                          child: ListTile(
-                            leading: const Icon(
-                              Icons.edit_location_alt,
-                              color: AppTheme.primaryColor,
-                            ),
-                            title: const Text('Modifier les impacts'),
-                            subtitle: const Text(
-                              'Ajouter, déplacer ou supprimer des impacts (plein écran)',
-                            ),
-                            trailing: const Icon(
-                              Icons.open_in_full,
-                              size: 16,
-                            ),
-                            // Rouvre l'éditeur plein écran en partageant le provider.
-                            onTap: () =>
-                                _openImpactEditor(context.read<AnalysisProvider>()),
-                          ),
-                        ),
-                        const SizedBox(height: 12),
                         Card(
                           color: AppTheme.primaryColor.withValues(alpha: 0.1),
                           child: ListTile(
@@ -414,6 +523,14 @@ class _AnalysisScreenContentState extends State<_AnalysisScreenContent> {
                           shotCount: provider.shotCount,
                           scoreResult: provider.scoreResult,
                           targetType: provider.targetType!,
+                          // Cumul de la session : cibles déjà validées + cible
+                          // en cours (absent hors session).
+                          sessionTotalScore: sessionProvider.isSessionActive
+                              ? sessionProvider.totalSessionScore +
+                                    provider.totalScore
+                              : null,
+                          sessionTargetCount:
+                              sessionProvider.targetCount + 1,
                         ),
                         const SizedBox(height: 12),
                         if (provider.groupingResult != null &&
@@ -423,8 +540,6 @@ class _AnalysisScreenContentState extends State<_AnalysisScreenContent> {
                             targetCenterX: provider.targetCenterX,
                             targetCenterY: provider.targetCenterY,
                           ),
-                        const SizedBox(height: 12),
-                        _buildActionButtons(context, provider),
                         const SizedBox(height: 50),
                       ],
                     ),
@@ -528,15 +643,7 @@ class _AnalysisScreenContentState extends State<_AnalysisScreenContent> {
                 padding: _isAtBottom
                     ? EdgeInsets.zero
                     : const EdgeInsets.all(16.0),
-                child: _isCalibrating
-                    ? const SizedBox.shrink()
-                    : FloatingActionButton.extended(
-                  onPressed: () =>
-                      _showSaveSessionDialog(context, provider),
-                  backgroundColor: AppTheme.primaryColor,
-                  icon: const Icon(Icons.save),
-                  label: const Text('TERMINER LA SESSION'),
-                ),
+                child: _buildBottomAction(context, provider),
               ),
             ),
           ),
@@ -558,22 +665,21 @@ class _AnalysisScreenContentState extends State<_AnalysisScreenContent> {
     );
   }
 
-  /// Affichage du plotting en LECTURE SEULE.
+  /// Affichage de la synthèse en LECTURE SEULE.
   ///
-  /// L'édition (ajout / déplacement / suppression) se fait désormais
-  /// exclusivement dans l'éditeur plein écran (ImpactEditorScreen). Ici on se
-  /// contente d'afficher l'image + l'overlay, avec un zoom de consultation.
-  /// Le tap sur un impact ouvre simplement ses détails.
+  /// La cible est un élément d'écran FIXE : elle ne se déplace pas et ne se
+  /// zoome pas (plus d'InteractiveViewer). Un tap n'importe où sur la cible
+  /// ouvre directement l'éditeur d'impacts plein écran (ImpactEditorScreen),
+  /// exactement comme le faisait l'ancien bouton « Modifier les impacts ».
+  /// C'est là que se fait toute l'édition (ajout / déplacement / suppression),
+  /// avec un zoom fiable.
   Widget _buildReadOnlyPlotImage(
       BuildContext context,
       AnalysisProvider provider,
       ) {
-    return InteractiveViewer(
-      transformationController: _transformationController,
-      minScale: 1.0,
-      maxScale: 10.0,
-      boundaryMargin: const EdgeInsets.all(80),
-      panEnabled: true,
+    return GestureDetector(
+      behavior: HitTestBehavior.opaque,
+      onTap: () => _openImpactEditor(context.read<AnalysisProvider>()),
       child: Stack(
         children: [
           Image.file(
@@ -589,10 +695,7 @@ class _AnalysisScreenContentState extends State<_AnalysisScreenContent> {
               targetType: provider.targetType!,
               shots: provider.shots,
               showRings: true,
-              zoomScale: _currentZoomScale,
-              // Lecture seule : tap sur impact -> détails (consultation).
-              onShotTapped: (shot) =>
-                  _showShotDetails(context, provider, shot),
+              zoomScale: 1.0,
             ),
           ),
         ],
@@ -600,190 +703,278 @@ class _AnalysisScreenContentState extends State<_AnalysisScreenContent> {
     );
   }
 
-  Widget _buildActionButtons(BuildContext context, AnalysisProvider provider) {
-    return const Column(children: [Row(children: [])]);
-  }
+  Future<void> _showSaveSessionDialog(
+    BuildContext context,
+    AnalysisProvider provider,
+  ) async {
+    // L'option « Participer à l'entraînement IA » (Paramètres) est lue AVANT
+    // d'ouvrir la popup : elle décide de la présence du bouton d'export.
+    final canExport =
+        await WalletIdentityService().isUploadEnabled() &&
+        provider.state == AnalysisState.success;
 
-  void _showShotDetails(
-      BuildContext context,
-      AnalysisProvider provider,
-      Shot shot,
-      ) {
-    showModalBottomSheet(
-      context: context,
-      builder: (context) => Container(
-        padding: const EdgeInsets.all(24),
-        child: Column(
-          mainAxisSize: MainAxisSize.min,
-          children: [
-            Text(
-              'Impact #${provider.shots.indexOf(shot) + 1}',
-              style: const TextStyle(fontWeight: FontWeight.bold, fontSize: 18),
-            ),
-            Text(
-              'ID: ${shot.id}',
-              style: Theme.of(
-                context,
-              ).textTheme.bodySmall?.copyWith(color: Colors.grey, fontSize: 10),
-            ),
-            const SizedBox(height: 16),
-            ListTile(
-              leading: const Icon(Icons.score),
-              title: const Text('Modifier le score'),
-              trailing: DropdownButton<int>(
-                value: shot.score.clamp(0, 10),
-                items: List.generate(11, (index) => index)
-                    .map(
-                      (s) => DropdownMenuItem(
-                    value: s,
-                    child: Text(
-                      '$s',
-                      style: const TextStyle(
-                        fontWeight: FontWeight.bold,
-                        fontSize: 18,
-                      ),
-                    ),
-                  ),
-                )
-                    .toList(),
-                onChanged: (newScore) {
-                  if (newScore != null) {
-                    provider.updateShotScore(shot.id, newScore);
-                    Navigator.pop(context);
-                  }
-                },
-              ),
-            ),
-            const SizedBox(height: 24),
-            Row(
-              children: [
-                Expanded(
-                  child: OutlinedButton.icon(
-                    onPressed: () {
-                      provider.removeShot(shot.id);
-                      Navigator.pop(context);
-                    },
-                    icon: const Icon(Icons.delete, color: Colors.red),
-                    label: const Text(
-                      'SUPPRIMER',
-                      style: TextStyle(color: Colors.red),
-                    ),
-                  ),
-                ),
-              ],
-            ),
-          ],
-        ),
-      ),
-    );
-  }
+    if (!context.mounted) return;
 
-  void _showSaveSessionDialog(BuildContext context, AnalysisProvider provider) {
     showDialog(
       context: context,
       builder: (context) => AlertDialog(
-        title: const Text('Session Terminee'),
+        // Protège des petits écrans / grandes polices : la popup défile au
+        // lieu de déborder.
+        scrollable: true,
+        // En-tête bleu pleine largeur : le titre occupe toute la bande, d'où
+        // les paddings mis à zéro.
+        titlePadding: EdgeInsets.zero,
+        contentPadding: const EdgeInsets.fromLTRB(20, 16, 20, 16),
+        shape: RoundedRectangleBorder(
+          borderRadius: BorderRadius.circular(16),
+        ),
+        clipBehavior: Clip.antiAlias,
+        title: Container(
+          width: double.infinity,
+          color: AppTheme.primaryColor,
+          padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 16),
+          child: const Row(
+            children: [
+              Icon(Icons.flag, color: Colors.white),
+              SizedBox(width: 10),
+              Text(
+                'Session terminée',
+                style: TextStyle(
+                  color: Colors.white,
+                  fontSize: 18,
+                  fontWeight: FontWeight.bold,
+                ),
+              ),
+            ],
+          ),
+        ),
+        // Les boutons sont dans le contenu (et non dans `actions`) pour être
+        // tous à la même largeur, alignés les uns sous les autres.
         content: Column(
           mainAxisSize: MainAxisSize.min,
-          crossAxisAlignment: CrossAxisAlignment.start,
+          crossAxisAlignment: CrossAxisAlignment.stretch,
           children: [
-            Text('Nombre de tirs: ${provider.shotCount}'),
-            Text('Score total: ${provider.totalScore}'),
+            _buildDialogRecap(context, provider),
             const SizedBox(height: 16),
             const Text('Voulez-vous enregistrer cette session ?'),
+            const SizedBox(height: 16),
+            _buildDialogButton(
+              icon: const Icon(Icons.add_a_photo, color: Colors.white),
+              label: 'AJOUTER UNE CIBLE',
+              color: AppTheme.secondaryColor,
+              onPressed: () => _saveAndAddTarget(context, provider),
+            ),
+            const SizedBox(height: 8),
+            _buildDialogButton(
+              icon: const Icon(Icons.save, color: Colors.white),
+              label: 'TERMINER TOUT',
+              color: AppTheme.primaryColor,
+              onPressed: () => _finishSession(context, provider),
+            ),
+            // Bouton d'export : uniquement si l'entraînement IA est autorisé.
+            if (canExport) ...[
+              const SizedBox(height: 8),
+              _buildDialogButton(
+                icon: Image.asset(
+                  'assets/icons/cloud_save.png',
+                  width: 24,
+                  height: 24,
+                  // L'icône est un trait noir : on la recolore en blanc pour
+                  // qu'elle ressorte sur le bouton.
+                  color: Colors.white,
+                ),
+                label: 'TERMINER TOUT ET EXPORTER',
+                color: AppTheme.warningColor,
+                onPressed: () =>
+                    _finishSession(context, provider, export: true),
+              ),
+            ],
+            const SizedBox(height: 4),
+            TextButton(
+              onPressed: () {
+                Navigator.pop(context);
+                // CORRECTION : on repart aussi de l'image SOURCE non rognée ici.
+                final path = _backCropImagePath(provider);
+                final type = provider.targetType!;
+
+                Navigator.pushReplacement(
+                  context,
+                  MaterialPageRoute(
+                    builder: (context) => CropScreen(
+                      imagePath: path,
+                      targetType: type,
+                      initialScale: widget.cropScale,
+                      initialOffset: widget.cropOffset,
+                    ),
+                  ),
+                );
+              },
+              child: const Text('ANNULER'),
+            ),
           ],
         ),
-        actions: [
-          TextButton(
-            onPressed: () {
-              Navigator.pop(context);
-              // CORRECTION : on repart aussi de l'image SOURCE non rognée ici.
-              final path = _backCropImagePath(provider);
-              final type = provider.targetType!;
+      ),
+    );
+  }
 
-              Navigator.pushReplacement(
-                context,
-                MaterialPageRoute(
-                  builder: (context) => CropScreen(
-                    imagePath: path,
-                    targetType: type,
-                    initialScale: widget.cropScale,
-                    initialOffset: widget.cropOffset,
-                  ),
-                ),
-              );
-            },
-            child: const Text('ANNULER'),
-          ),
-          ElevatedButton(
-            onPressed: () async {
-              try {
-                final sessionProvider = context.read<SessionProvider>();
-                final analysis = await provider.saveSession(
-                  sessionId: sessionProvider.activeSessionId,
-                  weaponName: sessionProvider.currentWeapon,
-                  weaponId: sessionProvider.currentWeaponId,
-                  distance: sessionProvider.distance,
-                  date: sessionProvider.sessionDate,
-                );
-
-                sessionProvider.addAnalysis(analysis);
-
-                if (context.mounted) {
-                  Navigator.pop(context);
-                  Navigator.pushAndRemoveUntil(
-                    context,
-                    MaterialPageRoute(
-                      builder: (context) => const CaptureScreen(),
-                    ),
-                        (route) => route.isFirst,
-                  );
-                }
-              } catch (e) {
-                if (context.mounted) {
-                  ScaffoldMessenger.of(context).showSnackBar(
-                    SnackBar(
-                      content: Text('Erreur: $e'),
-                      backgroundColor: AppTheme.errorColor,
-                    ),
-                  );
-                }
-              }
-            },
-            child: const Text('AJOUTER UNE CIBLE'),
-          ),
-          ElevatedButton(
-            onPressed: () async {
-              try {
-                final sessionProvider = context.read<SessionProvider>();
-                await provider.saveSession(
-                  sessionId: sessionProvider.activeSessionId,
-                  weaponName: sessionProvider.currentWeapon,
-                  weaponId: sessionProvider.currentWeaponId,
-                  distance: sessionProvider.distance,
-                  date: sessionProvider.sessionDate,
-                );
-
-                if (context.mounted) {
-                  sessionProvider.endSession();
-                  Navigator.pop(context);
-                  Navigator.of(context).popUntil((route) => route.isFirst);
-                }
-              } catch (e) {
-                if (context.mounted) {
-                  ScaffoldMessenger.of(context).showSnackBar(
-                    SnackBar(
-                      content: Text('Erreur: $e'),
-                      backgroundColor: AppTheme.errorColor,
-                    ),
-                  );
-                }
-              }
-            },
-            child: const Text('TERMINER TOUT'),
-          ),
+  /// Rappel chiffré (tirs / score) en tête de la popup de fin de session.
+  Widget _buildDialogRecap(BuildContext context, AnalysisProvider provider) {
+    return Container(
+      padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 12),
+      decoration: BoxDecoration(
+        color: AppTheme.primaryColor.withValues(alpha: 0.10),
+        borderRadius: BorderRadius.circular(12),
+      ),
+      child: Row(
+        mainAxisAlignment: MainAxisAlignment.spaceAround,
+        children: [
+          _buildRecapValue(context, '${provider.shotCount}', 'Tirs'),
+          _buildRecapValue(context, '${provider.totalScore}', 'Score total'),
         ],
       ),
     );
   }
+
+  Widget _buildRecapValue(BuildContext context, String value, String label) {
+    return Column(
+      children: [
+        Text(
+          value,
+          style: Theme.of(context).textTheme.headlineSmall?.copyWith(
+            fontWeight: FontWeight.bold,
+            color: AppTheme.primaryColor,
+          ),
+        ),
+        Text(label, style: Theme.of(context).textTheme.bodySmall),
+      ],
+    );
+  }
+
+  /// Bouton pleine largeur de la popup, aux couleurs du thème.
+  Widget _buildDialogButton({
+    required Widget icon,
+    required String label,
+    required Color color,
+    required VoidCallback onPressed,
+  }) {
+    return ElevatedButton.icon(
+      icon: icon,
+      label: Text(label, style: const TextStyle(fontWeight: FontWeight.bold)),
+      style: ElevatedButton.styleFrom(
+        backgroundColor: color,
+        foregroundColor: Colors.white,
+        padding: const EdgeInsets.symmetric(vertical: 14),
+        shape: RoundedRectangleBorder(
+          borderRadius: BorderRadius.circular(10),
+        ),
+      ),
+      onPressed: onPressed,
+    );
+  }
+
+  /// Enregistre la cible courante et enchaîne sur une nouvelle capture.
+  Future<void> _saveAndAddTarget(
+    BuildContext context,
+    AnalysisProvider provider,
+  ) async {
+    try {
+      final sessionProvider = context.read<SessionProvider>();
+      final analysis = await provider.saveSession(
+        sessionId: sessionProvider.activeSessionId,
+        weaponName: sessionProvider.currentWeapon,
+        weaponId: sessionProvider.currentWeaponId,
+        distance: sessionProvider.distance,
+        date: sessionProvider.sessionDate,
+      );
+
+      sessionProvider.addAnalysis(analysis);
+
+      if (context.mounted) {
+        Navigator.pop(context);
+        Navigator.pushAndRemoveUntil(
+          context,
+          MaterialPageRoute(builder: (context) => const CaptureScreen()),
+          (route) => route.isFirst,
+        );
+      }
+    } catch (e) {
+      if (context.mounted) {
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(
+            content: Text('Erreur: $e'),
+            backgroundColor: AppTheme.errorColor,
+          ),
+        );
+      }
+    }
+  }
+
+  /// Clôture la session et revient sur l'onglet Statistiques.
+  ///
+  /// Avec [export], la cible est en plus envoyée au backend d'entraînement IA.
+  /// L'enregistrement local reste prioritaire : un échec d'export n'empêche
+  /// jamais la session d'être sauvegardée.
+  Future<void> _finishSession(
+    BuildContext context,
+    AnalysisProvider provider, {
+    bool export = false,
+  }) async {
+    // Messenger et session capturés AVANT les await : le contexte de la popup
+    // ne sera plus valide ensuite.
+    final messenger = ScaffoldMessenger.of(context);
+    final sessionProvider = context.read<SessionProvider>();
+
+    try {
+      await provider.saveSession(
+        sessionId: sessionProvider.activeSessionId,
+        weaponName: sessionProvider.currentWeapon,
+        weaponId: sessionProvider.currentWeaponId,
+        distance: sessionProvider.distance,
+        date: sessionProvider.sessionDate,
+      );
+
+      bool? exportSucceeded;
+      if (export) {
+        messenger.showSnackBar(
+          const SnackBar(content: Text('Exportation en cours...')),
+        );
+        exportSucceeded = await provider.exportToAiBackend(
+          sessionId: sessionProvider.activeSessionId,
+          distance: sessionProvider.distance,
+          weapon: sessionProvider.currentWeapon,
+        );
+        messenger.hideCurrentSnackBar();
+      }
+
+      if (context.mounted) {
+        sessionProvider.endSession();
+        Navigator.pop(context);
+        Navigator.of(context).popUntil((route) => route.isFirst);
+        // Fin de session : on atterrit sur les statistiques.
+        openMainTab(mainTabStats);
+      }
+
+      if (exportSucceeded != null) {
+        messenger.showSnackBar(
+          SnackBar(
+            content: Text(
+              exportSucceeded
+                  ? 'Export réussi vers le backend IA !'
+                  : (provider.errorMessage ?? 'Erreur d\'export'),
+            ),
+            backgroundColor: exportSucceeded
+                ? AppTheme.successColor
+                : AppTheme.errorColor,
+          ),
+        );
+      }
+    } catch (e) {
+      messenger.showSnackBar(
+        SnackBar(
+          content: Text('Erreur: $e'),
+          backgroundColor: AppTheme.errorColor,
+        ),
+      );
+    }
+  }
 }

lib/features/analysis/impact_editor_screen.dart

@@ -7,8 +7,11 @@
 /// scroll vertical ou une transformation parente.
 ///
 /// Interactions :
-///   - Tap sur zone vide      -> ajoute un impact
-///   - Tap sur un impact      -> ouvre l'édition (score / suppression)
+///   - Tap                    -> ajoute TOUJOURS un impact, même juste à côté
+///                               (ou par-dessus) un impact existant. Aucun tap
+///                               n'ouvre d'édition de score : on peut donc
+///                               placer un impact au pouce près sans être
+///                               interrompu par une popup.
 ///   - Appui long + glisser   -> déplace l'impact
 ///
 /// L'état des impacts est partagé avec l'écran d'analyse via le MÊME
@@ -20,6 +23,7 @@ import 'dart:math' as math;
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 
+import '../../core/theme/app_theme.dart';
 import '../../data/models/shot.dart';
 import 'analysis_provider.dart';
 import 'widgets/target_overlay.dart';
@@ -71,8 +75,11 @@ class _ImpactEditorScreenState extends State<ImpactEditorScreen> {
   }
 
   /// Renvoie l'impact le plus proche de [rel] dans la tolérance, sinon null.
+  ///
+  /// Utilisé uniquement par l'appui long (déplacement) : le tap simple, lui,
+  /// ajoute toujours un impact sans chercher à en sélectionner un.
   Shot? _hitTestShot(AnalysisProvider provider, Offset rel,
-      {double tolerance = 0.04}) {
+      {double tolerance = 0.06}) {
     Shot? closest;
     double minDistance = double.infinity;
     for (final shot in provider.shots) {
@@ -98,16 +105,29 @@ class _ImpactEditorScreenState extends State<ImpactEditorScreen> {
         title: Text('Placement des impacts (${provider.shotCount})'),
         leading: IconButton(
           icon: const Icon(Icons.arrow_back),
-          tooltip: 'Retour à la calibration',
+          tooltip: 'Retour à la synthèse',
           onPressed: () => Navigator.pop(context, false),
         ),
-        actions: [
-          TextButton(
+      ),
+      // Corbeille (efface tous les impacts) + bouton bleu flottant VALIDER.
+      // heroTag distinct sur chaque FAB pour éviter le conflit de Hero.
+      floatingActionButton: Row(
+        mainAxisSize: MainAxisSize.min,
+        children: [
+          FloatingActionButton(
+            heroTag: 'reset_impacts',
+            onPressed: () => provider.clearShots(),
+            backgroundColor: Colors.grey.shade800,
+            tooltip: 'Effacer tous les impacts',
+            child: const Icon(Icons.delete),
+          ),
+          const SizedBox(width: 12),
+          FloatingActionButton.extended(
+            heroTag: 'validate_impacts',
             onPressed: () => Navigator.pop(context, true),
-            child: const Text(
-              'VALIDER',
-              style: TextStyle(color: Colors.white, fontWeight: FontWeight.bold),
-            ),
+            backgroundColor: AppTheme.primaryColor,
+            icon: const Icon(Icons.check),
+            label: const Text('VALIDER'),
           ),
         ],
       ),
@@ -119,7 +139,7 @@ class _ImpactEditorScreenState extends State<ImpactEditorScreen> {
             color: Colors.white10,
             padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
             child: const Text(
-              'Tap : ajouter • Tap sur impact : éditer • Appui long : déplacer • Pincer : zoomer',
+              'Tap : ajouter un impact • Appui long : déplacer • Pincer : zoomer',
               style: TextStyle(color: Colors.white70, fontSize: 12),
               textAlign: TextAlign.center,
             ),
@@ -136,24 +156,20 @@ class _ImpactEditorScreenState extends State<ImpactEditorScreen> {
               child: Center(
                 child: GestureDetector(
                   behavior: HitTestBehavior.opaque,
-                  // TAP : éditer si on touche un impact, sinon ajouter.
+                  // TAP : ajoute un impact, sans exception. Même collé à un
+                  // impact existant, le tap crée le nouvel impact au lieu
+                  // d'ouvrir l'édition du score.
                   onTapUp: (details) {
                     if (_movingShotId != null) return;
                     final rel = _toImageRelative(details.globalPosition);
                     if (rel == null) return;
-
-                    final hit = _hitTestShot(provider, rel);
-                    if (hit != null) {
-                      _showShotDetails(context, provider, hit);
-                    } else {
-                      provider.addShot(rel.dx, rel.dy);
-                    }
+                    provider.addShot(rel.dx, rel.dy);
                   },
                   // APPUI LONG : on saisit l'impact le plus proche pour le déplacer.
                   onLongPressStart: (details) {
                     final rel = _toImageRelative(details.globalPosition);
                     if (rel == null) return;
-                    final hit = _hitTestShot(provider, rel, tolerance: 0.06);
+                    final hit = _hitTestShot(provider, rel);
                     if (hit != null) {
                       setState(() => _movingShotId = hit.id);
                     }
@@ -189,10 +205,10 @@ class _ImpactEditorScreenState extends State<ImpactEditorScreen> {
                           shots: provider.shots,
                           showRings: true,
                           zoomScale: _currentZoomScale,
-                          // L'ajout et la sélection sont gérés par le
-                          // GestureDetector parent ci-dessus.
-                          onShotTapped: (shot) =>
-                              _showShotDetails(context, provider, shot),
+                          // Aucun onShotTapped : les impacts ne captent plus le
+                          // toucher, tout va au GestureDetector parent qui
+                          // ajoute un impact (y compris pile sur un impact
+                          // existant).
                         ),
                       ),
                     ],
@@ -205,79 +221,4 @@ class _ImpactEditorScreenState extends State<ImpactEditorScreen> {
       ),
     );
   }
-
-  void _showShotDetails(
-      BuildContext context,
-      AnalysisProvider provider,
-      Shot shot,
-      ) {
-    showModalBottomSheet(
-      context: context,
-      builder: (context) => Container(
-        padding: const EdgeInsets.all(24),
-        child: Column(
-          mainAxisSize: MainAxisSize.min,
-          children: [
-            Text(
-              'Impact #${provider.shots.indexOf(shot) + 1}',
-              style: const TextStyle(fontWeight: FontWeight.bold, fontSize: 18),
-            ),
-            Text(
-              'ID: ${shot.id}',
-              style: Theme.of(context)
-                  .textTheme
-                  .bodySmall
-                  ?.copyWith(color: Colors.grey, fontSize: 10),
-            ),
-            const SizedBox(height: 16),
-            ListTile(
-              leading: const Icon(Icons.score),
-              title: const Text('Modifier le score'),
-              trailing: DropdownButton<int>(
-                value: shot.score.clamp(0, 10),
-                items: List.generate(11, (index) => index)
-                    .map(
-                      (s) => DropdownMenuItem(
-                    value: s,
-                    child: Text(
-                      '$s',
-                      style: const TextStyle(
-                        fontWeight: FontWeight.bold,
-                        fontSize: 18,
-                      ),
-                    ),
-                  ),
-                )
-                    .toList(),
-                onChanged: (newScore) {
-                  if (newScore != null) {
-                    provider.updateShotScore(shot.id, newScore);
-                    Navigator.pop(context);
-                  }
-                },
-              ),
-            ),
-            const SizedBox(height: 24),
-            Row(
-              children: [
-                Expanded(
-                  child: OutlinedButton.icon(
-                    onPressed: () {
-                      provider.removeShot(shot.id);
-                      Navigator.pop(context);
-                    },
-                    icon: const Icon(Icons.delete, color: Colors.red),
-                    label: const Text(
-                      'SUPPRIMER',
-                      style: TextStyle(color: Colors.red),
-                    ),
-                  ),
-                ),
-              ],
-            ),
-          ],
-        ),
-      ),
-    );
-  }
 }

lib/features/analysis/widgets/score_card.dart

@@ -17,12 +17,22 @@ class ScoreCard extends StatelessWidget {
   final ScoreResult? scoreResult;
   final TargetType targetType;
 
+  /// Score cumulé de la session (cibles déjà validées + cible en cours).
+  ///
+  /// null hors session : le bandeau de session n'est alors pas affiché.
+  final int? sessionTotalScore;
+
+  /// Nombre de cibles comptabilisées dans [sessionTotalScore].
+  final int sessionTargetCount;
+
   const ScoreCard({
     super.key,
     required this.totalScore,
     required this.shotCount,
     this.scoreResult,
     required this.targetType,
+    this.sessionTotalScore,
+    this.sessionTargetCount = 0,
   });
 
   @override
@@ -46,13 +56,23 @@ class ScoreCard extends StatelessWidget {
                   ),
                 ),
                 const Spacer(),
+                if (sessionTotalScore != null) ...[
+                  Flexible(child: _buildSessionBadge(context)),
+                  const SizedBox(width: 4),
+                ],
                 MetricInfoButton(
                   title: 'Score',
                   explanations: [
                     MetricExplanation(
                       'Total',
-                      'Somme des points de tous vos impacts, sur le maximum '
-                          'possible (nombre d\'impacts × $maxScore points).',
+                      'Somme des points de tous vos impacts sur CETTE cible, '
+                          'sur le maximum possible (nombre d\'impacts × '
+                          '$maxScore points).',
+                    ),
+                    const MetricExplanation(
+                      'Session',
+                      'Score cumulé de toutes les cibles de la session en '
+                          'cours, cible affichée comprise.',
                     ),
                     const MetricExplanation(
                       'Impacts',
@@ -122,6 +142,30 @@ class ScoreCard extends StatelessWidget {
     );
   }
 
+  /// Bandeau compact rappelant le score total de la session en cours.
+  Widget _buildSessionBadge(BuildContext context) {
+    // Le nombre de cibles n'est rappelé qu'à partir de la deuxième : sur la
+    // première il n'apporte rien et allonge le bandeau pour rien.
+    final cibles = sessionTargetCount > 1 ? ' ($sessionTargetCount cibles)' : '';
+
+    return Container(
+      padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 4),
+      decoration: BoxDecoration(
+        color: AppTheme.primaryColor.withValues(alpha: 0.15),
+        borderRadius: BorderRadius.circular(12),
+      ),
+      child: Text(
+        'Session : $sessionTotalScore pts$cibles',
+        maxLines: 1,
+        overflow: TextOverflow.ellipsis,
+        style: Theme.of(context).textTheme.bodySmall?.copyWith(
+          fontWeight: FontWeight.bold,
+          color: AppTheme.primaryColor,
+        ),
+      ),
+    );
+  }
+
   Widget _buildScoreStat(
     BuildContext context,
     String label,

lib/features/analysis/widgets/target_calibration.dart

@@ -4,8 +4,8 @@
 /// Les anneaux sont répartis proportionnellement.
 library;
 
+import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
-import '../../../core/theme/app_theme.dart';
 import '../../../data/models/target_type.dart';
 
 class TargetCalibration extends StatefulWidget {
@@ -43,6 +43,15 @@ class TargetCalibration extends StatefulWidget {
 }
 
 class TargetCalibrationState extends State<TargetCalibration> {
+  /// Bornes du rayon global (mesurées pour laisser de la liberté sans
+  /// débordement incontrôlé).
+  static const double minRadius = 0.3;
+  static const double maxRadius = 0.95;
+
+  /// Bornes de l'espacement : max bridé à 0.70 pour confiner le dernier cercle.
+  static const double minSpacing = 0.01;
+  static const double maxSpacing = 0.70;
+
   late double _centerX;
   late double _centerY;
   late double _radius;
@@ -130,7 +139,14 @@ class TargetCalibrationState extends State<TargetCalibration> {
       _currentEspacementRatio = (_radius > 0) ? (_innerRadius / _radius).clamp(0.01, 0.70) : 0.1;
       shouldReinit = true;
     }
-    if (widget.initialRingRadii != oldWidget.initialRingRadii && widget.initialRingRadii != null) {
+    // On ne rafraîchit le profil d'usine que si les rayons entrants proviennent
+    // réellement d'une nouvelle détection (ils diffèrent de notre état courant).
+    // Sinon il s'agit de l'écho de notre propre _notifyChange (aller-retour via
+    // le provider) : le clobber effacerait le profil d'origine et casserait le
+    // bouton de réinitialisation de l'espacement.
+    if (widget.initialRingRadii != oldWidget.initialRingRadii &&
+        widget.initialRingRadii != null &&
+        !listEquals(widget.initialRingRadii, _ringRadii)) {
       _originalRingRadii = List.from(widget.initialRingRadii!);
       shouldReinit = true;
     }
@@ -146,189 +162,116 @@ class TargetCalibrationState extends State<TargetCalibration> {
       builder: (context, constraints) {
         final size = constraints.biggest;
 
-        return Stack(
-          children: [
-            GestureDetector(
-              onScaleStart: (details) {
-                _baseRadiusBeforeScale = _radius;
-                final tapX = details.localFocalPoint.dx / size.width;
-                final tapY = details.localFocalPoint.dy / size.height;
-                final distToCenter = _distance(tapX, tapY, _centerX, _centerY);
+        // Les réglages (taille / espacement) sont rendus par l'écran hôte
+        // AU-DESSUS de l'image : rien ne vient masquer la cible ici.
+        return GestureDetector(
+          onScaleStart: (details) {
+            _baseRadiusBeforeScale = _radius;
+            final tapX = details.localFocalPoint.dx / size.width;
+            final tapY = details.localFocalPoint.dy / size.height;
+            final distToCenter = _distance(tapX, tapY, _centerX, _centerY);
 
-                if (distToCenter < 0.05 || distToCenter < _radius + 0.02) {
-                  setState(() {
-                    _isDraggingCenter = true;
-                  });
-                }
-              },
-              onScaleUpdate: (details) => _onScaleUpdate(details, size),
-              onScaleEnd: (_) => _onScaleEnd(),
-              child: CustomPaint(
-                size: size,
-                painter: _CalibrationPainter(
-                  centerX: _centerX,
-                  centerY: _centerY,
-                  radius: _radius,
-                  innerRadius: _innerRadius,
-                  ringCount: _ringCount,
-                  ringRadii: _ringRadii,
-                  targetType: widget.targetType,
-                  isDraggingCenter: _isDraggingCenter,
-                  isDraggingRadius: false,
-                  isDraggingInnerRadius: false,
-                ),
-              ),
+            if (distToCenter < 0.05 || distToCenter < _radius + 0.02) {
+              setState(() {
+                _isDraggingCenter = true;
+              });
+            }
+          },
+          onScaleUpdate: (details) => _onScaleUpdate(details, size),
+          onScaleEnd: (_) => _onScaleEnd(),
+          child: CustomPaint(
+            size: size,
+            painter: _CalibrationPainter(
+              centerX: _centerX,
+              centerY: _centerY,
+              radius: _radius,
+              innerRadius: _innerRadius,
+              ringCount: _ringCount,
+              ringRadii: _ringRadii,
+              targetType: widget.targetType,
+              isDraggingCenter: _isDraggingCenter,
+              isDraggingRadius: false,
+              isDraggingInnerRadius: false,
             ),
-
-            Positioned(
-              top: 10,
-              left: 40,
-              right: 40,
-              child: Column(
-                mainAxisSize: MainAxisSize.min,
-                children: [
-                  Container(
-                    margin: const EdgeInsets.only(bottom: 8),
-                    padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 2),
-                    decoration: BoxDecoration(
-                      color: Colors.black54,
-                      borderRadius: BorderRadius.circular(20),
-                    ),
-                    child: Row(
-                      mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                      children: [
-                        const Text(
-                          'Options d\'espacement avancées',
-                          style: TextStyle(color: Colors.white70, fontSize: 11, fontWeight: FontWeight.w500),
-                        ),
-                        SizedBox(
-                          height: 28,
-                          child: Switch(
-                            value: _showEspacement,
-                            activeThumbColor: const Color(0xFF00FF00),
-                            onChanged: (bool value) {
-                              setState(() {
-                                _showEspacement = value;
-                                // Quand on désactive l'espacement manuel, on restaure la configuration d'usine !
-                                if (!value) {
-                                  _initRingRadii(forceRecalculate: false);
-                                }
-                              });
-                              _notifyChange();
-                            },
-                          ),
-                        ),
-                      ],
-                    ),
-                  ),
-
-                  // Slider pour la taille (toujours visible)
-                  Container(
-                    padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 4),
-                    decoration: BoxDecoration(
-                      color: Colors.black54,
-                      borderRadius: BorderRadius.circular(20),
-                    ),
-                    child: Row(
-                      children: [
-                        const Text('Taille ', style: TextStyle(color: Colors.white, fontSize: 12, fontWeight: FontWeight.bold)),
-                        const Icon(Icons.zoom_out, color: Colors.white, size: 16),
-                        Expanded(
-                          child: Slider(
-                            // SÉCURITÉ : Ouverture mesurée des bornes pour plus de liberté sans débordement incontrôlé
-                            value: _radius.clamp(0.3, 0.95),
-                            min: 0.3,
-                            max: 0.95,
-                            activeColor: AppTheme.primaryColor,
-                            onChanged: (value) {
-                              setState(() {
-                                _radius = value;
-                                _innerRadius = _radius * _currentEspacementRatio;
-                                // CORRECTION : Si le mode avancé n'est pas coché, on applique la taille pure sans détruire le ratio d'origine
-                                _initRingRadii(forceRecalculate: _showEspacement);
-                              });
-                              _notifyChange();
-                            },
-                          ),
-                        ),
-                        const Icon(Icons.zoom_in, color: Colors.white, size: 16),
-                      ],
-                    ),
-                  ),
-
-                  // Affichage conditionnel du slider d'espacement orange
-                  if (_showEspacement) ...[
-                    const SizedBox(height: 8),
-                    Container(
-                      padding: const EdgeInsets.fromLTRB(16, 4, 4, 4),
-                      decoration: BoxDecoration(
-                        color: Colors.black54,
-                        borderRadius: BorderRadius.circular(20),
-                      ),
-                      child: Row(
-                        children: [
-                          const Text('Espacement ', style: TextStyle(color: Colors.white, fontSize: 12, fontWeight: FontWeight.bold)),
-                          const Icon(Icons.compress, color: Colors.white, size: 16),
-                          Expanded(
-                            child: Row(
-                              children: [
-                                Expanded(
-                                  child: Slider(
-                                    value: _currentEspacementRatio,
-                                    min: 0.01,
-                                    // SÉCURITÉ : Écartement max bridé à 0.70 pour confiner le dernier cercle
-                                    max: 0.70,
-                                    activeColor: Colors.orange,
-                                    onChanged: (value) {
-                                      setState(() {
-                                        _currentEspacementRatio = value;
-                                        _innerRadius = _radius * _currentEspacementRatio;
-                                        _initRingRadii(forceRecalculate: true);
-                                      });
-                                      _notifyChange();
-                                    },
-                                  ),
-                                ),
-                                const Icon(Icons.expand, color: Colors.white, size: 16),
-                              ],
-                            ),
-                          ),
-                          // CORRECTION DU BOUTON RESET : Restaure désormais le vrai profil d'usine de l'IA
-                          IconButton(
-                            icon: const Icon(Icons.refresh, color: Colors.white70, size: 20),
-                            onPressed: () {
-                              setState(() {
-                                if (_originalRingRadii != null) {
-                                  _initRingRadii(forceRecalculate: false);
-                                  if (_ringRadii.isNotEmpty) {
-                                    _currentEspacementRatio = _ringRadii.first;
-                                    _innerRadius = _radius * _currentEspacementRatio;
-                                  }
-                                } else {
-                                  _currentEspacementRatio = 0.1;
-                                  _innerRadius = _radius * _currentEspacementRatio;
-                                  _initRingRadii(forceRecalculate: true);
-                                }
-                              });
-                              _notifyChange();
-                            },
-                            tooltip: 'Réinitialiser l\'espacement',
-                            constraints: const BoxConstraints(),
-                            padding: const EdgeInsets.symmetric(horizontal: 8),
-                          ),
-                        ],
-                      ),
-                    ),
-                  ],
-                ],
-              ),
-            ),
-          ],
+          ),
         );
       },
     );
   }
 
+  // ---------------------------------------------------------------------------
+  // API publique pilotée par l'écran hôte (panneau de réglages hors de l'image)
+  // ---------------------------------------------------------------------------
+
+  /// Espacement courant (rayon du premier anneau, en fraction du rayon global).
+  double get spacingRatio => _currentEspacementRatio;
+
+  /// Mode d'espacement manuel actif ou non.
+  bool get isSpacingModeEnabled => _showEspacement;
+
+  /// Applique une nouvelle taille globale (rayon normalisé).
+  void setRadius(double value) {
+    setState(() {
+      _radius = value.clamp(minRadius, maxRadius);
+      _innerRadius = _radius * _currentEspacementRatio;
+      // Si le mode avancé n'est pas coché, on applique la taille pure sans
+      // détruire le ratio d'origine.
+      _initRingRadii(forceRecalculate: _showEspacement);
+    });
+    _notifyChange();
+  }
+
+  /// Agrandit / réduit la cible de [deltaPixels] pixels.
+  ///
+  /// La conversion utilise la plus petite dimension de [size], exactement comme
+  /// le painter, pour que le pas corresponde bien à un pixel à l'écran.
+  void adjustRadiusByPixels(double deltaPixels, Size size) {
+    final minDim = size.width < size.height ? size.width : size.height;
+    if (minDim <= 0) return;
+    setRadius(_radius + deltaPixels / minDim);
+  }
+
+  /// Active ou non le réglage manuel de l'espacement.
+  ///
+  /// À la désactivation, on restaure la configuration d'usine.
+  void setSpacingMode(bool enabled) {
+    setState(() {
+      _showEspacement = enabled;
+      if (!enabled) {
+        _initRingRadii(forceRecalculate: false);
+      }
+    });
+    _notifyChange();
+  }
+
+  /// Applique un nouvel espacement entre les anneaux.
+  void setSpacingRatio(double value) {
+    setState(() {
+      _currentEspacementRatio = value.clamp(minSpacing, maxSpacing);
+      _innerRadius = _radius * _currentEspacementRatio;
+      _initRingRadii(forceRecalculate: true);
+    });
+    _notifyChange();
+  }
+
+  /// Restaure le vrai profil d'usine détecté sur l'image.
+  void resetSpacing() {
+    setState(() {
+      if (_originalRingRadii != null) {
+        _initRingRadii(forceRecalculate: false);
+        if (_ringRadii.isNotEmpty) {
+          _currentEspacementRatio = _ringRadii.first;
+          _innerRadius = _radius * _currentEspacementRatio;
+        }
+      } else {
+        _currentEspacementRatio = 0.1;
+        _innerRadius = _radius * _currentEspacementRatio;
+        _initRingRadii(forceRecalculate: true);
+      }
+    });
+    _notifyChange();
+  }
+
   Widget buildDirectionalControls(BuildContext context, Size size) {
     return Container(
       padding: const EdgeInsets.all(8),
@@ -340,7 +283,8 @@ class TargetCalibrationState extends State<TargetCalibration> {
       child: Row(
         mainAxisSize: MainAxisSize.min,
         children: [
-          _buildSignLabel('−'),
+          // Réduit la cible d'un pixel.
+          _buildSizeButton('−', () => adjustRadiusByPixels(-1, size)),
           const SizedBox(width: 12),
           Column(
             mainAxisSize: MainAxisSize.min,
@@ -358,17 +302,27 @@ class TargetCalibrationState extends State<TargetCalibration> {
             ],
           ),
           const SizedBox(width: 12),
-          _buildSignLabel('+'),
+          // Agrandit la cible d'un pixel.
+          _buildSizeButton('+', () => adjustRadiusByPixels(1, size)),
         ],
       ),
     );
   }
 
-  // Symbole purement décoratif affiché de part et d'autre de la croix.
-  Widget _buildSignLabel(String text) {
-    return Text(
-      text,
-      style: const TextStyle(color: Colors.white54, fontSize: 28, fontWeight: FontWeight.bold),
+  /// Bouton − / + de part et d'autre de la croix : ajuste la TAILLE de la cible.
+  Widget _buildSizeButton(String sign, VoidCallback onPressed) {
+    return Container(
+      decoration: BoxDecoration(color: Colors.black87, borderRadius: BorderRadius.circular(8)),
+      child: IconButton(
+        icon: Text(
+          sign,
+          style: const TextStyle(color: Colors.white, fontSize: 24, fontWeight: FontWeight.bold),
+        ),
+        onPressed: onPressed,
+        padding: EdgeInsets.zero,
+        constraints: const BoxConstraints(minWidth: 44, minHeight: 44),
+        tooltip: sign == '+' ? 'Agrandir la cible' : 'Réduire la cible',
+      ),
     );
   }
 
@@ -407,7 +361,7 @@ class TargetCalibrationState extends State<TargetCalibration> {
   void _onScaleUpdate(ScaleUpdateDetails details, Size size) {
     setState(() {
       if (details.pointerCount == 2) {
-        _radius = (_baseRadiusBeforeScale * details.scale).clamp(0.3, 0.95);
+        _radius = (_baseRadiusBeforeScale * details.scale).clamp(minRadius, maxRadius);
         _innerRadius = _radius * _currentEspacementRatio;
         _initRingRadii(forceRecalculate: _showEspacement);
       } else if (_isDraggingCenter) {

lib/features/analysis/widgets/target_overlay.dart

@@ -1,9 +1,9 @@
 /// Overlay visuel de la cible.
 ///
-/// Dessine les anneaux de la cible, les impacts détectés, le cercle de groupement
-/// et les impacts de référence. Gère uniquement la SÉLECTION d'impacts existants
-/// (tap sur un impact). L'AJOUT d'un impact est délégué à l'écran parent pour
-/// éviter tout conflit de gestes avec le zoom/pan de l'InteractiveViewer.
+/// Dessine les anneaux de la cible, les impacts et le cercle de groupement.
+/// Gère uniquement la SÉLECTION d'impacts existants (tap sur un impact).
+/// L'AJOUT d'un impact est délégué à l'écran parent pour éviter tout conflit
+/// de gestes avec le zoom/pan de l'InteractiveViewer.
 library;
 
 import 'package:flutter/material.dart';
@@ -20,11 +20,9 @@ class TargetOverlay extends StatelessWidget {
   final int ringCount;
   final List<double>? ringRadii;
   final void Function(Shot shot)? onShotTapped;
-  final void Function(double x, double y)? onAddShot;
   final double? groupingCenterX;
   final double? groupingCenterY;
   final double? groupingDiameter;
-  final List<Shot>? referenceImpacts;
   final double zoomScale;
   final bool showRings;
 
@@ -38,11 +36,9 @@ class TargetOverlay extends StatelessWidget {
     this.ringCount = 10,
     this.ringRadii,
     this.onShotTapped,
-    this.onAddShot,
     this.groupingCenterX,
     this.groupingCenterY,
     this.groupingDiameter,
-    this.referenceImpacts,
     this.zoomScale = 1.0,
     this.showRings = false,
   });
@@ -57,7 +53,10 @@ class TargetOverlay extends StatelessWidget {
     // Désormais :
     //  - L'AJOUT d'impact est géré par le GestureDetector parent (analysis_screen).
     //  - Seule la SÉLECTION d'un impact existant est gérée ici, via des petites
-    //    zones de tap localisées (deferToChild) placées sur chaque impact.
+    //    zones de tap localisées (deferToChild) placées sur chaque impact —
+    //    et UNIQUEMENT si [onShotTapped] est fourni. Sans callback, aucune zone
+    //    de tap n'est créée : un tap pile sur un impact traverse jusqu'au parent
+    //    au lieu d'être absorbé dans le vide.
     return IgnorePointer(
       ignoring: false,
       child: CustomPaint(
@@ -72,12 +71,13 @@ class TargetOverlay extends StatelessWidget {
           groupingCenterX: groupingCenterX,
           groupingCenterY: groupingCenterY,
           groupingDiameter: groupingDiameter,
-          referenceImpacts: referenceImpacts,
           zoomScale: zoomScale,
           showRings: showRings,
         ),
         child: LayoutBuilder(
           builder: (context, constraints) {
+            final onTapped = onShotTapped;
+            if (onTapped == null) return const SizedBox.expand();
             return Stack(
               children: shots.map((shot) {
                 final x = shot.x * constraints.maxWidth;
@@ -94,7 +94,7 @@ class TargetOverlay extends StatelessWidget {
                     // Le reste de la surface reste donc disponible pour le
                     // pinch/pan de l'InteractiveViewer.
                     behavior: HitTestBehavior.deferToChild,
-                    onTap: () => onShotTapped?.call(shot),
+                    onTap: () => onTapped(shot),
                     child: Container(
                       width: tapSize,
                       height: tapSize,
@@ -127,7 +127,6 @@ class _TargetOverlayPainter extends CustomPainter {
   final double? groupingCenterX;
   final double? groupingCenterY;
   final double? groupingDiameter;
-  final List<Shot>? referenceImpacts;
   final double zoomScale;
   final bool showRings;
 
@@ -142,7 +141,6 @@ class _TargetOverlayPainter extends CustomPainter {
     this.groupingCenterX,
     this.groupingCenterY,
     this.groupingDiameter,
-    this.referenceImpacts,
     this.zoomScale = 1.0,
     this.showRings = false,
   });
@@ -163,13 +161,6 @@ class _TargetOverlayPainter extends CustomPainter {
     for (final shot in shots) {
       _drawImpact(canvas, size, shot);
     }
-
-    // Draw reference impacts (with different color)
-    if (referenceImpacts != null) {
-      for (final ref in referenceImpacts!) {
-        _drawReferenceImpact(canvas, size, ref);
-      }
-    }
   }
 
   void _drawTargetCenter(Canvas canvas, Size size) {
@@ -319,48 +310,6 @@ class _TargetOverlayPainter extends CustomPainter {
     );
   }
 
-  void _drawReferenceImpact(Canvas canvas, Size size, Shot ref) {
-    final x = ref.x * size.width;
-    final y = ref.y * size.height;
-
-    // Tailles fixes divisées par le zoom pour rester constantes à l'écran
-    final outerRadius = 12 / zoomScale;
-    final innerRadius = 10 / zoomScale;
-    final strokeWidth = 3 / zoomScale;
-    final fontSize = 12 / zoomScale;
-
-    // Draw outer circle (white outline for visibility)
-    final outlinePaint = Paint()
-      ..color = Colors.white
-      ..style = PaintingStyle.stroke
-      ..strokeWidth = strokeWidth;
-    canvas.drawCircle(Offset(x, y), outerRadius, outlinePaint);
-
-    // Draw reference marker (purple)
-    final refPaint = Paint()
-      ..color = Colors.deepPurple
-      ..style = PaintingStyle.fill;
-    canvas.drawCircle(Offset(x, y), innerRadius, refPaint);
-
-    // Draw "R" to indicate reference
-    final textPainter = TextPainter(
-      text: TextSpan(
-        text: 'R',
-        style: TextStyle(
-          color: Colors.white,
-          fontSize: fontSize,
-          fontWeight: FontWeight.bold,
-        ),
-      ),
-      textDirection: TextDirection.ltr,
-    );
-    textPainter.layout();
-    textPainter.paint(
-      canvas,
-      Offset(x - textPainter.width / 2, y - textPainter.height / 2),
-    );
-  }
-
   @override
   bool shouldRepaint(covariant _TargetOverlayPainter oldDelegate) {
     return shots != oldDelegate.shots ||
@@ -372,7 +321,6 @@ class _TargetOverlayPainter extends CustomPainter {
         groupingCenterX != oldDelegate.groupingCenterX ||
         groupingCenterY != oldDelegate.groupingCenterY ||
         groupingDiameter != oldDelegate.groupingDiameter ||
-        referenceImpacts != oldDelegate.referenceImpacts ||
         zoomScale != oldDelegate.zoomScale ||
         showRings != oldDelegate.showRings;
   }

lib/features/capture/capture_screen.dart

@@ -128,7 +128,6 @@ class _CaptureScreenState extends State<CaptureScreen>
 
   // Détection OpenCV (cible circulaire) — on garde le résultat COMPLET
   TargetDetectionResult? _targetResult; // NOUVEAU : centre + rayon de la cible
-  Timer? _detectionTimer;
   bool _isAnalyzingFrame = false;
 
   // NOUVEAU : Données IMU en temps réel
@@ -148,7 +147,6 @@ class _CaptureScreenState extends State<CaptureScreen>
   void dispose() {
     _cameraController?.dispose();
     _scanAnimationController.dispose();
-    _detectionTimer?.cancel();
     _parallelismSubscription?.cancel(); // NOUVEAU
     _parallelismService.dispose();      // NOUVEAU
     super.dispose();
@@ -300,9 +298,6 @@ class _CaptureScreenState extends State<CaptureScreen>
   // Détection OpenCV périodique (inchangée)
   // ─────────────────────────────────────────────────────────────────────────
   void _startAlignmentDetection() {
-    _detectionTimer?.cancel();
-    _detectionTimer = null;
-
     DateTime? lastAnalysis;
 
     _cameraController!.startImageStream((CameraImage cameraImage) async {
@@ -310,7 +305,9 @@ class _CaptureScreenState extends State<CaptureScreen>
       final now = DateTime.now();
       // Cadence ~1 s : assez réactif pour suivre la cible sans saturer le CPU.
       if (lastAnalysis != null &&
-          now.difference(lastAnalysis!).inMilliseconds < 1000) return;
+          now.difference(lastAnalysis!).inMilliseconds < 1000) {
+        return;
+      }
       lastAnalysis = now;
       _isAnalyzingFrame = true;
 
@@ -362,8 +359,6 @@ class _CaptureScreenState extends State<CaptureScreen>
   }
 
   void _stopAlignmentDetection() {
-    _detectionTimer?.cancel();
-    _detectionTimer = null;
     try {
       if (_cameraController != null &&
           _cameraController!.value.isStreamingImages) {
@@ -521,10 +516,10 @@ class _CaptureScreenState extends State<CaptureScreen>
               height: MediaQuery.of(context).size.width * 0.85,
               child: Stack(
                 children: [
-                  _buildCameraCorner(TopLeft: true, color: frameColor),
-                  _buildCameraCorner(TopRight: true, color: frameColor),
-                  _buildCameraCorner(BottomLeft: true, color: frameColor),
-                  _buildCameraCorner(BottomRight: true, color: frameColor),
+                  _buildCameraCorner(topLeft: true, color: frameColor),
+                  _buildCameraCorner(topRight: true, color: frameColor),
+                  _buildCameraCorner(bottomLeft: true, color: frameColor),
+                  _buildCameraCorner(bottomRight: true, color: frameColor),
                   Center(
                     child: Container(
                       width: 24,
@@ -831,32 +826,32 @@ class _CaptureScreenState extends State<CaptureScreen>
   // Coins du cadre (inchangés)
   // ─────────────────────────────────────────────────────────────────────────
   Widget _buildCameraCorner({
-    bool TopLeft = false,
-    bool TopRight = false,
-    bool BottomLeft = false,
-    bool BottomRight = false,
+    bool topLeft = false,
+    bool topRight = false,
+    bool bottomLeft = false,
+    bool bottomRight = false,
     Color color = const Color(0xFF00FF00),
   }) {
     return Positioned(
-      top: (TopLeft || TopRight) ? 10 : null,
-      bottom: (BottomLeft || BottomRight) ? 10 : null,
-      left: (TopLeft || BottomLeft) ? 10 : null,
-      right: (TopRight || BottomRight) ? 10 : null,
+      top: (topLeft || topRight) ? 10 : null,
+      bottom: (bottomLeft || bottomRight) ? 10 : null,
+      left: (topLeft || bottomLeft) ? 10 : null,
+      right: (topRight || bottomRight) ? 10 : null,
       child: Container(
         width: 20,
         height: 20,
         decoration: BoxDecoration(
           border: Border(
-            top: (TopLeft || TopRight)
+            top: (topLeft || topRight)
                 ? BorderSide(color: color, width: 4)
                 : BorderSide.none,
-            bottom: (BottomLeft || BottomRight)
+            bottom: (bottomLeft || bottomRight)
                 ? BorderSide(color: color, width: 4)
                 : BorderSide.none,
-            left: (TopLeft || BottomLeft)
+            left: (topLeft || bottomLeft)
                 ? BorderSide(color: color, width: 4)
                 : BorderSide.none,
-            right: (TopRight || BottomRight)
+            right: (topRight || bottomRight)
                 ? BorderSide(color: color, width: 4)
                 : BorderSide.none,
           ),

lib/features/crop/crop_screen.dart

@@ -27,6 +27,11 @@ class CropScreen extends StatefulWidget {
 }
 
 class _CropScreenState extends State<CropScreen> {
+  // Bornes et pas de la rotation, partagés par la jauge et les boutons − / +.
+  static const double _minRotation = -15.0;
+  static const double _maxRotation = 15.0;
+  static const double _rotationStep = 0.1;
+
   final ImageCropService _cropService = ImageCropService();
 
   // États de transformation
@@ -113,8 +118,8 @@ class _CropScreenState extends State<CropScreen> {
                     const SizedBox(width: 8),
                     Flexible(
                       child: Text(
-                        'Alignez et pivotez la cible sur la croix',
-                        style: TextStyle(color: Colors.white.withOpacity(0.8), fontSize: 14, fontWeight: FontWeight.w500),
+                        'Zoomer au maximum puis aligner votre cible',
+                        style: TextStyle(color: Colors.white.withValues(alpha: 0.8), fontSize: 14, fontWeight: FontWeight.w500),
                       ),
                     ),
                   ],
@@ -122,7 +127,7 @@ class _CropScreenState extends State<CropScreen> {
                 const SizedBox(height: 4),
                 Text(
                   'Glissez à un doigt pour déplacer, pincez pour zoomer',
-                  style: TextStyle(color: Colors.white.withOpacity(0.5), fontSize: 12),
+                  style: TextStyle(color: Colors.white.withValues(alpha: 0.5), fontSize: 12),
                 ),
               ],
             ),
@@ -155,7 +160,8 @@ class _CropScreenState extends State<CropScreen> {
 
           const SizedBox(height: 8),
 
-          // CROIX DIRECTIONNELLE — déplace la photo pixel par pixel.
+          // CROIX DIRECTIONNELLE — déplace la photo pixel par pixel,
+          // encadrée par les deux boutons de rotation fine.
           _buildDirectionalPad(),
 
           const SizedBox(height: 16),
@@ -180,12 +186,13 @@ class _CropScreenState extends State<CropScreen> {
                 ),
                 Row(
                   children: [
-                    const Icon(Icons.rotate_left, color: Colors.white38, size: 20),
+                    // Les icônes de sens de rotation ont rejoint les boutons − / +
+                    // de la croix directionnelle.
                     Expanded(
                       child: Slider(
                         value: _rotation,
-                        min: -15.0,
-                        max: 15.0,
+                        min: _minRotation,
+                        max: _maxRotation,
                         divisions: 300,
                         label: '${_rotation.toStringAsFixed(1)}°',
                         activeColor: const Color(0xFF1A73E8),
@@ -197,7 +204,6 @@ class _CropScreenState extends State<CropScreen> {
                         },
                       ),
                     ),
-                    const Icon(Icons.rotate_right, color: Colors.white38, size: 20),
                     const SizedBox(width: 4),
                     IconButton(
                       icon: const Icon(Icons.restart_alt, color: Colors.white54, size: 20),
@@ -274,7 +280,7 @@ class _CropScreenState extends State<CropScreen> {
                   child: Transform(
                     transform: Matrix4.identity()
                       ..setTranslationRaw(_offset.dx, _offset.dy, 0)
-                      ..scale(_scale, _scale)
+                      ..scaleByDouble(_scale, _scale, _scale, 1.0)
                       ..rotateZ(_rotation * (math.pi / 180)),
                     alignment: Alignment.center,
                     child: Image.file(
@@ -296,14 +302,14 @@ class _CropScreenState extends State<CropScreen> {
                         child: Container(
                           width: double.infinity,
                           height: 1.5,
-                          color: const Color(0xFF00FF00).withOpacity(0.6),
+                          color: const Color(0xFF00FF00).withValues(alpha: 0.6),
                         ),
                       ),
                       Center(
                         child: Container(
                           width: 1.5,
                           height: double.infinity,
-                          color: const Color(0xFF00FF00).withOpacity(0.6),
+                          color: const Color(0xFF00FF00).withValues(alpha: 0.6),
                         ),
                       ),
                     ],
@@ -363,12 +369,18 @@ class _CropScreenState extends State<CropScreen> {
   }
 
   // Croix directionnelle compacte pour déplacer la photo pixel par pixel.
-  // Les symboles « − » et « + » de part et d'autre sont purement décoratifs.
+  // Les boutons « − » et « + » de part et d'autre pivotent l'image de 0,1°.
   Widget _buildDirectionalPad() {
     return Row(
       mainAxisAlignment: MainAxisAlignment.center,
       children: [
-        _buildCropSignLabel('−'),
+        _buildRotationButton(
+          icon: Icons.rotate_left,
+          sign: '−',
+          iconFirst: true,
+          tooltip: 'Pivoter vers la gauche',
+          onPressed: () => _rotateBy(-_rotationStep),
+        ),
         const SizedBox(width: 10),
         Column(
           mainAxisSize: MainAxisSize.min,
@@ -386,7 +398,13 @@ class _CropScreenState extends State<CropScreen> {
           ],
         ),
         const SizedBox(width: 10),
-        _buildCropSignLabel('+'),
+        _buildRotationButton(
+          icon: Icons.rotate_right,
+          sign: '+',
+          iconFirst: false,
+          tooltip: 'Pivoter vers la droite',
+          onPressed: () => _rotateBy(_rotationStep),
+        ),
       ],
     );
   }
@@ -404,10 +422,40 @@ class _CropScreenState extends State<CropScreen> {
     );
   }
 
-  Widget _buildCropSignLabel(String text) {
-    return Text(
-      text,
-      style: const TextStyle(color: Colors.white54, fontSize: 24, fontWeight: FontWeight.bold),
+  // Bouton de rotation : l'icône de sens est accolée au signe − / +.
+  Widget _buildRotationButton({
+    required IconData icon,
+    required String sign,
+    required bool iconFirst,
+    required String tooltip,
+    required VoidCallback onPressed,
+  }) {
+    final content = [
+      Icon(icon, color: Colors.white70, size: 20),
+      const SizedBox(width: 4),
+      Text(
+        sign,
+        style: const TextStyle(color: Colors.white, fontSize: 22, fontWeight: FontWeight.bold),
+      ),
+    ];
+
+    return Tooltip(
+      message: tooltip,
+      child: Material(
+        color: Colors.black54,
+        borderRadius: BorderRadius.circular(6),
+        child: InkWell(
+          onTap: onPressed,
+          borderRadius: BorderRadius.circular(6),
+          child: Padding(
+            padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 8),
+            child: Row(
+              mainAxisSize: MainAxisSize.min,
+              children: iconFirst ? content : content.reversed.toList(),
+            ),
+          ),
+        ),
+      ),
     );
   }
 
@@ -417,6 +465,17 @@ class _CropScreenState extends State<CropScreen> {
     });
   }
 
+  /// Pivote l'image de [delta] degrés, dans les mêmes bornes que la jauge.
+  ///
+  /// La valeur est arrondie au dixième pour rester calée sur les crans de la
+  /// jauge (300 divisions sur 30°) et sur l'affichage.
+  void _rotateBy(double delta) {
+    setState(() {
+      final value = (_rotation + delta).clamp(_minRotation, _maxRotation);
+      _rotation = (value * 10).roundToDouble() / 10;
+    });
+  }
+
   void _onScaleStart(ScaleStartDetails details) {
     _baseScale = _scale;
     _startFocalPoint = details.focalPoint;

lib/features/garage/weapon_detail_screen.dart

@@ -52,7 +52,7 @@ class _WeaponDetailScreenState extends State<WeaponDetailScreen> {
         actions: [
           IconButton(
             icon: const Icon(Icons.edit),
-            onPressed: () => _showEditWeaponDialog(context),
+            onPressed: _showEditWeaponDialog,
           ),
         ],
       ),
@@ -74,7 +74,7 @@ class _WeaponDetailScreenState extends State<WeaponDetailScreen> {
               ),
             ),
       floatingActionButton: FloatingActionButton.extended(
-        onPressed: () => _showAddMaintenanceDialog(context),
+        onPressed: _showAddMaintenanceDialog,
         label: const Text('Entretien'),
         icon: const Icon(Icons.build),
       ),
@@ -166,7 +166,7 @@ class _WeaponDetailScreenState extends State<WeaponDetailScreen> {
                     padding: const EdgeInsets.all(8),
                     minimumSize: const Size(36, 36),
                   ),
-                  onPressed: () => _showEditAccessoriesDialog(context),
+                  onPressed: _showEditAccessoriesDialog,
                 ),
               ],
             ),
@@ -223,7 +223,7 @@ class _WeaponDetailScreenState extends State<WeaponDetailScreen> {
                   title: Text(entry.type.displayName),
                   subtitle: Text(entry.description),
                   trailing: Text(DateFormat('dd/MM/yy').format(entry.date), style: const TextStyle(fontSize: 12)),
-                  onLongPress: () => _confirmDeleteMaintenance(context, entry),
+                  onLongPress: () => _confirmDeleteMaintenance(entry),
                 ),
               );
             },
@@ -279,7 +279,9 @@ class _WeaponDetailScreenState extends State<WeaponDetailScreen> {
     );
   }
 
-  void _showEditWeaponDialog(BuildContext context) async {
+  void _showEditWeaponDialog() async {
+    // Capturé AVANT l'await : plus aucun usage du context après le dialogue.
+    final repository = context.read<SessionRepository>();
     final nameController = TextEditingController(text: _weapon.name);
     final caliberController = TextEditingController(text: _weapon.caliber);
     final magCountController = TextEditingController(text: _weapon.magazineCount.toString());
@@ -309,7 +311,7 @@ class _WeaponDetailScreenState extends State<WeaponDetailScreen> {
                   decoration: const InputDecoration(labelText: 'Surnom / Custom Name', hintText: 'ex: Mon Glock de Compète'),
                 )),
                 DropdownButtonFormField<WeaponType>(
-                  value: selectedType,
+                  initialValue: selectedType,
                   decoration: const InputDecoration(labelText: 'Type'),
                   items: WeaponType.values.map((t) => DropdownMenuItem(value: t, child: Text(t.displayName))).toList(),
                   onChanged: (v) => setState(() => selectedType = v!),
@@ -382,9 +384,9 @@ class _WeaponDetailScreenState extends State<WeaponDetailScreen> {
         trigger: triggerController.text.isEmpty ? null : triggerController.text,
         customName: customNameController.text.isEmpty ? null : customNameController.text,
       );
-      
-      final repository = context.read<SessionRepository>();
+
       await repository.updateWeapon(updatedWeapon);
+      if (!mounted) return;
       setState(() {
         _weapon = updatedWeapon;
       });
@@ -395,7 +397,9 @@ class _WeaponDetailScreenState extends State<WeaponDetailScreen> {
   // fortement des accessoires, on ne modifie PAS l'arme existante : on crée une
   // nouvelle arme (même modèle, accessoires différents) dans l'armurerie afin de
   // pouvoir comparer les scores selon la configuration utilisée.
-  void _showEditAccessoriesDialog(BuildContext context) async {
+  void _showEditAccessoriesDialog() async {
+    // Capturé AVANT l'await : plus aucun usage du context après le dialogue.
+    final repository = context.read<SessionRepository>();
     final opticController = TextEditingController(text: _weapon.optic);
     final silencerController = TextEditingController(text: _weapon.silencer);
     final triggerController = TextEditingController(text: _weapon.trigger);
@@ -444,7 +448,7 @@ class _WeaponDetailScreenState extends State<WeaponDetailScreen> {
       ),
     );
 
-    if (result != true) return;
+    if (result != true || !mounted) return;
 
     final newOptic = opticController.text.isEmpty ? null : opticController.text;
     final newSilencer = silencerController.text.isEmpty ? null : silencerController.text;
@@ -456,11 +460,9 @@ class _WeaponDetailScreenState extends State<WeaponDetailScreen> {
         newSilencer == _weapon.silencer &&
         newTrigger == _weapon.trigger;
     if (unchanged) {
-      if (mounted) {
-        ScaffoldMessenger.of(context).showSnackBar(
-          const SnackBar(content: Text('Aucun accessoire modifié, aucune configuration créée.')),
-        );
-      }
+      ScaffoldMessenger.of(context).showSnackBar(
+        const SnackBar(content: Text('Aucun accessoire modifié, aucune configuration créée.')),
+      );
       return;
     }
 
@@ -472,7 +474,6 @@ class _WeaponDetailScreenState extends State<WeaponDetailScreen> {
       newCustomName = accessories.isEmpty ? null : '${_weapon.name} ($accessories)';
     }
 
-    final repository = context.read<SessionRepository>();
     final newWeapon = await repository.addWeapon(
       name: _weapon.name,
       type: _weapon.type,
@@ -497,7 +498,9 @@ class _WeaponDetailScreenState extends State<WeaponDetailScreen> {
     );
   }
 
-  void _showAddMaintenanceDialog(BuildContext context) async {
+  void _showAddMaintenanceDialog() async {
+    // Capturé AVANT l'await : plus aucun usage du context après le dialogue.
+    final repository = context.read<SessionRepository>();
     final descController = TextEditingController();
     MaintenanceType selectedType = MaintenanceType.cleaning;
     DateTime selectedDate = DateTime.now();
@@ -511,7 +514,7 @@ class _WeaponDetailScreenState extends State<WeaponDetailScreen> {
             mainAxisSize: MainAxisSize.min,
             children: [
               DropdownButtonFormField<MaintenanceType>(
-                value: selectedType,
+                initialValue: selectedType,
                 decoration: const InputDecoration(labelText: 'Type d\'intervention'),
                 items: MaintenanceType.values.map((t) => DropdownMenuItem(value: t, child: Text(t.displayName))).toList(),
                 onChanged: (v) => setState(() => selectedType = v!),
@@ -553,7 +556,6 @@ class _WeaponDetailScreenState extends State<WeaponDetailScreen> {
     );
 
     if (result == true && descController.text.isNotEmpty) {
-      final repository = context.read<SessionRepository>();
       await repository.addMaintenanceEntry(
         weaponId: _weapon.id,
         type: selectedType,
@@ -561,11 +563,14 @@ class _WeaponDetailScreenState extends State<WeaponDetailScreen> {
         roundsSinceLast: _totalRounds,
         date: selectedDate,
       );
+      if (!mounted) return;
       _loadData();
     }
   }
 
-  void _confirmDeleteMaintenance(BuildContext context, MaintenanceEntry entry) async {
+  void _confirmDeleteMaintenance(MaintenanceEntry entry) async {
+    // Capturé AVANT l'await : plus aucun usage du context après le dialogue.
+    final repository = context.read<SessionRepository>();
     final confirmed = await showDialog<bool>(
       context: context,
       builder: (context) => AlertDialog(
@@ -582,8 +587,8 @@ class _WeaponDetailScreenState extends State<WeaponDetailScreen> {
     );
 
     if (confirmed == true) {
-      final repository = context.read<SessionRepository>();
       await repository.deleteMaintenanceEntry(entry.id);
+      if (!mounted) return;
       _loadData();
     }
   }

lib/features/garage/weapon_list_screen.dart

@@ -7,7 +7,12 @@ import '../../data/repositories/session_repository.dart';
 import 'weapon_detail_screen.dart';
 
 class WeaponListScreen extends StatefulWidget {
-  const WeaponListScreen({super.key});
+  /// Incrémenté par la navigation à chaque ouverture de l'onglet Armurerie
+  /// (l'écran est gardé vivant par l'IndexedStack et ne se rafraîchit pas
+  /// seul : sans ça, un import de sauvegarde resterait invisible).
+  final int refreshTick;
+
+  const WeaponListScreen({super.key, this.refreshTick = 0});
 
   @override
   State<WeaponListScreen> createState() => _WeaponListScreenState();
@@ -23,6 +28,14 @@ class _WeaponListScreenState extends State<WeaponListScreen> {
     _loadWeapons();
   }
 
+  @override
+  void didUpdateWidget(WeaponListScreen oldWidget) {
+    super.didUpdateWidget(oldWidget);
+    if (oldWidget.refreshTick != widget.refreshTick) {
+      _loadWeapons();
+    }
+  }
+
   Future<void> _loadWeapons() async {
     final repository = context.read<SessionRepository>();
     final weapons = await repository.getWeapons();
@@ -46,7 +59,7 @@ class _WeaponListScreenState extends State<WeaponListScreen> {
               ? _buildEmptyState()
               : _buildWeaponList(),
       floatingActionButton: FloatingActionButton(
-        onPressed: () => _showAddWeaponDialog(context),
+        onPressed: _showAddWeaponDialog,
         child: const Icon(Icons.add),
       ),
     );
@@ -62,7 +75,7 @@ class _WeaponListScreenState extends State<WeaponListScreen> {
           const Text('Aucune arme enregistrée'),
           const SizedBox(height: 24),
           ElevatedButton(
-            onPressed: () => _showAddWeaponDialog(context),
+            onPressed: _showAddWeaponDialog,
             child: const Text('Ajouter ma première arme'),
           ),
         ],
@@ -88,7 +101,7 @@ class _WeaponListScreenState extends State<WeaponListScreen> {
               );
               _loadWeapons(); // Reload in case it was edited or maintenance was added
             },
-            onLongPress: () => _confirmDelete(context, weapon),
+            onLongPress: () => _confirmDelete(weapon),
             child: Padding(
               // La hauteur du cadre s'adapte automatiquement à la liste d'accessoires.
               padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 12),
@@ -179,7 +192,9 @@ class _WeaponListScreenState extends State<WeaponListScreen> {
     }).toList();
   }
 
-  void _showAddWeaponDialog(BuildContext context) async {
+  void _showAddWeaponDialog() async {
+    // Capturé AVANT l'await : plus aucun usage du context après le dialogue.
+    final repository = context.read<SessionRepository>();
     final nameController = TextEditingController();
     final caliberController = TextEditingController();
     final magCountController = TextEditingController(text: '2');
@@ -200,7 +215,7 @@ class _WeaponListScreenState extends State<WeaponListScreen> {
                   decoration: const InputDecoration(labelText: 'Nom de l\'arme', hintText: 'ex: Glock 17'),
                 ),
                 DropdownButtonFormField<WeaponType>(
-                  value: selectedType,
+                  initialValue: selectedType,
                   decoration: const InputDecoration(labelText: 'Type'),
                   items: WeaponType.values.map((t) => DropdownMenuItem(value: t, child: Text(t.displayName))).toList(),
                   onChanged: (v) => setState(() => selectedType = v!),
@@ -240,7 +255,6 @@ class _WeaponListScreenState extends State<WeaponListScreen> {
     );
 
     if (result == true && nameController.text.isNotEmpty) {
-      final repository = context.read<SessionRepository>();
       await repository.addWeapon(
         name: nameController.text,
         type: selectedType,
@@ -248,11 +262,14 @@ class _WeaponListScreenState extends State<WeaponListScreen> {
         magazineCount: int.tryParse(magCountController.text) ?? 1,
         magazineCapacity: int.tryParse(magCapController.text) ?? 10,
       );
+      if (!mounted) return;
       _loadWeapons();
     }
   }
 
-  void _confirmDelete(BuildContext context, Weapon weapon) async {
+  void _confirmDelete(Weapon weapon) async {
+    // Capturé AVANT l'await : plus aucun usage du context après le dialogue.
+    final repository = context.read<SessionRepository>();
     final confirmed = await showDialog<bool>(
       context: context,
       builder: (context) => AlertDialog(
@@ -269,8 +286,8 @@ class _WeaponListScreenState extends State<WeaponListScreen> {
     );
 
     if (confirmed == true) {
-      final repository = context.read<SessionRepository>();
       await repository.deleteWeapon(weapon.id);
+      if (!mounted) return;
       _loadWeapons();
     }
   }

lib/features/history/history_screen.dart

@@ -11,7 +11,13 @@ import 'widgets/session_list_item.dart';
 import 'widgets/history_chart.dart';
 
 class HistoryScreen extends StatefulWidget {
-  const HistoryScreen({super.key});
+  /// Incrémenté par la navigation à chaque ouverture de l'onglet Historique,
+  /// pour forcer un rechargement des sessions (l'écran est gardé vivant par un
+  /// IndexedStack, sinon une session tout juste clôturée n'apparaîtrait pas
+  /// tant qu'on ne tire pas manuellement pour rafraîchir).
+  final int refreshTick;
+
+  const HistoryScreen({super.key, this.refreshTick = 0});
 
   @override
   State<HistoryScreen> createState() => _HistoryScreenState();
@@ -31,6 +37,16 @@ class _HistoryScreenState extends State<HistoryScreen> {
     _loadSessions();
   }
 
+  @override
+  void didUpdateWidget(HistoryScreen oldWidget) {
+    super.didUpdateWidget(oldWidget);
+    // L'onglet vient d'être ré-ouvert : on recharge pour afficher les sessions
+    // récemment clôturées sans avoir à tirer manuellement pour rafraîchir.
+    if (oldWidget.refreshTick != widget.refreshTick) {
+      _loadSessions();
+    }
+  }
+
   Future<void> _loadSessions() async {
     if (!mounted) return;
     setState(() => _isLoading = true);
@@ -43,6 +59,14 @@ class _HistoryScreenState extends State<HistoryScreen> {
         setState(() {
           _sessions = sessions;
 
+          // --- FILTRAGE PAR TYPE DE CIBLE ---
+          // Une session est retenue si au moins une de ses cibles est du type choisi.
+          if (_filterType != null) {
+            _sessions = _sessions
+                .where((s) => s.analyses.any((a) => a.targetType == _filterType))
+                .toList();
+          }
+
           // --- LOGIQUE DE FILTRAGE PAR PÉRIODE ---
           if (_selectedDateRange != null) {
             _sessions = _sessions.where((s) {
@@ -103,7 +127,7 @@ class _HistoryScreenState extends State<HistoryScreen> {
               onSurface: Colors.black87,        // Texte des dates (Noir sur Blanc)
               secondary: AppTheme.primaryColor,
             ),
-            dialogBackgroundColor: Colors.white,
+            dialogTheme: const DialogThemeData(backgroundColor: Colors.white),
             textButtonTheme: TextButtonThemeData(
               style: TextButton.styleFrom(foregroundColor: AppTheme.primaryColor),
             ),
@@ -125,17 +149,29 @@ class _HistoryScreenState extends State<HistoryScreen> {
       appBar: AppBar(
         title: const Text('Historique'),
         actions: [
-          PopupMenuButton<TargetType?>(
-            icon: const Icon(Icons.filter_list),
-            onSelected: (type) {
-              setState(() => _filterType = type);
+          // NOTE : on passe par un String sentinelle ('all') car un
+          // PopupMenuItem avec value null ne déclenche jamais onSelected
+          // (Flutter l'interprète comme une annulation du menu).
+          PopupMenuButton<String>(
+            icon: Icon(
+              Icons.filter_list,
+              // Icône colorée quand un filtre est actif, pour le rendre visible.
+              color: _filterType != null ? AppTheme.primaryColor : null,
+            ),
+            onSelected: (value) {
+              setState(() {
+                _filterType =
+                    value == 'all' ? null : TargetType.fromString(value);
+              });
               _loadSessions();
             },
             itemBuilder: (context) => [
-              const PopupMenuItem(value: null, child: Text('Tous')),
+              const PopupMenuItem(value: 'all', child: Text('Tous')),
               ...TargetType.values.map(
-                (type) =>
-                    PopupMenuItem(value: type, child: Text(type.displayName)),
+                (type) => PopupMenuItem(
+                  value: type.name,
+                  child: Text(type.displayName),
+                ),
               ),
             ],
           ),

lib/features/home/home_screen.dart

@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
+import '../../main_navigation_holder.dart';
 import '../../core/constants/app_constants.dart';
 import '../../core/theme/app_theme.dart';
 import '../../data/repositories/session_repository.dart';
@@ -14,7 +15,12 @@ import '../session/session_provider.dart';
 import 'widgets/stats_card.dart';
 
 class HomeScreen extends StatefulWidget {
-  const HomeScreen({super.key});
+  /// Incrémenté par la navigation à chaque ouverture de l'onglet Accueil
+  /// (l'écran est gardé vivant par l'IndexedStack : sans ça, un import de
+  /// sauvegarde resterait invisible sur le dashboard).
+  final int refreshTick;
+
+  const HomeScreen({super.key, this.refreshTick = 0});
 
   @override
   State<HomeScreen> createState() => _HomeScreenState();
@@ -34,6 +40,14 @@ class _HomeScreenState extends State<HomeScreen> {
     _loadStats();
   }
 
+  @override
+  void didUpdateWidget(HomeScreen oldWidget) {
+    super.didUpdateWidget(oldWidget);
+    if (oldWidget.refreshTick != widget.refreshTick) {
+      _loadStats();
+    }
+  }
+
   @override
   void didChangeDependencies() {
     super.didChangeDependencies();
@@ -230,6 +244,8 @@ class _HomeScreenState extends State<HomeScreen> {
                               backgroundColor: AppTheme.successColor,
                             ),
                           );
+                          // Fin de session : on bascule sur les statistiques.
+                          openMainTab(mainTabStats);
                         },
                         child: const Text('TERMINER', style: TextStyle(color: Colors.redAccent)),
                       ),
@@ -339,7 +355,7 @@ class _HomeScreenState extends State<HomeScreen> {
             Expanded(
               child: StatsCard(
                 icon: Icons.emoji_events,
-                title: 'Meilleur',
+                title: 'Meilleur score',
                 value: '${_stats!['bestScore']}',
                 color: AppTheme.successColor,
               ),

lib/features/session/session_setup_screen.dart

@@ -168,7 +168,7 @@ class _SessionSetupScreenState extends State<SessionSetupScreen> {
                 Column(
                   children: [
                     DropdownButtonFormField<Weapon>(
-                      value: _selectedWeapon,
+                      initialValue: _selectedWeapon,
                       decoration: InputDecoration(
                         labelText: 'Sélectionner une arme',
                         prefixIcon: const Icon(Icons.shield),

lib/features/settings/settings_screen.dart

@@ -67,7 +67,7 @@ class _SettingsScreenState extends State<SettingsScreen> {
         if (mounted) setState(() => _isLoadingStats = false);
       }
     } catch (e) {
-      print('Erreur lors du chargement des statistiques: $e');
+      debugPrint('Erreur lors du chargement des statistiques: $e');
       if (mounted) setState(() => _isLoadingStats = false);
     }
   }
@@ -374,7 +374,7 @@ class _SettingsScreenState extends State<SettingsScreen> {
               subtitle: const Text('Aidez-nous à améliorer la détection tout en gagnant des avantages', style: TextStyle(fontSize: 12)),
               secondary: const Icon(Icons.psychology, color: AppTheme.textPrimary),
               value: _isUploadEnabled,
-              activeColor: AppTheme.primaryColor,
+              activeThumbColor: AppTheme.primaryColor,
               shape: RoundedRectangleBorder(
                 borderRadius: BorderRadius.circular(12.0),
                 side: BorderSide(color: Colors.grey.withAlpha(50), width: 1),

lib/features/statistics/statistics_screen.dart

@@ -1,17 +1,27 @@
+import 'dart:io';
 import 'dart:math' as math;
 import 'dart:ui' as ui;
+import 'package:file_selector/file_selector.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 import 'package:fl_chart/fl_chart.dart'; // La librairie pour les courbes
+import 'package:path/path.dart' as p;
+import 'package:share_plus/share_plus.dart';
 import '../../core/widgets/metric_info_button.dart';
 import '../../data/models/session.dart';
 import '../../data/repositories/session_repository.dart';
+import '../../services/backup_service.dart';
 import '../../services/statistics_service.dart';
 
 class StatisticsScreen extends StatefulWidget {
   final Session? singleSession;
 
-  const StatisticsScreen({super.key, this.singleSession});
+  /// Incrémenté par la navigation à chaque fois que l'onglet Stats est ouvert,
+  /// pour forcer un rechargement des données (l'écran est gardé vivant par un
+  /// IndexedStack, sinon les filtres arme/distance resteraient périmés).
+  final int refreshTick;
+
+  const StatisticsScreen({super.key, this.singleSession, this.refreshTick = 0});
 
   @override
   State<StatisticsScreen> createState() => _StatisticsScreenState();
@@ -19,7 +29,7 @@ class StatisticsScreen extends StatefulWidget {
 
 class _StatisticsScreenState extends State<StatisticsScreen> {
   final StatisticsService _statisticsService = StatisticsService();
-  StatsPeriod _selectedPeriod = StatsPeriod.all;
+  final StatsPeriod _selectedPeriod = StatsPeriod.all;
   SessionStatistics? _statistics;
   bool _isLoading = true;
   List<Session> _allSessions = [];
@@ -38,12 +48,26 @@ class _StatisticsScreenState extends State<StatisticsScreen> {
   bool _showingB = false; // false = on affiche A, true = on affiche B
   bool get _compareMode => _compareA != null && _compareB != null;
 
+  // --- Sauvegarde (export/import JSON) ---
+  bool _isBackupBusy = false;
+  final GlobalKey _exportButtonKey = GlobalKey();
+
   @override
   void initState() {
     super.initState();
     WidgetsBinding.instance.addPostFrameCallback((_) => _loadStatistics());
   }
 
+  @override
+  void didUpdateWidget(StatisticsScreen oldWidget) {
+    super.didUpdateWidget(oldWidget);
+    // L'onglet vient d'être ré-ouvert : on recharge pour rafraîchir les listes
+    // de filtres (armes/distances) et les stats avec les nouvelles sessions.
+    if (oldWidget.refreshTick != widget.refreshTick) {
+      _loadStatistics();
+    }
+  }
+
   Future<void> _loadStatistics() async {
     if (!mounted) return;
     setState(() => _isLoading = true);
@@ -217,51 +241,64 @@ class _StatisticsScreenState extends State<StatisticsScreen> {
       ),
       body: _isLoading
           ? const Center(child: CircularProgressIndicator())
-          : RefreshIndicator(
-              onRefresh: _loadStatistics,
-              child: SingleChildScrollView(
-                physics: const AlwaysScrollableScrollPhysics(),
-                padding: const EdgeInsets.all(16),
-              child: Column(
-                children: [
-                  // 1. FILTRES (Arme et Distance)
-                  Row(
-                    children: [
-                      Expanded(
-                        child: _buildDropdown(
-                          'Arme utilisée', 
-                          _selectedWeapon, 
-                          _availableWeapons,
-                          (val) {
-                            setState(() {
-                              _selectedWeapon = val!;
-                              _calculateStats();
-                            });
-                          },
+          : Column(
+              children: [
+                // HEADER COLLANT : filtres + comparateur toujours visibles
+                Material(
+                  elevation: 2,
+                  color: Theme.of(context).scaffoldBackgroundColor,
+                  child: Padding(
+                    padding: const EdgeInsets.fromLTRB(16, 16, 16, 12),
+                    child: Column(
+                      children: [
+                        // 1. FILTRES (Arme et Distance)
+                        Row(
+                          children: [
+                            Expanded(
+                              child: _buildDropdown(
+                                'Arme utilisée',
+                                _selectedWeapon,
+                                _availableWeapons,
+                                (val) {
+                                  setState(() {
+                                    _selectedWeapon = val!;
+                                    _calculateStats();
+                                  });
+                                },
+                              ),
+                            ),
+                            const SizedBox(width: 12),
+                            Expanded(
+                              child: _buildDropdown(
+                                'Distance',
+                                _selectedDistance,
+                                _availableDistances,
+                                (val) {
+                                  setState(() {
+                                    _selectedDistance = val!;
+                                    _calculateStats();
+                                  });
+                                },
+                              ),
+                            ),
+                          ],
                         ),
-                      ),
-                      const SizedBox(width: 12),
-                      Expanded(
-                        child: _buildDropdown(
-                          'Distance', 
-                          _selectedDistance, 
-                          _availableDistances,
-                          (val) {
-                            setState(() {
-                              _selectedDistance = val!;
-                              _calculateStats();
-                            });
-                          },
-                        ),
-                      ),
-                    ],
+                        const SizedBox(height: 12),
+
+                        // 1bis. COMPARATEUR DE SESSIONS
+                        _buildComparator(),
+                      ],
+                    ),
                   ),
-                  const SizedBox(height: 16),
-
-                  // 1bis. COMPARATEUR DE SESSIONS
-                  _buildComparator(),
-                  const SizedBox(height: 20),
-
+                ),
+                Expanded(
+                  child: RefreshIndicator(
+                    onRefresh: _loadStatistics,
+                    child: SingleChildScrollView(
+                      physics: const AlwaysScrollableScrollPhysics(),
+                      padding: const EdgeInsets.all(16),
+                      child: Column(
+                        children: [
                   // 2. DONNÉES RAPIDES (Tirs et Sessions)
                   Row(
                     children: [
@@ -346,11 +383,19 @@ class _StatisticsScreenState extends State<StatisticsScreen> {
                       _buildBiasWarning(),
                   ],
 
+                  const SizedBox(height: 25),
+
+                  // 5. SAUVEGARDE : export/import de toutes les données
+                  _buildBackupSection(),
+
                   const SizedBox(height: 30),
-                ],
-              ),
+                        ],
+                      ),
+                    ),
+                  ),
+                ),
+              ],
             ),
-          ),
     );
   }
 
@@ -851,6 +896,263 @@ class _StatisticsScreenState extends State<StatisticsScreen> {
       ),
     );
   }
+
+  // --- SAUVEGARDE : EXPORT / IMPORT JSON ---
+
+  Widget _buildBackupSection() {
+    final theme = Theme.of(context);
+    return Container(
+      padding: const EdgeInsets.all(16),
+      decoration: BoxDecoration(
+        color: theme.colorScheme.surfaceContainerHighest.withValues(alpha: 0.5),
+        borderRadius: BorderRadius.circular(12),
+      ),
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          Row(
+            children: [
+              Icon(Icons.save_alt, color: theme.textTheme.titleMedium?.color, size: 20),
+              const SizedBox(width: 8),
+              Text(
+                'Sauvegarde',
+                style: TextStyle(
+                  color: theme.textTheme.titleMedium?.color,
+                  fontSize: 16,
+                  fontWeight: FontWeight.bold,
+                ),
+              ),
+            ],
+          ),
+          const SizedBox(height: 4),
+          Text(
+            'Exporte toutes tes sessions, tes stats et ton armurerie dans un '
+            'fichier JSON, à envoyer où tu veux. L\'import fusionne le fichier '
+            'avec tes données actuelles (rien n\'est effacé).',
+            style: TextStyle(
+              color: theme.textTheme.bodySmall?.color?.withValues(alpha: 0.6),
+              fontSize: 12,
+            ),
+          ),
+          const SizedBox(height: 16),
+          Row(
+            children: [
+              Expanded(
+                child: ElevatedButton.icon(
+                  key: _exportButtonKey,
+                  onPressed: _isBackupBusy ? null : _exportBackup,
+                  icon: const Icon(Icons.ios_share, size: 18),
+                  label: const Text('Exporter'),
+                  style: ElevatedButton.styleFrom(
+                    padding: const EdgeInsets.symmetric(vertical: 14),
+                  ),
+                ),
+              ),
+              const SizedBox(width: 12),
+              Expanded(
+                child: OutlinedButton.icon(
+                  onPressed: _isBackupBusy ? null : _importBackup,
+                  icon: const Icon(Icons.file_download_outlined, size: 18),
+                  label: const Text('Importer'),
+                  style: OutlinedButton.styleFrom(
+                    padding: const EdgeInsets.symmetric(vertical: 14),
+                  ),
+                ),
+              ),
+            ],
+          ),
+          if (_isBackupBusy) ...[
+            const SizedBox(height: 12),
+            const LinearProgressIndicator(minHeight: 2),
+          ],
+        ],
+      ),
+    );
+  }
+
+  BackupService _backupService() =>
+      BackupService(repository: context.read<SessionRepository>());
+
+  Future<void> _exportBackup() async {
+    final includeImages = await _askIncludeImages();
+    if (includeImages == null || !mounted) return;
+
+    setState(() => _isBackupBusy = true);
+    try {
+      final file = await _backupService().exportToFile(
+        includeImages: includeImages,
+      );
+      if (!mounted) return;
+
+      // sharePositionOrigin : obligatoire pour l'iPad, ignoré ailleurs.
+      final box = _exportButtonKey.currentContext?.findRenderObject() as RenderBox?;
+      final origin = box != null && box.hasSize
+          ? box.localToGlobal(Offset.zero) & box.size
+          : null;
+
+      await SharePlus.instance.share(
+        ShareParams(
+          files: [XFile(file.path, mimeType: 'application/json')],
+          fileNameOverrides: [p.basename(file.path)],
+          subject: 'Sauvegarde IMPACT',
+          text: 'Sauvegarde de mes sessions de tir (${p.basename(file.path)})',
+          sharePositionOrigin: origin,
+        ),
+      );
+    } catch (e) {
+      _showMessage('Export impossible : $e', isError: true);
+    } finally {
+      if (mounted) setState(() => _isBackupBusy = false);
+    }
+  }
+
+  /// Les photos de cibles alourdissent énormément le fichier : on laisse le
+  /// choix entre une sauvegarde légère (données seules) et une sauvegarde
+  /// complète (photos encodées dans le JSON).
+  Future<bool?> _askIncludeImages() {
+    var includeImages = false;
+    return showDialog<bool>(
+      context: context,
+      builder: (context) => StatefulBuilder(
+        builder: (context, setDialogState) => AlertDialog(
+          title: const Text('Exporter mes données'),
+          content: Column(
+            mainAxisSize: MainAxisSize.min,
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              const Text(
+                'Le fichier contiendra toutes tes sessions (cibles, impacts, '
+                'scores), tes statistiques et ton armurerie.',
+              ),
+              const SizedBox(height: 8),
+              SwitchListTile(
+                contentPadding: EdgeInsets.zero,
+                value: includeImages,
+                onChanged: (v) => setDialogState(() => includeImages = v),
+                title: const Text('Inclure les photos des cibles'),
+                subtitle: const Text(
+                  'Sauvegarde complète, mais fichier beaucoup plus lourd.',
+                  style: TextStyle(fontSize: 12),
+                ),
+              ),
+            ],
+          ),
+          actions: [
+            TextButton(
+              onPressed: () => Navigator.pop(context),
+              child: const Text('Annuler'),
+            ),
+            ElevatedButton(
+              onPressed: () => Navigator.pop(context, includeImages),
+              child: const Text('Exporter'),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+
+  Future<void> _importBackup() async {
+    const jsonGroup = XTypeGroup(
+      label: 'Sauvegarde IMPACT (.json)',
+      extensions: ['json'],
+      // Android renvoie parfois un type générique pour un .json : on accepte
+      // large, le contenu est validé à la lecture de toute façon.
+      mimeTypes: ['application/json', 'text/plain', 'application/octet-stream'],
+      uniformTypeIdentifiers: ['public.json', 'public.text'],
+    );
+
+    final picked = await openFile(acceptedTypeGroups: const [jsonGroup]);
+    if (picked == null || !mounted) return;
+
+    setState(() => _isBackupBusy = true);
+    try {
+      final service = _backupService();
+      final preview = await service.readBackup(File(picked.path));
+      if (!mounted) return;
+
+      final confirmed = await _confirmImport(preview);
+      if (confirmed != true || !mounted) return;
+
+      final result = await service.applyBackup(preview);
+      await _loadStatistics();
+      if (!mounted) return;
+
+      final details = [
+        '${result.sessions} session(s)',
+        '${result.weapons} arme(s)',
+        if (result.maintenance > 0) '${result.maintenance} entretien(s)',
+        if (result.images > 0) '${result.images} photo(s)',
+      ].join(' · ');
+      _showMessage(
+        result.errors.isEmpty
+            ? 'Import terminé : $details'
+            : 'Import terminé : $details — ${result.errors.length} entrée(s) ignorée(s)',
+      );
+    } on BackupFormatException catch (e) {
+      _showMessage(e.message, isError: true);
+    } catch (e) {
+      _showMessage('Import impossible : $e', isError: true);
+    } finally {
+      if (mounted) setState(() => _isBackupBusy = false);
+    }
+  }
+
+  Future<bool?> _confirmImport(BackupPreview preview) {
+    final date = preview.exportedAt;
+    final dateLabel = date == null
+        ? null
+        : '${date.day.toString().padLeft(2, '0')}/'
+            '${date.month.toString().padLeft(2, '0')}/${date.year}';
+
+    return showDialog<bool>(
+      context: context,
+      builder: (context) => AlertDialog(
+        title: const Text('Importer cette sauvegarde ?'),
+        content: Column(
+          mainAxisSize: MainAxisSize.min,
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            if (dateLabel != null) Text('Exportée le $dateLabel'),
+            if (dateLabel != null) const SizedBox(height: 8),
+            Text('• ${preview.sessionCount} session(s)'),
+            Text('• ${preview.targetCount} cible(s), ${preview.shotCount} impact(s)'),
+            Text('• ${preview.weaponCount} arme(s), ${preview.maintenanceCount} entretien(s)'),
+            Text(preview.hasImages
+                ? '• Photos des cibles incluses'
+                : '• Sans photos de cibles'),
+            const SizedBox(height: 12),
+            const Text(
+              'Les données actuelles sont conservées. Une session déjà '
+              'présente est simplement mise à jour.',
+              style: TextStyle(fontSize: 12),
+            ),
+          ],
+        ),
+        actions: [
+          TextButton(
+            onPressed: () => Navigator.pop(context, false),
+            child: const Text('Annuler'),
+          ),
+          ElevatedButton(
+            onPressed: () => Navigator.pop(context, true),
+            child: const Text('Importer'),
+          ),
+        ],
+      ),
+    );
+  }
+
+  void _showMessage(String message, {bool isError = false}) {
+    if (!mounted) return;
+    ScaffoldMessenger.of(context).showSnackBar(
+      SnackBar(
+        content: Text(message),
+        backgroundColor: isError ? Colors.red.shade700 : null,
+        duration: const Duration(seconds: 4),
+      ),
+    );
+  }
 }
 
 class _HeatMapPainter extends CustomPainter {

lib/main.dart

@@ -7,10 +7,8 @@ import 'package:sqflite_common_ffi/sqflite_ffi.dart';
 import 'app.dart';
 import 'core/theme/theme_provider.dart';
 import 'data/repositories/session_repository.dart';
-import 'services/target_detection_service.dart';
 import 'services/score_calculator_service.dart';
 import 'services/grouping_analyzer_service.dart';
-import 'services/image_processing_service.dart';
 import 'features/session/session_provider.dart';
 
 void main() async {
@@ -32,14 +30,6 @@ void main() async {
   runApp(
     MultiProvider(
       providers: [
-        Provider<ImageProcessingService>(
-          create: (_) => ImageProcessingService(),
-        ),
-        Provider<TargetDetectionService>(
-          create: (context) => TargetDetectionService(
-            imageProcessingService: context.read<ImageProcessingService>(),
-          ),
-        ),
         Provider<ScoreCalculatorService>(
           create: (_) => ScoreCalculatorService(),
         ),

lib/main_navigation_holder.dart

@@ -5,6 +5,23 @@ import 'features/statistics/statistics_screen.dart';
 import 'features/garage/weapon_list_screen.dart';
 import 'core/theme/app_theme.dart';
 
+/// Index des onglets de la barre de navigation principale.
+const int mainTabHome = 0;
+const int mainTabHistory = 1;
+const int mainTabStats = 2;
+const int mainTabGarage = 3;
+
+/// Clé du holder : permet de piloter l'onglet actif depuis n'importe quel
+/// écran (ex. fin de session -> onglet Stats).
+final GlobalKey<State<MainNavigationHolder>> mainNavKey =
+    GlobalKey<State<MainNavigationHolder>>();
+
+/// Ouvre l'onglet [index] de la navigation principale.
+void openMainTab(int index) {
+  final state = mainNavKey.currentState;
+  if (state is _MainNavigationHolderState) state.selectTab(index);
+}
+
 class MainNavigationHolder extends StatefulWidget {
   const MainNavigationHolder({super.key});
 
@@ -15,25 +32,37 @@ class MainNavigationHolder extends StatefulWidget {
 class _MainNavigationHolderState extends State<MainNavigationHolder> {
   int _selectedIndex = 0;
 
-  final List<Widget> _screens = [
-    const HomeScreen(),
-    const HistoryScreen(),
-    const StatisticsScreen(),
-    const WeaponListScreen(),
-  ];
+  // Incrémentés à chaque ouverture de l'onglet correspondant pour forcer le
+  // rechargement (les écrans sont gardés vivants par l'IndexedStack et ne se
+  // rafraîchissent pas seuls).
+  int _statsTick = 0;
+  int _historyTick = 0;
+  int _homeTick = 0;
+  int _garageTick = 0;
 
-  void _onItemTapped(int index) {
+  void selectTab(int index) {
+    if (!mounted) return;
     setState(() {
       _selectedIndex = index;
+      if (index == mainTabHome) _homeTick++;
+      if (index == mainTabHistory) _historyTick++;
+      if (index == mainTabStats) _statsTick++;
+      if (index == mainTabGarage) _garageTick++;
     });
   }
 
   @override
   Widget build(BuildContext context) {
+    final screens = [
+      HomeScreen(refreshTick: _homeTick),
+      HistoryScreen(refreshTick: _historyTick),
+      StatisticsScreen(refreshTick: _statsTick),
+      WeaponListScreen(refreshTick: _garageTick),
+    ];
     return Scaffold(
       body: IndexedStack(
         index: _selectedIndex,
-        children: _screens,
+        children: screens,
       ),
       bottomNavigationBar: Container(
         decoration: BoxDecoration(
@@ -47,7 +76,7 @@ class _MainNavigationHolderState extends State<MainNavigationHolder> {
         ),
         child: BottomNavigationBar(
           currentIndex: _selectedIndex,
-          onTap: _onItemTapped,
+          onTap: selectTab,
           type: BottomNavigationBarType.fixed,
           backgroundColor: Theme.of(context).cardColor,
           selectedItemColor: AppTheme.primaryColor,

lib/services/ai_export_service.dart

@@ -53,6 +53,8 @@ class AiExportService {
     required double targetCenterY,
     required double targetRadius,
     required List<Shot> shots,
+    int distanceMeters = 25,
+    String weaponName = 'Unknown',
     String? apiUrl,
   }) async {
     try {
@@ -109,9 +111,9 @@ class AiExportService {
         "device_info": deviceData,
         "target_metadata": {
           "type": targetType.name,
-          "distance_meters": 25, // Default/placeholder
-          "weapon": "Unknown", // Default/placeholder
-          // The backend could extract exact width/height from the image. 
+          "distance_meters": distanceMeters,
+          "weapon": weaponName,
+          // The backend could extract exact width/height from the image.
         },
         "plotting": {
           "target_corners": corners,

lib/services/backup_service.dart

@@ -0,0 +1,426 @@
+import 'dart:convert';
+import 'dart:io';
+
+import 'package:flutter/foundation.dart';
+import 'package:path/path.dart' as p;
+import 'package:path_provider/path_provider.dart';
+
+import '../data/models/maintenance.dart';
+import '../data/models/session.dart';
+import '../data/models/shot.dart';
+import '../data/models/target_analysis.dart';
+import '../data/models/weapon.dart';
+import '../data/repositories/session_repository.dart';
+import 'statistics_service.dart';
+
+/// Résumé d'un fichier de sauvegarde, affiché avant de confirmer un import.
+class BackupPreview {
+  final int sessionCount;
+  final int targetCount;
+  final int shotCount;
+  final int weaponCount;
+  final int maintenanceCount;
+  final bool hasImages;
+  final DateTime? exportedAt;
+  final Map<String, dynamic> raw;
+
+  const BackupPreview({
+    required this.sessionCount,
+    required this.targetCount,
+    required this.shotCount,
+    required this.weaponCount,
+    required this.maintenanceCount,
+    required this.hasImages,
+    required this.exportedAt,
+    required this.raw,
+  });
+}
+
+/// Résultat d'un import : ce qui a réellement été écrit en base.
+class ImportResult {
+  final int sessions;
+  final int weapons;
+  final int maintenance;
+  final int images;
+  final List<String> errors;
+
+  const ImportResult({
+    required this.sessions,
+    required this.weapons,
+    required this.maintenance,
+    required this.images,
+    required this.errors,
+  });
+}
+
+/// Erreur « propre » d'import : message directement affichable à l'utilisateur.
+class BackupFormatException implements Exception {
+  final String message;
+  BackupFormatException(this.message);
+
+  @override
+  String toString() => message;
+}
+
+/// Import / export de l'intégralité des données de l'app dans un fichier JSON :
+/// sessions (avec cibles, impacts et calibration), armurerie (armes +
+/// maintenance) et un instantané des statistiques calculées.
+///
+/// Les statistiques ne sont pas réimportées : elles sont recalculées à partir
+/// des sessions. Elles figurent dans le fichier pour pouvoir être lues telles
+/// quelles (analyse externe, IA, tableur).
+class BackupService {
+  static const String formatId = 'impact.backup';
+  static const int formatVersion = 1;
+
+  final SessionRepository _repository;
+  final StatisticsService _statisticsService;
+
+  BackupService({
+    required SessionRepository repository,
+    StatisticsService? statisticsService,
+  })  : _repository = repository,
+        _statisticsService = statisticsService ?? StatisticsService();
+
+  // ---------------------------------------------------------------- EXPORT
+
+  /// Construit le fichier de sauvegarde et renvoie le fichier écrit dans le
+  /// dossier temporaire, prêt à être passé à la feuille de partage du système.
+  Future<File> exportToFile({bool includeImages = false}) async {
+    final json = await buildBackupJson(includeImages: includeImages);
+
+    final tempDir = await getTemporaryDirectory();
+    final file = File(p.join(tempDir.path, _buildFileName()));
+    await file.writeAsString(
+      const JsonEncoder.withIndent('  ').convert(json),
+      flush: true,
+    );
+
+    return file;
+  }
+
+  String _buildFileName() {
+    final now = DateTime.now();
+    String two(int v) => v.toString().padLeft(2, '0');
+    return 'impact_sauvegarde_${now.year}-${two(now.month)}-${two(now.day)}'
+        '_${two(now.hour)}${two(now.minute)}.json';
+  }
+
+  @visibleForTesting
+  Future<Map<String, dynamic>> buildBackupJson({
+    bool includeImages = false,
+  }) async {
+    final sessions = await _repository.getAllSessions();
+    final weapons = await _repository.getWeapons();
+    final maintenance = await _repository.getAllMaintenance();
+
+    // Maintenance regroupée par arme : une arme reste autonome dans le fichier.
+    final maintenanceByWeapon = <String, List<MaintenanceEntry>>{};
+    for (final entry in maintenance) {
+      (maintenanceByWeapon[entry.weaponId] ??= []).add(entry);
+    }
+
+    var totalTargets = 0;
+    var totalShots = 0;
+    final sessionsJson = <Map<String, dynamic>>[];
+    for (final session in sessions) {
+      final analysesJson = <Map<String, dynamic>>[];
+      for (final analysis in session.analyses) {
+        totalTargets++;
+        totalShots += analysis.shots.length;
+        analysesJson.add(await _analysisToJson(analysis, includeImages));
+      }
+      sessionsJson.add({
+        ...session.toMap(),
+        'analyses': analysesJson,
+      });
+    }
+
+    return {
+      'format': formatId,
+      'version': formatVersion,
+      'app': 'bully',
+      'exported_at': DateTime.now().toIso8601String(),
+      'includes_images': includeImages,
+      'counts': {
+        'sessions': sessions.length,
+        'targets': totalTargets,
+        'shots': totalShots,
+        'weapons': weapons.length,
+        'maintenance': maintenance.length,
+      },
+      'statistics': _statisticsToJson(sessions),
+      'weapons': weapons
+          .map((w) => {
+                ...w.toMap(),
+                'maintenance': (maintenanceByWeapon[w.id] ?? [])
+                    .map((e) => e.toMap())
+                    .toList(),
+              })
+          .toList(),
+      'sessions': sessionsJson,
+      // Maintenance orpheline (arme supprimée) : conservée pour ne rien perdre.
+      'orphan_maintenance': maintenance
+          .where((e) => !weapons.any((w) => w.id == e.weaponId))
+          .map((e) => e.toMap())
+          .toList(),
+    };
+  }
+
+  Future<Map<String, dynamic>> _analysisToJson(
+    TargetAnalysis analysis,
+    bool includeImages,
+  ) async {
+    final json = <String, dynamic>{
+      ...analysis.toMap(),
+      'shots': analysis.shots.map((s) => s.toMap()).toList(),
+    };
+
+    if (includeImages) {
+      try {
+        final file = File(analysis.imagePath);
+        if (await file.exists()) {
+          json['image_extension'] = p.extension(analysis.imagePath);
+          json['image_base64'] = base64Encode(await file.readAsBytes());
+        }
+      } catch (e) {
+        // Une photo illisible ne doit pas faire échouer toute la sauvegarde.
+        debugPrint('Sauvegarde : image ignorée (${analysis.id}) : $e');
+      }
+    }
+
+    return json;
+  }
+
+  Map<String, dynamic> _statisticsToJson(List<Session> sessions) {
+    final stats = _statisticsService.calculateStatistics(
+      sessions,
+      period: StatsPeriod.all,
+    );
+
+    return {
+      'total_shots': stats.totalShots,
+      'total_score': stats.totalScore,
+      'average_score': stats.avgScore,
+      'max_score': stats.maxScore,
+      'min_score': stats.minScore,
+      'precision': {
+        'avg_distance_from_center': stats.precision.avgDistanceFromCenter,
+        'grouping_diameter': stats.precision.groupingDiameter,
+        'precision_score': stats.precision.precisionScore,
+        'consistency_score': stats.precision.consistencyScore,
+      },
+      'std_dev': {
+        'x': stats.stdDev.stdDevX,
+        'y': stats.stdDev.stdDevY,
+        'radial': stats.stdDev.stdDevRadial,
+        'score': stats.stdDev.stdDevScore,
+        'mean_x': stats.stdDev.meanX,
+        'mean_y': stats.stdDev.meanY,
+        'mean_score': stats.stdDev.meanScore,
+      },
+      'regional': {
+        'quadrants': stats.regional.quadrantDistribution,
+        'sectors': stats.regional.sectorDistribution,
+        'dominant_direction': stats.regional.dominantDirection,
+        'bias_x': stats.regional.biasX,
+        'bias_y': stats.regional.biasY,
+      },
+      'heat_map': {
+        'grid_size': stats.heatMap.gridSize,
+        'max_shots_in_zone': stats.heatMap.maxShotsInZone,
+        'zones': [
+          for (final row in stats.heatMap.zones)
+            for (final zone in row)
+              {
+                'row': zone.row,
+                'col': zone.col,
+                'shot_count': zone.shotCount,
+                'intensity': zone.intensity,
+                'avg_score': zone.avgScore,
+              },
+        ],
+      },
+    };
+  }
+
+  // ---------------------------------------------------------------- IMPORT
+
+  /// Lit et valide un fichier de sauvegarde sans rien écrire en base.
+  Future<BackupPreview> readBackup(File file) async {
+    late final dynamic decoded;
+    try {
+      decoded = jsonDecode(await file.readAsString());
+    } catch (e) {
+      throw BackupFormatException(
+        'Fichier illisible : ce n\'est pas un JSON valide.',
+      );
+    }
+
+    if (decoded is! Map<String, dynamic>) {
+      throw BackupFormatException('Fichier illisible : format inattendu.');
+    }
+    if (decoded['format'] != formatId) {
+      throw BackupFormatException(
+        'Ce fichier n\'est pas une sauvegarde IMPACT.',
+      );
+    }
+    final version = (decoded['version'] as num?)?.toInt() ?? 0;
+    if (version > formatVersion) {
+      throw BackupFormatException(
+        'Sauvegarde créée par une version plus récente de l\'application '
+        '(format $version). Mettez l\'app à jour pour l\'importer.',
+      );
+    }
+
+    final sessions = _asList(decoded['sessions']);
+    final weapons = _asList(decoded['weapons']);
+
+    var targets = 0;
+    var shots = 0;
+    var hasImages = false;
+    for (final session in sessions) {
+      for (final analysis in _asList(session['analyses'])) {
+        targets++;
+        shots += _asList(analysis['shots']).length;
+        if (analysis['image_base64'] != null) hasImages = true;
+      }
+    }
+
+    var maintenance = _asList(decoded['orphan_maintenance']).length;
+    for (final weapon in weapons) {
+      maintenance += _asList(weapon['maintenance']).length;
+    }
+
+    return BackupPreview(
+      sessionCount: sessions.length,
+      targetCount: targets,
+      shotCount: shots,
+      weaponCount: weapons.length,
+      maintenanceCount: maintenance,
+      hasImages: hasImages,
+      exportedAt: DateTime.tryParse(decoded['exported_at'] as String? ?? ''),
+      raw: decoded,
+    );
+  }
+
+  /// Écrit en base le contenu d'une sauvegarde déjà lue par [readBackup].
+  ///
+  /// Fusion : les entrées existantes portant le même identifiant sont
+  /// remplacées, les autres sont conservées. Réimporter deux fois la même
+  /// sauvegarde ne crée donc pas de doublons.
+  Future<ImportResult> applyBackup(BackupPreview preview) async {
+    final errors = <String>[];
+    var importedSessions = 0;
+    var importedWeapons = 0;
+    var importedMaintenance = 0;
+    var importedImages = 0;
+
+    // 1. Armurerie d'abord : les sessions y font référence par weapon_id.
+    for (final weaponJson in _asList(preview.raw['weapons'])) {
+      try {
+        await _repository.saveWeapon(Weapon.fromMap(weaponJson));
+        importedWeapons++;
+      } catch (e) {
+        errors.add('Arme ignorée : $e');
+        continue;
+      }
+      for (final entryJson in _asList(weaponJson['maintenance'])) {
+        try {
+          await _repository.saveMaintenanceEntry(
+            MaintenanceEntry.fromMap(entryJson),
+          );
+          importedMaintenance++;
+        } catch (e) {
+          errors.add('Entretien ignoré : $e');
+        }
+      }
+    }
+
+    // 2. Sessions, cibles et impacts.
+    for (final sessionJson in _asList(preview.raw['sessions'])) {
+      try {
+        final analyses = <TargetAnalysis>[];
+        for (final analysisJson in _asList(sessionJson['analyses'])) {
+          final shots = _asList(analysisJson['shots'])
+              .map((s) => Shot.fromMap(s))
+              .toList();
+
+          var map = _normalizeAnalysis(analysisJson);
+          final imagePath = await _restoreImage(analysisJson);
+          if (imagePath != null) {
+            map = {...map, 'image_path': imagePath};
+            importedImages++;
+          }
+
+          analyses.add(TargetAnalysis.fromMap(map, shots));
+        }
+        await _repository.saveSession(Session.fromMap(sessionJson, analyses));
+        importedSessions++;
+      } catch (e) {
+        errors.add('Session ignorée : $e');
+      }
+    }
+
+    // 3. Maintenance dont l'arme a été supprimée avant l'export.
+    for (final entryJson in _asList(preview.raw['orphan_maintenance'])) {
+      try {
+        await _repository.saveMaintenanceEntry(
+          MaintenanceEntry.fromMap(entryJson),
+        );
+        importedMaintenance++;
+      } catch (e) {
+        errors.add('Entretien ignoré : $e');
+      }
+    }
+
+    return ImportResult(
+      sessions: importedSessions,
+      weapons: importedWeapons,
+      maintenance: importedMaintenance,
+      images: importedImages,
+      errors: errors,
+    );
+  }
+
+  /// Recrée la photo de cible si la sauvegarde l'embarque, et renvoie son
+  /// nouveau chemin local. `null` si la sauvegarde est sans photos : le chemin
+  /// d'origine est alors conservé (l'app affiche un placeholder s'il est mort).
+  Future<String?> _restoreImage(Map<String, dynamic> analysisJson) async {
+    final encoded = analysisJson['image_base64'] as String?;
+    if (encoded == null || encoded.isEmpty) return null;
+
+    try {
+      final bytes = base64Decode(encoded);
+      final extension = analysisJson['image_extension'] as String? ?? '.jpg';
+      return await _repository.saveImageBytes(bytes, extension);
+    } catch (e) {
+      debugPrint('Import : image ignorée : $e');
+      return null;
+    }
+  }
+
+  /// JSON ne distingue pas 1 de 1.0 : une valeur ronde relue devient un `int`
+  /// et casse les `as double?` des modèles. On reforce donc les doubles.
+  Map<String, dynamic> _normalizeAnalysis(Map<String, dynamic> json) {
+    const doubleKeys = [
+      'grouping_diameter',
+      'grouping_center_x',
+      'grouping_center_y',
+      'target_center_x',
+      'target_center_y',
+      'target_radius',
+    ];
+
+    final map = Map<String, dynamic>.from(json);
+    for (final key in doubleKeys) {
+      map[key] = (map[key] as num?)?.toDouble();
+    }
+    return map;
+  }
+
+  List<Map<String, dynamic>> _asList(dynamic value) {
+    if (value is! List) return const [];
+    return value.whereType<Map<String, dynamic>>().toList();
+  }
+}

lib/services/opencv_impact_detection_service.dart

@@ -1,228 +0,0 @@
-/// Service de détection d'impacts utilisant OpenCV.
-library;
-
-import 'dart:math' as math;
-import 'package:opencv_dart/opencv_dart.dart' as cv;
-
-/// Paramètres de détection d'impacts OpenCV
-class OpenCVDetectionSettings {
-  /// Seuil Canny bas pour la détection de contours
-  final double cannyThreshold1;
-
-  /// Seuil Canny haut pour la détection de contours
-  final double cannyThreshold2;
-
-  /// Distance minimale entre les centres des cercles détectés
-  final double minDist;
-
-  /// Paramètre 1 de HoughCircles (seuil Canny interne)
-  final double param1;
-
-  /// Paramètre 2 de HoughCircles (seuil d'accumulation)
-  final double param2;
-
-  /// Rayon minimum des cercles en pixels
-  final int minRadius;
-
-  /// Rayon maximum des cercles en pixels
-  final int maxRadius;
-
-  /// Taille du flou gaussien (doit être impair)
-  final int blurSize;
-
-  /// Utiliser la détection de contours en plus de Hough
-  final bool useContourDetection;
-
-  /// Circularité minimale pour la détection par contours (0-1)
-  final double minCircularity;
-
-  /// Surface minimale des contours
-  final double minContourArea;
-
-  /// Surface maximale des contours
-  final double maxContourArea;
-
-  const OpenCVDetectionSettings({
-    this.cannyThreshold1 = 50,
-    this.cannyThreshold2 = 150,
-    this.minDist = 20,
-    this.param1 = 100,
-    this.param2 = 30,
-    this.minRadius = 5,
-    this.maxRadius = 50,
-    this.blurSize = 5,
-    this.useContourDetection = true,
-    this.minCircularity = 0.6,
-    this.minContourArea = 50,
-    this.maxContourArea = 5000,
-  });
-}
-
-/// Résultat de détection d'impact
-class OpenCVDetectedImpact {
-  /// Position X normalisée (0-1)
-  final double x;
-
-  /// Position Y normalisée (0-1)
-  final double y;
-
-  /// Rayon en pixels
-  final double radius;
-
-  /// Score de confiance (0-1)
-  final double confidence;
-
-  /// Méthode de détection utilisée
-  final String method;
-
-  const OpenCVDetectedImpact({
-    required this.x,
-    required this.y,
-    required this.radius,
-    this.confidence = 1.0,
-    this.method = 'unknown',
-  });
-}
-
-/// Service de détection d'impacts utilisant OpenCV
-class OpenCVImpactDetectionService {
-  /// Détecte les impacts dans une image en utilisant OpenCV
-  List<OpenCVDetectedImpact> detectImpacts(
-    String imagePath, {
-    OpenCVDetectionSettings settings = const OpenCVDetectionSettings(),
-  }) {
-    try {
-      final img = cv.imread(imagePath, flags: cv.IMREAD_COLOR);
-      if (img.isEmpty) return [];
-
-      final gray = cv.cvtColor(img, cv.COLOR_BGR2GRAY);
-
-      // Apply blur to reduce noise
-      final blurKSize = (settings.blurSize, settings.blurSize);
-      final blurred = cv.gaussianBlur(gray, blurKSize, 2, sigmaY: 2);
-
-      final List<OpenCVDetectedImpact> detectedImpacts = [];
-
-      final circles = cv.HoughCircles(
-        blurred,
-        cv.HOUGH_GRADIENT,
-        1,
-        settings.minDist,
-        param1: settings.param1,
-        param2: settings.param2,
-        minRadius: settings.minRadius,
-        maxRadius: settings.maxRadius,
-      );
-
-      if (circles.rows > 0 && circles.cols > 0) {
-        // Mat shape: (1, N, 3) usually for HoughCircles (CV_32FC3)
-        // We use at<Vec3f> directly.
-
-        for (int i = 0; i < circles.cols; i++) {
-          final vec = circles.at<cv.Vec3f>(0, i);
-          final x = vec.val1;
-          final y = vec.val2;
-          final r = vec.val3;
-
-          detectedImpacts.add(
-            OpenCVDetectedImpact(
-              x: x / img.cols,
-              y: y / img.rows,
-              radius: r,
-              confidence: 0.8,
-              method: 'hough',
-            ),
-          );
-        }
-      }
-
-      // 2. Contour Detection (if enabled)
-      if (settings.useContourDetection) {
-        // Canny edge detection
-        final edges = cv.canny(
-          blurred,
-          settings.cannyThreshold1,
-          settings.cannyThreshold2,
-        );
-
-        // Find contours
-        final contoursResult = cv.findContours(
-          edges,
-          cv.RETR_EXTERNAL,
-          cv.CHAIN_APPROX_SIMPLE,
-        );
-
-        final contours = contoursResult.$1;
-        // hierarchy is $2
-
-        for (int i = 0; i < contours.length; i++) {
-          final contour = contours[i];
-
-          // Filter by area
-          final area = cv.contourArea(contour);
-          if (area < settings.minContourArea ||
-              area > settings.maxContourArea) {
-            continue;
-          }
-
-          // Filter by circularity
-          final perimeter = cv.arcLength(contour, true);
-          if (perimeter == 0) continue;
-          final circularity = 4 * math.pi * area / (perimeter * perimeter);
-
-          if (circularity < settings.minCircularity) continue;
-
-          // Get bounding circle
-          final enclosingCircle = cv.minEnclosingCircle(contour);
-          final center = enclosingCircle.$1;
-          final radius = enclosingCircle.$2;
-
-          // Avoid duplicates (simple distance check against Hough results)
-          bool isDuplicate = false;
-          for (final existing in detectedImpacts) {
-            final dx = existing.x * img.cols - center.x;
-            final dy = existing.y * img.rows - center.y;
-            final dist = math.sqrt(dx * dx + dy * dy);
-            if (dist < radius) {
-              isDuplicate = true;
-              break;
-            }
-          }
-
-          if (!isDuplicate) {
-            detectedImpacts.add(
-              OpenCVDetectedImpact(
-                x: center.x / img.cols,
-                y: center.y / img.rows,
-                radius: radius,
-                confidence: circularity, // Use circularity as confidence
-                method: 'contour',
-              ),
-            );
-          }
-        }
-      }
-
-      return detectedImpacts;
-    } catch (e) {
-      // print('OpenCV Error: $e');
-      return [];
-    }
-  }
-
-  /// Détecte les impacts en utilisant une image de référence
-  List<OpenCVDetectedImpact> detectFromReferences(
-    String imagePath,
-    List<({double x, double y})> referencePoints, {
-    double tolerance = 2.0,
-  }) {
-    // Basic implementation: use average color/brightness of reference points
-    // This is a placeholder for a more complex template matching or feature matching
-
-    // For now, we can just run the standard detection but filter results
-    // based on properties of the reference points (e.g. size/radius if we had it).
-
-    // Returning standard detection for now to enable the feature.
-    return detectImpacts(imagePath);
-  }
-}

lib/services/opencv_target_service.dart

@@ -26,23 +26,34 @@ class TargetDetectionResult {
 
 class OpenCVTargetService {
   /// Detect the main target (center and radius) from an image file
+  ///
+  /// IMPORTANT : les Mat OpenCV sont de la mémoire NATIVE, invisible pour le
+  /// garbage collector Dart. Cette méthode est appelée en boucle (~1 s)
+  /// pendant l'aperçu caméra : sans dispose() explicite dans le finally, la
+  /// mémoire native grimpe en continu tant que l'utilisateur vise.
   Future<TargetDetectionResult> detectTarget(String imagePath) async {
+    cv.Mat? img;
+    cv.Mat? gray;
+    cv.Mat? blurred;
+    cv.Mat? circles;
+    cv.Mat? looseCircles;
+
     try {
       // Read image
-      final img = cv.imread(imagePath, flags: cv.IMREAD_COLOR);
+      img = cv.imread(imagePath, flags: cv.IMREAD_COLOR);
       if (img.isEmpty) {
         return TargetDetectionResult.failure();
       }
 
       // Convert to grayscale
-      final gray = cv.cvtColor(img, cv.COLOR_BGR2GRAY);
+      gray = cv.cvtColor(img, cv.COLOR_BGR2GRAY);
 
       // Apply Gaussian blur to reduce noise
-      final blurred = cv.gaussianBlur(gray, (9, 9), 2, sigmaY: 2);
+      blurred = cv.gaussianBlur(gray, (9, 9), 2, sigmaY: 2);
 
-      // Detect circles using Hough Transform
-      // Parameters need to be tuned for the specific target type
-      final circles = cv.HoughCircles(
+      // Detect circles using Hough Transform.
+      // HoughCircles returns a Mat of shape (1, N) of Vec3f (x, y, r).
+      circles = cv.HoughCircles(
         blurred,
         cv.HOUGH_GRADIENT,
         1, // dp
@@ -55,26 +66,9 @@ class OpenCVTargetService {
         maxRadius: img.cols ~/ 2,
       );
 
-      // HoughCircles returns a Mat of shape (1, N, 3) where N is number of circles.
-      // In opencv_dart, we cannot iterate easily.
-      // However, we can access data via pointer if needed, or check if Vec3f is supported.
-      // Given the user report, `at<Vec3f>` likely failed compilation or runtime.
-      // Let's use a safer approach: assume standard memory layout (x, y, r, x, y, r...).
-      // Or use `at<double>` carefully.
-
-      // Better yet: try to use `circles.data` if available, but it returns a Pointer.
-      // Let's stick to `at` but use `double` and manual offset if Vec3f fails.
-      // actually, let's try to trust `at<double>` for flattened access OR `at<Vec3f>`.
-      // NOTE: `at<Vec3f>` was reported as "method at not defined for VecPoint2f" earlier, NOT for Mat.
-      // The user error was for `VecPoint2f`. `Mat` definitely has `at`.
-      // BUT `VecPoint2f` is a List-like structure in Dart wrapper.
-      // usage of `at` on `VecPoint2f` was the error.
-      // Here `circles` IS A MAT. So `at` IS defined.
-      // However, to be safe and robust, and to implement clustering...
-
       if (circles.isEmpty) {
         // Try with different parameters if first attempt fails (more lenient)
-        final looseCircles = cv.HoughCircles(
+        looseCircles = cv.HoughCircles(
           blurred,
           cv.HOUGH_GRADIENT,
           1,
@@ -93,8 +87,15 @@ class OpenCVTargetService {
 
       return _findBestConcentricCircles(circles, img.cols, img.rows);
     } catch (e) {
-      // print('Error detecting target with OpenCV: $e');
       return TargetDetectionResult.failure();
+    } finally {
+      // _findBestConcentricCircles a déjà extrait les données dans des listes
+      // Dart avant qu'on arrive ici : libérer les Mat est donc toujours sûr.
+      img?.dispose();
+      gray?.dispose();
+      blurred?.dispose();
+      circles?.dispose();
+      looseCircles?.dispose();
     }
   }
 

lib/services/target_detection_service.dart

@@ -1,461 +0,0 @@
-import 'dart:math' as math;
-import 'package:flutter/foundation.dart';
-import '../data/models/target_type.dart';
-import 'image_processing_service.dart';
-import 'opencv_impact_detection_service.dart';
-export 'image_processing_service.dart'
-    show ImpactDetectionSettings, ReferenceImpact, ImpactCharacteristics;
-export 'opencv_impact_detection_service.dart'
-    show OpenCVDetectionSettings, OpenCVDetectedImpact;
-
-// ============================================================================
-// STRUCT ET FONCTION GLOBALE POUR LE PARALLÉLISME (THREAD SECONDAIRE)
-// ============================================================================
-
-/// Conteneur de données pour envoyer les paramètres à l'Isolate d'arrière-plan.
-class DetectionPayload {
-  final String imagePath;
-  final TargetType targetType;
-
-  // On recrée les instances à l'intérieur du thread isolé car les objets ne se partagent pas entre threads.
-  DetectionPayload({
-    required this.imagePath,
-    required this.targetType,
-  });
-}
-
-/// FONCTION EXÉCUTÉE EN PARALLÈLE : Tourne sur un autre cœur du processeur.
-/// L'interface graphique reste à 120 FPS et totalement fluide.
-TargetDetectionResult runParallelTargetDetection(DetectionPayload payload) {
-  // 1. Initialisation locale des services dans le sous-thread
-  final imageProcessingService = ImageProcessingService();
-
-  try {
-    // 2. Détection de la cible principale (Calcul lourd)
-    final mainTarget = imageProcessingService.detectMainTarget(payload.imagePath);
-
-    double centerX = 0.5;
-    double centerY = 0.5;
-    double radius = 0.4;
-
-    if (mainTarget != null) {
-      centerX = mainTarget.centerX;
-      centerY = mainTarget.centerY;
-      radius = mainTarget.radius;
-    }
-
-    // 3. Détection des impacts (Calcul lourd)
-    final impacts = imageProcessingService.detectImpacts(payload.imagePath);
-
-    // 4. Calcul mathématique des scores relatifs
-    final detectedImpacts = impacts.map((impact) {
-      final score = payload.targetType == TargetType.concentric
-          ? _staticCalculateConcentricScore(
-        impact.x,
-        impact.y,
-        centerX,
-        centerY,
-        radius,
-      )
-          : _staticCalculateSilhouetteScore(impact.x, impact.y, centerX, centerY);
-
-      return DetectedImpactResult(
-        x: impact.x,
-        y: impact.y,
-        radius: impact.radius,
-        suggestedScore: score,
-      );
-    }).toList();
-
-    return TargetDetectionResult(
-      centerX: centerX,
-      centerY: centerY,
-      radius: radius,
-      impacts: detectedImpacts,
-    );
-  } catch (e) {
-    return TargetDetectionResult.error('Erreur de detection parallèle: $e');
-  }
-}
-
-// Fonctions mathématiques pures nécessaires à l'Isolate (statiques)
-int _staticCalculateConcentricScore(double impactX, double impactY, double centerX, double centerY, double targetRadius) {
-  final dx = impactX - centerX;
-  final dy = impactY - centerY;
-  final distance = math.sqrt(dx * dx + dy * dy) / targetRadius;
-  if (distance <= 0.1) return 10;
-  if (distance <= 0.2) return 9;
-  if (distance <= 0.3) return 8;
-  if (distance <= 0.4) return 7;
-  if (distance <= 0.5) return 6;
-  if (distance <= 0.6) return 5;
-  if (distance <= 0.7) return 4;
-  if (distance <= 0.8) return 3;
-  if (distance <= 0.9) return 2;
-  if (distance <= 1.0) return 1;
-  return 0;
-}
-
-int _staticCalculateSilhouetteScore(double impactX, double impactY, double centerX, double centerY) {
-  final dx = (impactX - centerX).abs();
-  final dy = impactY - centerY;
-  if (dx > 0.15) return 0;
-  if (dy < -0.25) return 5;
-  if (dy < 0.0) return 5;
-  if (dy < 0.15) return 4;
-  if (dy < 0.35) return 3;
-  return 0;
-}
-
-// ============================================================================
-// FIN DU BLOC DE PARALLÉLISME
-// ============================================================================
-
-
-class TargetDetectionResult {
-  final double centerX; // Relative (0-1)
-  final double centerY; // Relative (0-1)
-  final double radius; // Relative (0-1)
-  final List<DetectedImpactResult> impacts;
-  final bool success;
-  final String? errorMessage;
-
-  TargetDetectionResult({
-    required this.centerX,
-    required this.centerY,
-    required this.radius,
-    required this.impacts,
-    this.success = true,
-    this.errorMessage,
-  });
-
-  factory TargetDetectionResult.error(String message) {
-    return TargetDetectionResult(
-      centerX: 0.5,
-      centerY: 0.5,
-      radius: 0.4,
-      impacts: [],
-      success: false,
-      errorMessage: message,
-    );
-  }
-}
-
-class DetectedImpactResult {
-  final double x; // Relative (0-1)
-  final double y; // Relative (0-1)
-  final double radius; // Absolute pixels
-  final int suggestedScore;
-
-  DetectedImpactResult({
-    required this.x,
-    required this.y,
-    required this.radius,
-    required this.suggestedScore,
-  });
-}
-
-class TargetDetectionService {
-  final ImageProcessingService _imageProcessingService;
-  final OpenCVImpactDetectionService _opencvService;
-
-  TargetDetectionService({
-    ImageProcessingService? imageProcessingService,
-    OpenCVImpactDetectionService? opencvService,
-  }) : _imageProcessingService =
-      imageProcessingService ?? ImageProcessingService(),
-        _opencvService = opencvService ?? OpenCVImpactDetectionService();
-
-  /// Detect target and impacts from an image file ASYNCHRONOUSLY in a separate Thread.
-  /// CORRECTION : Utilise désormais 'compute' pour basculer en arrière-plan immédiat.
-  Future<TargetDetectionResult> detectTargetAsync(String imagePath, TargetType targetType) async {
-    final payload = DetectionPayload(imagePath: imagePath, targetType: targetType);
-    // Déclenche l'exécution isolée en tâche de fond
-    return await compute(runParallelTargetDetection, payload);
-  }
-
-  /// Gardée pour rétrocompatibilité synchrone si nécessaire
-  TargetDetectionResult detectTarget(String imagePath, TargetType targetType) {
-    try {
-      final mainTarget = _imageProcessingService.detectMainTarget(imagePath);
-
-      double centerX = 0.5;
-      double centerY = 0.5;
-      double radius = 0.4;
-
-      if (mainTarget != null) {
-        centerX = mainTarget.centerX;
-        centerY = mainTarget.centerY;
-        radius = mainTarget.radius;
-      }
-
-      final impacts = _imageProcessingService.detectImpacts(imagePath);
-
-      final detectedImpacts = impacts.map((impact) {
-        final score = targetType == TargetType.concentric
-            ? _calculateConcentricScore(
-          impact.x,
-          impact.y,
-          centerX,
-          centerY,
-          radius,
-        )
-            : _calculateSilhouetteScore(impact.x, impact.y, centerX, centerY);
-
-        return DetectedImpactResult(
-          x: impact.x,
-          y: impact.y,
-          radius: impact.radius,
-          suggestedScore: score,
-        );
-      }).toList();
-
-      return TargetDetectionResult(
-        centerX: centerX,
-        centerY: centerY,
-        radius: radius,
-        impacts: detectedImpacts,
-      );
-    } catch (e) {
-      return TargetDetectionResult.error('Erreur de detection: $e');
-    }
-  }
-
-  int _calculateConcentricScore(
-      double impactX,
-      double impactY,
-      double centerX,
-      double centerY,
-      double targetRadius,
-      ) {
-    final dx = impactX - centerX;
-    final dy = impactY - centerY;
-    final distance = math.sqrt(dx * dx + dy * dy) / targetRadius;
-
-    if (distance <= 0.1) return 10;
-    if (distance <= 0.2) return 9;
-    if (distance <= 0.3) return 8;
-    if (distance <= 0.4) return 7;
-    if (distance <= 0.5) return 6;
-    if (distance <= 0.6) return 5;
-    if (distance <= 0.7) return 4;
-    if (distance <= 0.8) return 3;
-    if (distance <= 0.9) return 2;
-    if (distance <= 1.0) return 1;
-    return 0;
-  }
-
-  int _calculateSilhouetteScore(
-      double impactX,
-      double impactY,
-      double centerX,
-      double centerY,
-      ) {
-    final dx = (impactX - centerX).abs();
-    final dy = impactY - centerY;
-
-    if (dx > 0.15) return 0;
-    if (dy < -0.25) return 5;
-    if (dy < 0.0) return 5;
-    if (dy < 0.15) return 4;
-    if (dy < 0.35) return 3;
-
-    return 0;
-  }
-
-  List<DetectedImpactResult> detectImpactsOnly(
-      String imagePath,
-      TargetType targetType,
-      double centerX,
-      double centerY,
-      double radius,
-      int ringCount,
-      ImpactDetectionSettings settings,
-      ) {
-    try {
-      final impacts = _imageProcessingService.detectImpactsWithSettings(
-        imagePath,
-        settings,
-      );
-
-      return impacts.map((impact) {
-        final score = targetType == TargetType.concentric
-            ? _calculateConcentricScoreWithRings(
-          impact.x,
-          impact.y,
-          centerX,
-          centerY,
-          radius,
-          ringCount,
-        )
-            : _calculateSilhouetteScore(impact.x, impact.y, centerX, centerY);
-
-        return DetectedImpactResult(
-          x: impact.x,
-          y: impact.y,
-          radius: impact.radius,
-          suggestedScore: score,
-        );
-      }).toList();
-    } catch (e) {
-      return [];
-    }
-  }
-
-  int _calculateConcentricScoreWithRings(
-      double impactX,
-      double impactY,
-      double centerX,
-      double centerY,
-      double targetRadius,
-      int ringCount,
-      ) {
-    final dx = impactX - centerX;
-    final dy = impactY - centerY;
-    final distance = math.sqrt(dx * dx + dy * dy) / targetRadius;
-
-    for (int i = 0; i < ringCount; i++) {
-      final zoneRadius = (i + 1) / ringCount;
-      if (distance <= zoneRadius) {
-        return 10 - i;
-      }
-    }
-
-    return 0;
-  }
-
-  ImpactCharacteristics? analyzeReferenceImpacts(
-      String imagePath,
-      List<ReferenceImpact> references,
-      ) {
-    return _imageProcessingService.analyzeReferenceImpacts(
-      imagePath,
-      references,
-    );
-  }
-
-  List<DetectedImpactResult> detectImpactsFromReferences(
-      String imagePath,
-      TargetType targetType,
-      double centerX,
-      double centerY,
-      double radius,
-      int ringCount,
-      ImpactCharacteristics characteristics, {
-        double tolerance = 2.0,
-      }) {
-    try {
-      final impacts = _imageProcessingService.detectImpactsFromReferences(
-        imagePath,
-        characteristics,
-        tolerance: tolerance,
-      );
-
-      return impacts.map((impact) {
-        final score = targetType == TargetType.concentric
-            ? _calculateConcentricScoreWithRings(
-          impact.x,
-          impact.y,
-          centerX,
-          centerY,
-          radius,
-          ringCount,
-        )
-            : _calculateSilhouetteScore(impact.x, impact.y, centerX, centerY);
-
-        return DetectedImpactResult(
-          x: impact.x,
-          y: impact.y,
-          radius: impact.radius,
-          suggestedScore: score,
-        );
-      }).toList();
-    } catch (e) {
-      return [];
-    }
-  }
-
-  List<DetectedImpactResult> detectImpactsWithOpenCV(
-      String imagePath,
-      TargetType targetType,
-      double centerX,
-      double centerY,
-      double radius,
-      int ringCount, {
-        OpenCVDetectionSettings? settings,
-      }) {
-    try {
-      final impacts = _opencvService.detectImpacts(
-        imagePath,
-        settings: settings ?? const OpenCVDetectionSettings(),
-      );
-
-      return impacts.map((impact) {
-        final score = targetType == TargetType.concentric
-            ? _calculateConcentricScoreWithRings(
-          impact.x,
-          impact.y,
-          centerX,
-          centerY,
-          radius,
-          ringCount,
-        )
-            : _calculateSilhouetteScore(impact.x, impact.y, centerX, centerY);
-
-        return DetectedImpactResult(
-          x: impact.x,
-          y: impact.y,
-          radius: impact.radius,
-          suggestedScore: score,
-        );
-      }).toList();
-    } catch (e) {
-      debugPrint('Erreur détection OpenCV: $e');
-      return [];
-    }
-  }
-
-  List<DetectedImpactResult> detectImpactsWithOpenCVFromReferences(
-      String imagePath,
-      TargetType targetType,
-      double centerX,
-      double centerY,
-      double radius,
-      int ringCount,
-      List<ReferenceImpact> references, {
-        double tolerance = 2.0,
-      }) {
-    try {
-      final refPoints = references.map((r) => (x: r.x, y: r.y)).toList();
-
-      final impacts = _opencvService.detectFromReferences(
-        imagePath,
-        refPoints,
-        tolerance: tolerance,
-      );
-
-      return impacts.map((impact) {
-        final score = targetType == TargetType.concentric
-            ? _calculateConcentricScoreWithRings(
-          impact.x,
-          impact.y,
-          centerX,
-          centerY,
-          radius,
-          ringCount,
-        )
-            : _calculateSilhouetteScore(impact.x, impact.y, centerX, centerY);
-
-        return DetectedImpactResult(
-          x: impact.x,
-          y: impact.y,
-          radius: impact.radius,
-          suggestedScore: score,
-        );
-      }).toList();
-    } catch (e) {
-      debugPrint('Erreur détection OpenCV depuis références: $e');
-      return [];
-    }
-  }
-}

lib/services/target_rectify_service.dart

@@ -1,259 +0,0 @@
-import 'dart:async';
-import 'dart:math' as math;
-import 'package:flutter/foundation.dart';
-import 'package:opencv_dart/opencv_dart.dart' as cv;
-
-/// Résultat d'une tentative de redressement de cible.
-class RectifyResult {
-  /// Chemin du fichier image redressé (ou original si échec).
-  final String outputPath;
-
-  /// true si une cible a été détectée et redressée, false si on a renvoyé
-  /// l'image d'origine sans transformation.
-  final bool rectified;
-
-  /// Angle d'inclinaison estimé de la cible AVANT redressement, en degrés.
-  /// (0 = déjà de face). Utile pour informer l'utilisateur.
-  final double estimatedTiltDegrees;
-
-  /// Message de diagnostic (utile pour debug / affichage).
-  final String message;
-
-  const RectifyResult({
-    required this.outputPath,
-    required this.rectified,
-    required this.estimatedTiltDegrees,
-    required this.message,
-  });
-}
-
-/// Service qui redresse une cible RONDE (cercles concentriques) photographiée
-/// de biais, en la ramenant parfaitement de face.
-///
-/// Principe :
-///   1. Détecter le plus grand contour ~circulaire de l'image.
-///   2. Ajuster une ELLIPSE sur ce contour (fitEllipse).
-///   3. Un cercle vu en perspective devient une ellipse : on calcule la
-///      transformation de perspective qui remappe cette ellipse vers un
-///      CERCLE parfait, et on l'applique à toute l'image.
-///   4. La cible apparaît alors de face.
-///
-/// L'image résultat est carrée et centrée sur la cible.
-class TargetRectifyService {
-  /// Taille (en pixels) du côté de l'image carrée de sortie.
-  final int outputSize;
-
-  /// Marge autour de la cible dans l'image de sortie (1.0 = cible pile au bord,
-  /// 1.3 = 30 % de marge autour). Garde un peu de contexte.
-  final double marginFactor;
-
-  /// En dessous de cet écart d'axes (ratio petit/grand axe proche de 1),
-  /// la cible est considérée déjà de face → pas de warp inutile.
-  final double minTiltRatioToRectify;
-
-  TargetRectifyService({
-    this.outputSize = 1024,
-    this.marginFactor = 1.25,
-    this.minTiltRatioToRectify = 0.985,
-  });
-
-  /// Redresse l'image située à [inputPath]. Écrit le résultat dans
-  /// [outputPath] et renvoie un [RectifyResult].
-  ///
-  /// Ne bloque jamais : en cas d'échec de détection, renvoie l'image
-  /// d'origine (rectified = false) pour ne pas perdre la photo du tireur.
-  Future<RectifyResult> rectify({
-    required String inputPath,
-    required String outputPath,
-  }) async {
-    cv.Mat? src;
-    cv.Mat? gray;
-    cv.Mat? blurred;
-    cv.Mat? edges;
-    try {
-      src = cv.imread(inputPath, flags: cv.IMREAD_COLOR);
-      if (src.isEmpty) {
-        return RectifyResult(
-          outputPath: inputPath,
-          rectified: false,
-          estimatedTiltDegrees: 0,
-          message: 'Image illisible',
-        );
-      }
-
-      // ── 1. Prétraitement ────────────────────────────────────────────────
-      gray = cv.cvtColor(src, cv.COLOR_BGR2GRAY);
-      blurred = cv.gaussianBlur(gray, (5, 5), 2, sigmaY: 2);
-      edges = cv.canny(blurred, 60, 160);
-
-      // Dilatation légère pour fermer les contours brisés
-      final cv.Mat kernel = cv.getStructuringElement(
-        cv.MORPH_ELLIPSE,
-        (3, 3),
-      );
-      final cv.Mat dilated = cv.dilate(edges, kernel);
-
-      // ── 2. Recherche du meilleur contour elliptique ──────────────────────
-      final (contours, _) = cv.findContours(
-        dilated,
-        cv.RETR_EXTERNAL,
-        cv.CHAIN_APPROX_SIMPLE,
-      );
-
-      final double imgArea = (src.width * src.height).toDouble();
-      cv.RotatedRect? bestEllipse;
-      double bestScore = 0;
-
-      for (int i = 0; i < contours.length; i++) {
-        final c = contours[i];
-        if (c.length < 5) continue; // fitEllipse exige >= 5 points
-
-        final double area = cv.contourArea(c);
-        // On ignore les contours minuscules et ceux qui couvrent presque tout
-        if (area < imgArea * 0.03 || area > imgArea * 0.97) continue;
-
-        final cv.RotatedRect e = cv.fitEllipse(c);
-        final ep = e.points; // 4 sommets
-        if (ep.length < 4) continue;
-        final double ecx = (ep[0].x + ep[1].x + ep[2].x + ep[3].x) / 4.0;
-        final double ecy = (ep[0].y + ep[1].y + ep[2].y + ep[3].y) / 4.0;
-        final double mAx = (ep[0].x + ep[1].x) / 2.0;
-        final double mAy = (ep[0].y + ep[1].y) / 2.0;
-        final double mBx = (ep[1].x + ep[2].x) / 2.0;
-        final double mBy = (ep[1].y + ep[2].y) / 2.0;
-        final double w =
-            2 * math.sqrt(math.pow(mAx - ecx, 2) + math.pow(mAy - ecy, 2));
-        final double h =
-            2 * math.sqrt(math.pow(mBx - ecx, 2) + math.pow(mBy - ecy, 2));
-        if (w <= 1 || h <= 1) continue;
-
-        // À quel point le contour ressemble-t-il vraiment à son ellipse ?
-        // On compare l'aire du contour à l'aire de l'ellipse ajustée.
-        final double ellipseArea = math.pi * (w / 2) * (h / 2);
-        if (ellipseArea <= 0) continue;
-        final double fitRatio = area / ellipseArea; // ~1 si bon ajustement
-        if (fitRatio < 0.7 || fitRatio > 1.3) continue;
-
-        // Score = taille de l'ellipse (on veut la cible la plus grande)
-        final double score = ellipseArea;
-        if (score > bestScore) {
-          bestScore = score;
-          bestEllipse = e;
-        }
-      }
-
-      if (bestEllipse == null) {
-        return RectifyResult(
-          outputPath: inputPath,
-          rectified: false,
-          estimatedTiltDegrees: 0,
-          message: 'Aucune cible circulaire détectée',
-        );
-      }
-
-      // ── 3. Extraire les 4 sommets de l'ellipse (robuste à la version d'API) ─
-      // RotatedRect.points renvoie les 4 coins de la boîte englobant l'ellipse.
-      // On en dérive nous-mêmes le centre, les demi-axes et l'orientation, ce
-      // qui évite de dépendre de la forme exacte de `.size` / `.center`
-      // (record vs objet) qui varie selon les versions d'opencv_dart.
-      final pts = bestEllipse.points; // List<Point2f> de 4 sommets
-
-      double px(int i) => pts[i].x;
-      double py(int i) => pts[i].y;
-
-      // Centre = moyenne des 4 sommets
-      final double cx = (px(0) + px(1) + px(2) + px(3)) / 4.0;
-      final double cy = (py(0) + py(1) + py(2) + py(3)) / 4.0;
-
-      // Milieux de deux côtés adjacents → extrémités des deux demi-axes
-      // Côté 0-1 et côté 1-2 (ordre des sommets d'un RotatedRect)
-      final double m01x = (px(0) + px(1)) / 2.0;
-      final double m01y = (py(0) + py(1)) / 2.0;
-      final double m12x = (px(1) + px(2)) / 2.0;
-      final double m12y = (py(1) + py(2)) / 2.0;
-
-      // Demi-axes = distance centre → milieu de chaque côté
-      final double axisA =
-          math.sqrt(math.pow(m01x - cx, 2) + math.pow(m01y - cy, 2));
-      final double axisB =
-          math.sqrt(math.pow(m12x - cx, 2) + math.pow(m12y - cy, 2));
-
-      final double majorAxis = math.max(axisA, axisB);
-      final double minorAxis = math.min(axisA, axisB);
-      if (majorAxis <= 1) {
-        return RectifyResult(
-          outputPath: inputPath,
-          rectified: false,
-          estimatedTiltDegrees: 0,
-          message: 'Ellipse dégénérée',
-        );
-      }
-
-      final double axisRatio = minorAxis / majorAxis; // 1 = cercle parfait
-      final double tiltDeg =
-          math.acos(axisRatio.clamp(0.0, 1.0)) * (180.0 / math.pi);
-
-      // Déjà quasiment de face → on ne touche pas (évite le flou inutile)
-      if (axisRatio >= minTiltRatioToRectify) {
-        cv.imwrite(outputPath, src);
-        return RectifyResult(
-          outputPath: outputPath,
-          rectified: false,
-          estimatedTiltDegrees: tiltDeg,
-          message: 'Cible déjà de face',
-        );
-      }
-
-      // ── 4. Construire la transformation de perspective ────────────────────
-      // Source : extrémités des deux axes de l'ellipse (4 points).
-      // Destination : extrémités des axes d'un cercle parfait centré.
-      // On obtient les extrémités en prolongeant centre→milieu-de-côté.
-      final srcPts = cv.VecPoint.fromList([
-        cv.Point((cx + (m01x - cx)).round(), (cy + (m01y - cy)).round()),
-        cv.Point((cx - (m01x - cx)).round(), (cy - (m01y - cy)).round()),
-        cv.Point((cx + (m12x - cx)).round(), (cy + (m12y - cy)).round()),
-        cv.Point((cx - (m12x - cx)).round(), (cy - (m12y - cy)).round()),
-      ]);
-
-      // Cible : cercle parfait centré, rayon R, dans une image carrée.
-      // L'axe "A" (m01) devient l'axe horizontal, l'axe "B" (m12) le vertical.
-      final double out = outputSize.toDouble();
-      final double center = out / 2;
-      final double radius = (out / 2) / marginFactor;
-      final dstPts = cv.VecPoint.fromList([
-        cv.Point((center + radius).round(), center.round()),
-        cv.Point((center - radius).round(), center.round()),
-        cv.Point(center.round(), (center + radius).round()),
-        cv.Point(center.round(), (center - radius).round()),
-      ]);
-
-      final cv.Mat transform = cv.getPerspectiveTransform(srcPts, dstPts);
-
-      final cv.Mat warped = cv.warpPerspective(
-        src,
-        transform,
-        (outputSize, outputSize),
-        flags: cv.INTER_LINEAR,
-        borderMode: cv.BORDER_CONSTANT,
-      );
-
-      cv.imwrite(outputPath, warped);
-
-      return RectifyResult(
-        outputPath: outputPath,
-        rectified: true,
-        estimatedTiltDegrees: tiltDeg,
-        message: 'Cible redressée (inclinaison ${tiltDeg.toStringAsFixed(1)}°)',
-      );
-    } catch (e) {
-      debugPrint('TargetRectify erreur: $e');
-      // En cas de pépin, on renvoie l'original pour ne jamais perdre la photo
-      return RectifyResult(
-        outputPath: inputPath,
-        rectified: false,
-        estimatedTiltDegrees: 0,
-        message: 'Erreur de traitement: $e',
-      );
-    }
-  }
-}

linux/flutter/generated_plugin_registrant.cc

@@ -7,9 +7,13 @@
 #include "generated_plugin_registrant.h"
 
 #include <file_selector_linux/file_selector_plugin.h>
+#include <url_launcher_linux/url_launcher_plugin.h>
 
 void fl_register_plugins(FlPluginRegistry* registry) {
   g_autoptr(FlPluginRegistrar) file_selector_linux_registrar =
       fl_plugin_registry_get_registrar_for_plugin(registry, "FileSelectorPlugin");
   file_selector_plugin_register_with_registrar(file_selector_linux_registrar);
+  g_autoptr(FlPluginRegistrar) url_launcher_linux_registrar =
+      fl_plugin_registry_get_registrar_for_plugin(registry, "UrlLauncherPlugin");
+  url_launcher_plugin_register_with_registrar(url_launcher_linux_registrar);
 }

linux/flutter/generated_plugins.cmake

@@ -4,6 +4,7 @@
 
 list(APPEND FLUTTER_PLUGIN_LIST
   file_selector_linux
+  url_launcher_linux
 )
 
 list(APPEND FLUTTER_FFI_PLUGIN_LIST

macos/Flutter/GeneratedPluginRegistrant.swift

@@ -7,12 +7,14 @@ import Foundation
 
 import device_info_plus
 import file_selector_macos
+import share_plus
 import shared_preferences_foundation
 import sqflite_darwin
 
 func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
   DeviceInfoPlusMacosPlugin.register(with: registry.registrar(forPlugin: "DeviceInfoPlusMacosPlugin"))
   FileSelectorPlugin.register(with: registry.registrar(forPlugin: "FileSelectorPlugin"))
+  SharePlusMacosPlugin.register(with: registry.registrar(forPlugin: "SharePlusMacosPlugin"))
   SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin"))
   SqflitePlugin.register(with: registry.registrar(forPlugin: "SqflitePlugin"))
 }

pubspec.lock

@@ -201,6 +201,30 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "7.0.1"
+  file_selector:
+    dependency: "direct main"
+    description:
+      name: file_selector
+      sha256: bd15e43e9268db636b53eeaca9f56324d1622af30e5c34d6e267649758c84d9a
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.0"
+  file_selector_android:
+    dependency: transitive
+    description:
+      name: file_selector_android
+      sha256: "89243030ea4b3463fb402b44d5eeacc4ccb1c46a88870cb2a5080d693200c1ed"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.5.2+6"
+  file_selector_ios:
+    dependency: transitive
+    description:
+      name: file_selector_ios
+      sha256: e2ecf2885c121691ce13b60db3508f53c01f869fb6e8dc5c1cfa771e4c46aeca
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.5.3+5"
   file_selector_linux:
     dependency: transitive
     description:
@@ -225,6 +249,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.7.0"
+  file_selector_web:
+    dependency: transitive
+    description:
+      name: file_selector_web
+      sha256: "73181fbc5257776d8ecaa6a94ab3c8e920ad143b9132a6d984a9271dfc6928d3"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.9.5"
   file_selector_windows:
     dependency: transitive
     description:
@@ -293,30 +325,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.1.3"
-  google_mlkit_commons:
-    dependency: transitive
-    description:
-      name: google_mlkit_commons
-      sha256: "3e69fea4211727732cc385104e675ad1e40b29f12edd492ee52fa108423a6124"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.11.1"
-  google_mlkit_document_scanner:
-    dependency: "direct main"
-    description:
-      name: google_mlkit_document_scanner
-      sha256: "67428ddb853880c8185049a5834cd328e6420921a74786f6aadee0b76f8536bd"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.2.1"
-  google_mlkit_object_detection:
-    dependency: "direct main"
-    description:
-      name: google_mlkit_object_detection
-      sha256: "9dd35886972e18747e22098f8ebee78d30716a99a789bb2e3a65a24229e031e7"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.15.1"
   hooks:
     dependency: transitive
     description:
@@ -733,6 +741,22 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.2.0"
+  share_plus:
+    dependency: "direct main"
+    description:
+      name: share_plus
+      sha256: "34f00f9becd2743c1fb05363d624f9f70d37f7ccdcdda47450bc0b8c9d327b8c"
+      url: "https://pub.dev"
+    source: hosted
+    version: "13.3.0"
+  share_plus_platform_interface:
+    dependency: transitive
+    description:
+      name: share_plus_platform_interface
+      sha256: "365ef7379fc22507256adda3385152942ffce08935452bc972c2e52a0bebae41"
+      url: "https://pub.dev"
+    source: hosted
+    version: "7.2.0"
   shared_preferences:
     dependency: "direct main"
     description:
@@ -922,6 +946,38 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.4.0"
+  url_launcher_linux:
+    dependency: transitive
+    description:
+      name: url_launcher_linux
+      sha256: d5e14138b3bc193a0f63c10a53c94b91d399df0512b1f29b94a043db7482384a
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.2.2"
+  url_launcher_platform_interface:
+    dependency: transitive
+    description:
+      name: url_launcher_platform_interface
+      sha256: "552f8a1e663569be95a8190206a38187b531910283c3e982193e4f2733f01029"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.3.2"
+  url_launcher_web:
+    dependency: transitive
+    description:
+      name: url_launcher_web
+      sha256: "85c81589622fbc87c1c683aaea164d3604a7777495a79d91e39ffcdec39ddb34"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.4.3"
+  url_launcher_windows:
+    dependency: transitive
+    description:
+      name: url_launcher_windows
+      sha256: "712c70ab1b99744ff066053cbe3e80c73332b38d46e5e945c98689b2e66fc15f"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.1.5"
   uuid:
     dependency: "direct main"
     description:

pubspec.yaml

@@ -1,5 +1,5 @@
 name: bully
-description: "A new Flutter project."
+description: "Application d'analyse de cibles de tir : capture, centrage, plotting manuel des impacts, scores et statistiques."
 # The following line prevents the package from being accidentally published to
 # pub.dev using `flutter pub publish`. This is preferred for private packages.
 publish_to: 'none' # Remove this line if you wish to publish to pub.dev
@@ -38,11 +38,9 @@ dependencies:
   cupertino_icons: ^1.0.8
   sensors_plus: ^4.0.2
   opencv_dart: ^2.1.0
-  google_mlkit_object_detection: ^0.15.0
 
   # Image capture from camera/gallery
   image_picker: ^1.2.1
-  google_mlkit_document_scanner: ^0.2.0
 
   # Local database for history
   sqflite: ^2.3.2
@@ -72,9 +70,8 @@ dependencies:
   shared_preferences: ^2.5.5
   crypto: ^3.0.7
   camera: ^0.12.0+1
-
-  # Machine Learning for YOLOv8
-  # tflite_flutter: ^0.11.0
+  share_plus: ^13.3.0
+  file_selector: ^1.1.0
 
 dev_dependencies:
   flutter_test:
@@ -98,11 +95,8 @@ flutter:
   # the material Icons class.
   uses-material-design: true
 
-  # To add assets to your application, add an assets section, like this:
-  # assets:
-  #   - assets/models/yolov8n_32.tflite
-  #   - images/a_dot_burr.jpeg
-  #   - images/a_dot_ham.jpeg
+  assets:
+    - assets/icons/
 
   # An image asset can refer to one or more resolution-specific "variants", see
   # https://flutter.dev/to/resolution-aware-images

test/services/backup_service_test.dart

@@ -0,0 +1,372 @@
+import 'dart:convert';
+import 'dart:io';
+
+import 'package:flutter_test/flutter_test.dart';
+
+import 'package:bully/data/models/maintenance.dart';
+import 'package:bully/data/models/session.dart';
+import 'package:bully/data/models/shot.dart';
+import 'package:bully/data/models/target_analysis.dart';
+import 'package:bully/data/models/target_type.dart';
+import 'package:bully/data/models/weapon.dart';
+import 'package:bully/data/repositories/session_repository.dart';
+import 'package:bully/services/backup_service.dart';
+
+/// Dépôt en mémoire : évite d'ouvrir une vraie base SQLite dans les tests.
+class _FakeRepository extends SessionRepository {
+  final List<Session> sessions;
+  final List<Weapon> weapons;
+  final List<MaintenanceEntry> maintenance;
+  final List<List<int>> savedImages = [];
+
+  _FakeRepository({
+    List<Session>? sessions,
+    List<Weapon>? weapons,
+    List<MaintenanceEntry>? maintenance,
+  })  : sessions = sessions ?? [],
+        weapons = weapons ?? [],
+        maintenance = maintenance ?? [];
+
+  @override
+  Future<List<Session>> getAllSessions({int? limit, int? offset}) async =>
+      sessions;
+
+  @override
+  Future<List<Weapon>> getWeapons() async => weapons;
+
+  @override
+  Future<List<MaintenanceEntry>> getAllMaintenance() async => maintenance;
+
+  @override
+  Future<void> saveSession(Session session) async {
+    sessions.removeWhere((s) => s.id == session.id);
+    sessions.add(session);
+  }
+
+  @override
+  Future<void> saveWeapon(Weapon weapon) async {
+    weapons.removeWhere((w) => w.id == weapon.id);
+    weapons.add(weapon);
+  }
+
+  @override
+  Future<void> saveMaintenanceEntry(MaintenanceEntry entry) async {
+    maintenance.removeWhere((e) => e.id == entry.id);
+    maintenance.add(entry);
+  }
+
+  @override
+  Future<String> saveImageBytes(List<int> bytes, String extension) async {
+    savedImages.add(bytes);
+    return '/imported/image_${savedImages.length}$extension';
+  }
+}
+
+Session _session({String id = 's1', String weapon = 'Glock 17'}) {
+  return Session(
+    id: id,
+    weapon: weapon,
+    weaponId: 'w1',
+    maxShotsPerTarget: 5,
+    createdAt: DateTime(2026, 3, 14, 10, 30),
+    notes: 'Entraînement',
+    distance: 25,
+    analyses: [
+      TargetAnalysis(
+        id: '$id-a1',
+        sessionId: id,
+        targetType: TargetType.concentric,
+        imagePath: '/photos/$id.jpg',
+        totalScore: 18,
+        groupingDiameter: 0.12,
+        groupingCenterX: 0.5,
+        groupingCenterY: 0.48,
+        createdAt: DateTime(2026, 3, 14, 10, 35),
+        targetCenterX: 0.5,
+        targetCenterY: 0.5,
+        targetRadius: 0.4,
+        shots: [
+          Shot(id: '$id-t1', x: 0.5, y: 0.5, score: 10, analysisId: '$id-a1'),
+          Shot(id: '$id-t2', x: 0.55, y: 0.52, score: 8, analysisId: '$id-a1'),
+        ],
+      ),
+    ],
+  );
+}
+
+Weapon _weapon() => Weapon(
+      id: 'w1',
+      name: 'Glock 17',
+      type: WeaponType.handgun,
+      caliber: '9mm',
+      magazineCount: 3,
+      magazineCapacity: 17,
+      createdAt: DateTime(2025, 1, 5),
+      optic: 'Point rouge',
+      customName: 'La bleue',
+    );
+
+MaintenanceEntry _maintenance() => MaintenanceEntry(
+      id: 'm1',
+      weaponId: 'w1',
+      type: MaintenanceType.cleaning,
+      description: 'Nettoyage complet',
+      date: DateTime(2026, 2, 1),
+      roundsSinceLastMaintenance: 500,
+    );
+
+/// Sérialise puis relit la sauvegarde comme le ferait un vrai fichier partagé.
+Future<BackupPreview> _roundTrip(
+  Map<String, dynamic> json,
+  BackupService service,
+) async {
+  final dir = await Directory.systemTemp.createTemp('impact_backup_test');
+  addTearDown(() => dir.delete(recursive: true));
+  final file = File('${dir.path}/backup.json');
+  await file.writeAsString(jsonEncode(json));
+  return service.readBackup(file);
+}
+
+void main() {
+  group('export', () {
+    test('la sauvegarde contient sessions, armurerie et stats', () async {
+      final source = _FakeRepository(
+        sessions: [_session()],
+        weapons: [_weapon()],
+        maintenance: [_maintenance()],
+      );
+      final json = await BackupService(repository: source).buildBackupJson();
+
+      expect(json['format'], BackupService.formatId);
+      expect(json['counts'], {
+        'sessions': 1,
+        'targets': 1,
+        'shots': 2,
+        'weapons': 1,
+        'maintenance': 1,
+      });
+
+      // Les stats sont recalculées et écrites telles quelles dans le fichier.
+      final stats = json['statistics'] as Map<String, dynamic>;
+      expect(stats['total_shots'], 2);
+      expect(stats['total_score'], 18);
+
+      // L'entretien voyage avec son arme.
+      final weapon = (json['weapons'] as List).single as Map<String, dynamic>;
+      expect((weapon['maintenance'] as List), hasLength(1));
+      expect(json['orphan_maintenance'], isEmpty);
+    });
+
+    test('sans photos, aucune image n\'est encodée', () async {
+      final source = _FakeRepository(sessions: [_session()]);
+      final json = await BackupService(repository: source).buildBackupJson();
+
+      final session = (json['sessions'] as List).single as Map<String, dynamic>;
+      final analysis = (session['analyses'] as List).single as Map<String, dynamic>;
+      expect(analysis.containsKey('image_base64'), isFalse);
+    });
+
+    test('l\'entretien d\'une arme supprimée n\'est pas perdu', () async {
+      final source = _FakeRepository(maintenance: [_maintenance()]);
+      final json = await BackupService(repository: source).buildBackupJson();
+
+      expect(json['orphan_maintenance'], hasLength(1));
+    });
+  });
+
+  group('import', () {
+    test('aller-retour complet : tout est restauré à l\'identique', () async {
+      final source = _FakeRepository(
+        sessions: [_session()],
+        weapons: [_weapon()],
+        maintenance: [_maintenance()],
+      );
+      final json = await BackupService(repository: source).buildBackupJson();
+
+      final target = _FakeRepository();
+      final service = BackupService(repository: target);
+      final preview = await _roundTrip(json, service);
+
+      expect(preview.sessionCount, 1);
+      expect(preview.shotCount, 2);
+      expect(preview.weaponCount, 1);
+      expect(preview.maintenanceCount, 1);
+      expect(preview.hasImages, isFalse);
+
+      final result = await service.applyBackup(preview);
+      expect(result.errors, isEmpty);
+      expect(result.sessions, 1);
+      expect(result.weapons, 1);
+      expect(result.maintenance, 1);
+
+      final session = target.sessions.single;
+      expect(session.id, 's1');
+      expect(session.weapon, 'Glock 17');
+      expect(session.distance, 25);
+      expect(session.createdAt, DateTime(2026, 3, 14, 10, 30));
+      expect(session.totalShots, 2);
+      expect(session.totalScore, 18);
+      expect(session.analyses.single.targetRadius, 0.4);
+      expect(session.analyses.single.shots.first.score, 10);
+
+      expect(target.weapons.single.customName, 'La bleue');
+      expect(target.weapons.single.magazineCapacity, 17);
+      expect(target.maintenance.single.roundsSinceLastMaintenance, 500);
+    });
+
+    test('réimporter deux fois ne crée pas de doublon', () async {
+      final source = _FakeRepository(
+        sessions: [_session()],
+        weapons: [_weapon()],
+      );
+      final json = await BackupService(repository: source).buildBackupJson();
+
+      final target = _FakeRepository();
+      final service = BackupService(repository: target);
+      await service.applyBackup(await _roundTrip(json, service));
+      await service.applyBackup(await _roundTrip(json, service));
+
+      expect(target.sessions, hasLength(1));
+      expect(target.weapons, hasLength(1));
+    });
+
+    test('les photos embarquées sont réécrites sur le disque', () async {
+      final bytes = utf8.encode('fausse-image');
+      final json = {
+        'format': BackupService.formatId,
+        'version': 1,
+        'sessions': [
+          {
+            'id': 's1',
+            'weapon': 'Glock 17',
+            'max_shots_per_target': 5,
+            'created_at': '2026-03-14T10:30:00.000',
+            'distance': 25,
+            'analyses': [
+              {
+                'id': 'a1',
+                'session_id': 's1',
+                'target_type': 'concentric',
+                'image_path': '/ancien/chemin.jpg',
+                'total_score': 10,
+                'created_at': '2026-03-14T10:35:00.000',
+                'image_extension': '.jpg',
+                'image_base64': base64Encode(bytes),
+                'shots': [
+                  {'id': 't1', 'x': 0.5, 'y': 0.5, 'score': 10, 'analysis_id': 'a1'},
+                ],
+              },
+            ],
+          },
+        ],
+      };
+
+      final target = _FakeRepository();
+      final service = BackupService(repository: target);
+      final preview = await _roundTrip(json, service);
+      expect(preview.hasImages, isTrue);
+
+      final result = await service.applyBackup(preview);
+      expect(result.images, 1);
+      expect(target.savedImages.single, bytes);
+      expect(target.sessions.single.analyses.single.imagePath,
+          '/imported/image_1.jpg');
+    });
+
+    test('un nombre entier là où un décimal est attendu ne casse rien', () async {
+      // JSON ne distingue pas 1 de 1.0 : un fichier édité à la main peut
+      // livrer des entiers là où les modèles attendent des doubles.
+      final json = {
+        'format': BackupService.formatId,
+        'version': 1,
+        'sessions': [
+          {
+            'id': 's1',
+            'weapon': 'Glock 17',
+            'max_shots_per_target': 5,
+            'created_at': '2026-03-14T10:30:00.000',
+            'analyses': [
+              {
+                'id': 'a1',
+                'session_id': 's1',
+                'target_type': 'concentric',
+                'image_path': '/photo.jpg',
+                'total_score': 10,
+                'created_at': '2026-03-14T10:35:00.000',
+                'target_radius': 1,
+                'grouping_diameter': 0,
+                'shots': const [],
+              },
+            ],
+          },
+        ],
+      };
+
+      final target = _FakeRepository();
+      final service = BackupService(repository: target);
+      final result = await service.applyBackup(await _roundTrip(json, service));
+
+      expect(result.errors, isEmpty);
+      expect(target.sessions.single.analyses.single.targetRadius, 1.0);
+      expect(target.sessions.single.analyses.single.groupingDiameter, 0.0);
+    });
+
+    test('un fichier étranger est refusé avec un message clair', () async {
+      final service = BackupService(repository: _FakeRepository());
+      final dir = await Directory.systemTemp.createTemp('impact_backup_test');
+      addTearDown(() => dir.delete(recursive: true));
+
+      final notJson = File('${dir.path}/photo.jpg');
+      await notJson.writeAsString('pas du json du tout');
+      expect(
+        () => service.readBackup(notJson),
+        throwsA(isA<BackupFormatException>()),
+      );
+
+      final otherJson = File('${dir.path}/autre.json');
+      await otherJson.writeAsString('{"hello": "world"}');
+      expect(
+        () => service.readBackup(otherJson),
+        throwsA(isA<BackupFormatException>()),
+      );
+    });
+
+    test('une sauvegarde plus récente que l\'app est refusée', () async {
+      final service = BackupService(repository: _FakeRepository());
+      final dir = await Directory.systemTemp.createTemp('impact_backup_test');
+      addTearDown(() => dir.delete(recursive: true));
+
+      final file = File('${dir.path}/futur.json');
+      await file.writeAsString(jsonEncode({
+        'format': BackupService.formatId,
+        'version': BackupService.formatVersion + 1,
+      }));
+
+      expect(
+        () => service.readBackup(file),
+        throwsA(isA<BackupFormatException>()),
+      );
+    });
+
+    test('une session corrompue est ignorée sans bloquer les autres', () async {
+      final valid = await BackupService(
+        repository: _FakeRepository(sessions: [_session()]),
+      ).buildBackupJson();
+      // On injecte une session sans date : elle doit être la seule écartée.
+      (valid['sessions'] as List).add({
+        'id': 'corrompue',
+        'weapon': 'X',
+        'max_shots_per_target': 5,
+        'analyses': const [],
+      });
+
+      final target = _FakeRepository();
+      final service = BackupService(repository: target);
+      final result = await service.applyBackup(await _roundTrip(valid, service));
+
+      expect(result.sessions, 1);
+      expect(result.errors, hasLength(1));
+      expect(target.sessions.single.id, 's1');
+    });
+  });
+}

test/services/grouping_analyzer_service_test.dart

@@ -0,0 +1,60 @@
+import 'package:flutter_test/flutter_test.dart';
+
+import 'package:bully/data/models/shot.dart';
+import 'package:bully/services/grouping_analyzer_service.dart';
+
+Shot _shot(String id, double x, double y) =>
+    Shot(id: id, x: x, y: y, score: 0, analysisId: '');
+
+void main() {
+  final service = GroupingAnalyzerService();
+
+  group('analyzeGrouping', () {
+    test('liste vide → résultat vide', () {
+      final result = service.analyzeGrouping([]);
+      expect(result.shotCount, 0);
+      expect(result.diameter, 0);
+    });
+
+    test('un seul tir → diamètre nul, centre sur le tir', () {
+      final result = service.analyzeGrouping([_shot('a', 0.3, 0.7)]);
+      expect(result.shotCount, 1);
+      expect(result.centerX, 0.3);
+      expect(result.centerY, 0.7);
+      expect(result.diameter, 0);
+    });
+
+    test('deux tirs → centroïde au milieu et diamètre = écart', () {
+      final result = service.analyzeGrouping([
+        _shot('a', 0.4, 0.5),
+        _shot('b', 0.6, 0.5),
+      ]);
+
+      expect(result.centerX, closeTo(0.5, 1e-9));
+      expect(result.centerY, closeTo(0.5, 1e-9));
+      expect(result.diameter, closeTo(0.2, 1e-9));
+      expect(result.meanRadius, closeTo(0.1, 1e-9));
+      // Deux tirs équidistants du centroïde → dispersion nulle.
+      expect(result.standardDeviation, closeTo(0.0, 1e-9));
+    });
+
+    test('le diamètre est la plus grande distance entre deux tirs', () {
+      final result = service.analyzeGrouping([
+        _shot('a', 0.2, 0.5),
+        _shot('b', 0.5, 0.5),
+        _shot('c', 0.8, 0.5),
+      ]);
+      expect(result.diameter, closeTo(0.6, 1e-9));
+    });
+  });
+
+  group('getOffsetDescription', () {
+    test('décalage négligeable → Centre', () {
+      expect(service.getOffsetDescription(0.01, -0.01), 'Centre');
+    });
+
+    test('décalage combiné → direction composée', () {
+      expect(service.getOffsetDescription(0.1, -0.1), 'Haut-Droite');
+    });
+  });
+}

test/services/score_calculator_service_test.dart

@@ -0,0 +1,110 @@
+import 'package:flutter_test/flutter_test.dart';
+
+import 'package:bully/data/models/shot.dart';
+import 'package:bully/data/models/target_type.dart';
+import 'package:bully/services/score_calculator_service.dart';
+
+void main() {
+  final service = ScoreCalculatorService();
+
+  group('calculateConcentricScore', () {
+    test('un tir au centre exact vaut 10', () {
+      final score = service.calculateConcentricScore(
+        shotX: 0.5,
+        shotY: 0.5,
+        targetCenterX: 0.5,
+        targetCenterY: 0.5,
+        targetRadius: 0.4,
+      );
+      expect(score, 10);
+    });
+
+    test('un tir hors de la cible vaut 0', () {
+      final score = service.calculateConcentricScore(
+        shotX: 0.95,
+        shotY: 0.5,
+        targetCenterX: 0.5,
+        targetCenterY: 0.5,
+        targetRadius: 0.4,
+      );
+      expect(score, 0);
+    });
+
+    test('un tir à mi-rayon tombe dans la zone attendue', () {
+      // Distance normalisée ≈ 0.475 → 5e anneau (zone 0.5) → score 6.
+      final score = service.calculateConcentricScore(
+        shotX: 0.5,
+        shotY: 0.69,
+        targetCenterX: 0.5,
+        targetCenterY: 0.5,
+        targetRadius: 0.4,
+      );
+      expect(score, 6);
+    });
+
+    test('le ratio d\'image est pris en compte (image paysage 2:1)', () {
+      // dx = 0.15 mais scaled ×2 → distance normalisée 0.75 → score 3.
+      final score = service.calculateConcentricScore(
+        shotX: 0.65,
+        shotY: 0.5,
+        targetCenterX: 0.5,
+        targetCenterY: 0.5,
+        targetRadius: 0.4,
+        imageAspectRatio: 2.0,
+      );
+      expect(score, 3);
+    });
+
+    test('les rayons d\'anneaux personnalisés sont respectés', () {
+      // Distance normalisée 0.3 avec anneaux [0.2, 0.5, 1.0] → 2e anneau → 9.
+      final score = service.calculateConcentricScore(
+        shotX: 0.5,
+        shotY: 0.62,
+        targetCenterX: 0.5,
+        targetCenterY: 0.5,
+        targetRadius: 0.4,
+        ringCount: 3,
+        ringRadii: [0.2, 0.5, 1.0],
+      );
+      expect(score, 9);
+    });
+  });
+
+  group('calculateScores', () {
+    test('agrège le total, le max possible et le pourcentage', () {
+      final shots = [
+        Shot(id: 'a', x: 0.5, y: 0.5, score: 0, analysisId: ''), // centre → 10
+        Shot(id: 'b', x: 0.95, y: 0.5, score: 0, analysisId: ''), // dehors → 0
+      ];
+
+      final result = service.calculateScores(
+        shots: shots,
+        targetType: TargetType.concentric,
+        targetCenterX: 0.5,
+        targetCenterY: 0.5,
+        targetRadius: 0.4,
+      );
+
+      expect(result.totalScore, 10);
+      expect(result.maxPossibleScore, 20);
+      expect(result.percentage, closeTo(50.0, 0.001));
+      expect(result.shotCount, 2);
+      expect(result.scoreDistribution[10], 1);
+      expect(result.scoreDistribution[0], 1);
+    });
+
+    test('une liste vide donne un résultat neutre', () {
+      final result = service.calculateScores(
+        shots: [],
+        targetType: TargetType.concentric,
+        targetCenterX: 0.5,
+        targetCenterY: 0.5,
+        targetRadius: 0.4,
+      );
+
+      expect(result.totalScore, 0);
+      expect(result.maxPossibleScore, 0);
+      expect(result.percentage, 0.0);
+    });
+  });
+}

test/widget_test.dart

@@ -1,20 +1,32 @@
-// This is a basic Flutter widget test.
+// Test de fumée sur un widget pur (sans providers ni base de données).
 //
-// To perform an interaction with a widget in your test, use the WidgetTester
-// utility in the flutter_test package. For example, you can send tap and scroll
-// gestures. You can also use WidgetTester to find child widgets in the widget
-// tree, read text, and verify that the values of widget properties are correct.
+// Le montage complet de BullyApp exige les providers globaux et une base
+// SQLite initialisée ; pour un test widget rapide et stable, on valide ici
+// le rendu d'un composant autonome.
 
+import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 
-import 'package:bully/app.dart';
+import 'package:bully/features/home/widgets/stats_card.dart';
 
 void main() {
-  testWidgets('App loads correctly', (WidgetTester tester) async {
-    // Build our app and trigger a frame.
-    await tester.pumpWidget(const BullyApp());
+  testWidgets('StatsCard affiche le titre, la valeur et l\'icône',
+      (WidgetTester tester) async {
+    await tester.pumpWidget(
+      const MaterialApp(
+        home: Scaffold(
+          body: StatsCard(
+            icon: Icons.gps_fixed,
+            title: 'Tirs',
+            value: '42',
+            color: Colors.blue,
+          ),
+        ),
+      ),
+    );
 
-    // Verify that the app title is displayed.
-    expect(find.text('Bully'), findsOneWidget);
+    expect(find.text('Tirs'), findsOneWidget);
+    expect(find.text('42'), findsOneWidget);
+    expect(find.byIcon(Icons.gps_fixed), findsOneWidget);
   });
 }

tests/find_homography_test.dart

@@ -1,12 +0,0 @@
-import 'package:opencv_dart/opencv_dart.dart' as cv;
-
-void main() {
-  var p1 = cv.VecPoint.fromList([cv.Point(0, 0), cv.Point(1, 1)]);
-  var p2 = cv.VecPoint2f.fromList([cv.Point2f(0, 0), cv.Point2f(1, 1)]);
-
-  // Is it p1.mat ?
-  // Or is it cv.findHomography(p1, p1) but actually needs specific types ?
-  cv.Mat mat1 = cv.Mat.fromVec(p1);
-  cv.Mat mat2 = cv.Mat.fromVec(p2);
-  cv.findHomography(mat1, mat2);
-}

tests/opencv_quad_test.dart

@@ -1,7 +0,0 @@
-import 'package:opencv_dart/opencv_dart.dart' as cv;
-
-void main() {
-  print(cv.approxPolyDP);
-  print(cv.arcLength);
-  print(cv.contourArea);
-}

tests/test_homography.dart

@@ -1,5 +0,0 @@
-import 'package:opencv_dart/opencv_dart.dart' as cv;
-
-void main() {
-  print(cv.findHomography);
-}

windows/flutter/generated_plugin_registrant.cc

@@ -8,10 +8,16 @@
 
 #include <file_selector_windows/file_selector_windows.h>
 #include <permission_handler_windows/permission_handler_windows_plugin.h>
+#include <share_plus/share_plus_windows_plugin_c_api.h>
+#include <url_launcher_windows/url_launcher_windows.h>
 
 void RegisterPlugins(flutter::PluginRegistry* registry) {
   FileSelectorWindowsRegisterWithRegistrar(
       registry->GetRegistrarForPlugin("FileSelectorWindows"));
   PermissionHandlerWindowsPluginRegisterWithRegistrar(
       registry->GetRegistrarForPlugin("PermissionHandlerWindowsPlugin"));
+  SharePlusWindowsPluginCApiRegisterWithRegistrar(
+      registry->GetRegistrarForPlugin("SharePlusWindowsPluginCApi"));
+  UrlLauncherWindowsRegisterWithRegistrar(
+      registry->GetRegistrarForPlugin("UrlLauncherWindows"));
 }

windows/flutter/generated_plugins.cmake

@@ -5,6 +5,8 @@
 list(APPEND FLUTTER_PLUGIN_LIST
   file_selector_windows
   permission_handler_windows
+  share_plus
+  url_launcher_windows
 )
 
 list(APPEND FLUTTER_FFI_PLUGIN_LIST