Add MacDive native XML import (Milestone 2 of 4)

CHANGELOG.md

@@ -11,6 +11,14 @@ All notable changes to Submersion are documented in this file.
   name and captain, dive operator, surface conditions, weather (stored
   in the existing weather description field), plus site water type, body
   of water, and difficulty rating.
+- **MacDive native XML import.** MacDive's own `.xml` logbook format is now
+  a first-class import source. Unlike MacDive UDDF (which doesn't emit tags),
+  the native XML export carries dive tags — so users migrating tag metadata
+  from MacDive should choose this format. Supports both Imperial and Metric
+  unit modes; depths/temperatures/pressures are converted to the canonical
+  internal units at the reader boundary.
+- **MacDive (XML) source override** in the import wizard's detected-source
+  dropdown, alongside the existing MacDive (CSV) option.
 - Cross-format import deduplication: stable per-dive UUIDs from MacDive,
   Shearwater Cloud, Subsurface SSRF, and generic UDDF are now preserved on
   the `dive_data_sources` sidecar. Re-importing the same dives in a

docs/superpowers/plans/2026-04-21-macdive-native-xml-import.md

@@ -14,6 +14,29 @@
 
 ---
 
+## Milestone 2 Status — COMPLETE
+
+- All 11 tasks landed. 10 implementation commits + 1 commit that cherry-picked
+  the MacDiveValueMapper onto this branch after it originally landed on main
+  by mistake.
+- New `ImportFormat.macdiveXml` with source override and format-detector
+  recognition (DOCTYPE + `<dives>`/`<schema>` fallback).
+- `MacDiveXmlReader` produces typed `MacDiveXmlLogbook` from XML with SI
+  canonical units at the boundary. Imperial↔Metric verified via an explicit
+  imperial fixture.
+- `MacDiveXmlParser` implements `ImportParser`, dedups sites/buddies/tags/gear
+  inline, routes raw MacDive strings through `MacDiveValueMapper` so
+  `waterType`/`entryType` resolve to Submersion enums.
+- Gated real-sample test (`@Tags(['real-data'])`) asserts 540 dives, tag
+  preservation (20+ unique tags), site dedup, unit-conversion sanity.
+- Full test suite passes (7000+ tests).
+
+Next: M3 (MacDive SQLite) builds on top of this. Key shared assets —
+`MacDiveValueMapper`, `MacDiveUnitConverter` — are reused by M3's SQLite
+parser.
+
+---
+
 ## File Structure
 
 | File | Role | New / Modified |

lib/features/universal_import/data/models/import_enums.dart

@@ -2,6 +2,7 @@
 enum ImportFormat {
   csv,
   uddf,
+  macdiveXml,
   subsurfaceXml,
   divingLogXml,
   suuntoSml,
@@ -16,6 +17,7 @@ enum ImportFormat {
   String get displayName => switch (this) {
     csv => 'CSV',
     uddf => 'UDDF',
+    macdiveXml => 'MacDive XML',
     subsurfaceXml => 'Subsurface XML',
     divingLogXml => 'Diving Log XML',
     suuntoSml => 'Suunto SML',
@@ -30,7 +32,7 @@ enum ImportFormat {
 
   /// Whether this format has a parser implemented in v1.5.
   bool get isSupported => switch (this) {
-    csv || uddf || subsurfaceXml || fit || shearwaterDb => true,
+    csv || uddf || subsurfaceXml || fit || shearwaterDb || macdiveXml => true,
     _ => false,
   };
 }
@@ -123,6 +125,11 @@ class SourceOverrideOption {
       format: ImportFormat.csv,
       displayName: 'MacDive (CSV)',
     ),
+    SourceOverrideOption(
+      sourceApp: SourceApp.macdive,
+      format: ImportFormat.macdiveXml,
+      displayName: 'MacDive (XML)',
+    ),
     SourceOverrideOption(
       sourceApp: SourceApp.divingLog,
       format: ImportFormat.csv,