Merge eeee06a432 into 6d499c782a

mobile/lib/domain/services/people.service.dart

@@ -14,6 +14,10 @@ class DriftPeopleService {
     return _repository.getAssetPeople(assetId);
   }
 
+  Stream<DriftPerson?> watchPersonById(String personId) {
+    return _repository.watchPersonById(personId);
+  }
+
   Future<List<DriftPerson>> getAllPeople() {
     return _repository.getAllPeople();
   }
@@ -23,6 +27,11 @@ class DriftPeopleService {
     return _repository.updateName(personId, name);
   }
 
+  Future<int> mergePeople({required String targetPersonId, required List<String> mergePersonIds}) async {
+    await _personApiRepository.merge(targetPersonId, mergePersonIds);
+    return _repository.mergePeople(targetPersonId, mergePersonIds);
+  }
+
   Future<int> updateBrithday(String personId, DateTime birthday) async {
     await _personApiRepository.update(personId, birthday: birthday);
     return _repository.updateBirthday(personId, birthday);

mobile/lib/domain/services/person_merge_tracker.service.dart

@@ -0,0 +1,24 @@
+/// Why do we need this?
+/// Say we open the profile page (drift_person.page.dart) for Person A, and then nested above
+/// a image viewer for an image that belongs to Person A.
+///
+/// When the users now merges user A into user B, we can't just listen to
+/// the changes in the profile page, we have to keep track of where the user A (now B)
+/// can be found in the DB.
+///
+/// So when popping back to the profile page (and the user is missing), we check
+/// which other person B we have to display instead.
+class PersonMergeTrackerService {
+  /// Map of merged person ID -> target person ID
+  final Map<String, String> _mergeForwardingMap = {};
+
+  /// Record a person merge operation
+  void recordMerge({required String mergedPersonId, required String targetPersonId}) {
+    _mergeForwardingMap[mergedPersonId] = targetPersonId;
+  }
+
+  /// Get the target person ID for a merged person
+  String? getTargetPersonId(String personId) {
+    return _mergeForwardingMap[personId];
+  }
+}

mobile/lib/infrastructure/repositories/people.repository.dart

@@ -1,5 +1,6 @@
 import 'package:drift/drift.dart';
 import 'package:immich_mobile/domain/models/person.model.dart';
+import 'package:immich_mobile/infrastructure/entities/asset_face.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/entities/person.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
 
@@ -36,6 +37,12 @@ class DriftPeopleRepository extends DriftDatabaseRepository {
     }).get();
   }
 
+  Stream<DriftPerson?> watchPersonById(String personId) {
+    return (_db.select(
+      _db.personEntity,
+    )..where((tbl) => tbl.id.equals(personId))).watchSingleOrNull().map((entity) => entity?.toDto());
+  }
+
   Future<int> updateName(String personId, String name) {
     final query = _db.update(_db.personEntity)..where((row) => row.id.equals(personId));
 
@@ -47,6 +54,20 @@ class DriftPeopleRepository extends DriftDatabaseRepository {
 
     return query.write(PersonEntityCompanion(birthDate: Value(birthday), updatedAt: Value(DateTime.now())));
   }
+
+  Future<int> mergePeople(String targetPersonId, List<String> mergePersonIds) async {
+    return _db.transaction(() async {
+      // Update AssetFaceEntity to point to the target person
+      final updateQuery = _db.update(_db.assetFaceEntity)..where((row) => row.personId.isIn(mergePersonIds));
+      final updatedCount = await updateQuery.write(AssetFaceEntityCompanion(personId: Value(targetPersonId)));
+
+      // Delete merged persons
+      final deleteQuery = _db.delete(_db.personEntity)..where((row) => row.id.isIn(mergePersonIds));
+      final deletedCount = await deleteQuery.go();
+
+      return updatedCount + deletedCount;
+    });
+  }
 }
 
 extension on PersonEntityData {

mobile/lib/presentation/pages/drift_people_collection.page.dart

@@ -83,7 +83,7 @@ class _DriftPeopleCollectionPageState extends ConsumerState<DriftPeopleCollectio
                       children: [
                         GestureDetector(
                           onTap: () {
-                            context.pushRoute(DriftPersonRoute(person: person));
+                            context.pushRoute(DriftPersonRoute(initialPerson: person));
                           },
                           child: Material(
                             shape: const CircleBorder(side: BorderSide.none),

mobile/lib/presentation/pages/drift_person.page.dart

@@ -5,16 +5,20 @@ import 'package:immich_mobile/domain/models/person.model.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/presentation/widgets/people/person_option_sheet.widget.dart';
 import 'package:immich_mobile/presentation/widgets/timeline/timeline.widget.dart';
+import 'package:immich_mobile/providers/infrastructure/people.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/timeline.provider.dart';
+import 'package:immich_mobile/providers/routes.provider.dart';
 import 'package:immich_mobile/providers/user.provider.dart';
+import 'package:immich_mobile/routing/router.dart';
 import 'package:immich_mobile/utils/people.utils.dart';
 import 'package:immich_mobile/widgets/common/person_sliver_app_bar.dart';
+import 'package:logging/logging.dart';
 
 @RoutePage()
 class DriftPersonPage extends ConsumerStatefulWidget {
-  final DriftPerson person;
+  final DriftPerson initialPerson;
 
-  const DriftPersonPage({super.key, required this.person});
+  const DriftPersonPage(this.initialPerson, {super.key});
 
   @override
   ConsumerState<DriftPersonPage> createState() => _DriftPersonPageState();
@@ -23,30 +27,20 @@ class DriftPersonPage extends ConsumerStatefulWidget {
 class _DriftPersonPageState extends ConsumerState<DriftPersonPage> {
   late DriftPerson _person;
 
+  final Logger mergeLogger = Logger("PersonMerge");
+
   @override
   initState() {
     super.initState();
-    _person = widget.person;
+    _person = widget.initialPerson;
   }
 
   Future<void> handleEditName(BuildContext context) async {
-    final newName = await showNameEditModal(context, _person);
+    await showNameEditModal(context, _person);
-
-    if (newName != null && newName.isNotEmpty) {
-      setState(() {
-        _person = _person.copyWith(name: newName);
-      });
-    }
   }
 
   Future<void> handleEditBirthday(BuildContext context) async {
-    final birthday = await showBirthdayEditModal(context, _person);
+    await showBirthdayEditModal(context, _person);
-
-    if (birthday != null) {
-      setState(() {
-        _person = _person.copyWith(birthDate: birthday);
-      });
-    }
   }
 
   void showOptionSheet(BuildContext context) {
@@ -72,27 +66,90 @@ class _DriftPersonPageState extends ConsumerState<DriftPersonPage> {
 
   @override
   Widget build(BuildContext context) {
-    return ProviderScope(
+    final personAsync = ref.watch(driftGetPersonByIdProvider(_person.id));
-      overrides: [
+    final mergeTracker = ref.read(personMergeTrackerProvider);
-        timelineServiceProvider.overrideWith((ref) {
+    ref.watch(currentRouteNameProvider.select((name) => name ?? DriftPersonRoute.name));
-          final user = ref.watch(currentUserProvider);
+
-          if (user == null) {
+    return personAsync.when(
-            throw Exception('User must be logged in to view person timeline');
+      data: (personByIdProvider) {
+        if (personByIdProvider == null) {
+          // Check if the person was merged and redirect if necessary
+          final targetPersonId = mergeTracker.getTargetPersonId(_person.id);
+          if (targetPersonId != null) {
+            bool isOnPersonDetailPage = ModalRoute.of(context)?.isCurrent ?? false;
+
+            // Only redirect if we're currently on the person detail page, not in a nested view, e.g. image viewer
+            if (!isOnPersonDetailPage) {
+              return const Center(child: CircularProgressIndicator());
+            }
+            // Person was merged, redirect to the target person
+            WidgetsBinding.instance.addPostFrameCallback((_) {
+              if (mounted) {
+                ref
+                    .read(driftPeopleServiceProvider)
+                    .watchPersonById(targetPersonId)
+                    .first
+                    .then((targetPerson) {
+                      if (targetPerson != null && mounted) {
+                        // Open the target person's page
+                        if (mounted) {
+                          context.pop();
+                          context.pushRoute(DriftPersonRoute(initialPerson: targetPerson));
+                        }
+                      } else {
+                        // Target person not found, go back
+                        context.maybePop();
+                      }
+                    })
+                    .catchError((error) {
+                      // If we can't load the target person, go back
+                      mergeLogger.severe("Error during read of targetPerson", error);
+                      if (mounted) {
+                        context.maybePop();
+                      }
+                    });
+              }
+            });
+            return const Center(child: CircularProgressIndicator());
+          } else {
+            mergeLogger.info(
+              'Person ${_person.name} (${_person.id}) not found and no merge records exist, it was probably deleted',
+            );
+
+            WidgetsBinding.instance.addPostFrameCallback((_) {
+              if (mounted) {
+                context.maybePop();
+              }
+            });
+            return const Center(child: CircularProgressIndicator());
           }
+        }
+        _person = personByIdProvider;
+        return ProviderScope(
+          overrides: [
+            timelineServiceProvider.overrideWith((ref) {
+              final user = ref.watch(currentUserProvider);
+              if (user == null) {
+                throw Exception('User must be logged in to view person timeline');
+              }
 
-          final timelineService = ref.watch(timelineFactoryProvider).person(user.id, _person.id);
+              final timelineService = ref.read(timelineFactoryProvider).person(user.id, _person.id);
-          ref.onDispose(timelineService.dispose);
+              ref.onDispose(timelineService.dispose);
-          return timelineService;
+              return timelineService;
-        }),
+            }),
-      ],
+          ],
-      child: Timeline(
+          child: Timeline(
-        appBar: PersonSliverAppBar(
+            appBar: PersonSliverAppBar(
-          person: _person,
+              person: _person,
-          onNameTap: () => handleEditName(context),
+              onNameTap: () => handleEditName(context),
-          onBirthdayTap: () => handleEditBirthday(context),
+              onBirthdayTap: () => handleEditBirthday(context),
-          onShowOptions: () => showOptionSheet(context),
+              onShowOptions: () => showOptionSheet(context),
-        ),
+            ),
-      ),
+          ),
+        );
+      },
+      loading: () => const Center(child: CircularProgressIndicator()),
+      error: (e, s) => Text('Error: $e'),
     );
   }
 }

mobile/lib/presentation/widgets/asset_viewer/bottom_sheet/sheet_people_details.widget.dart

@@ -5,7 +5,6 @@ import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/domain/models/person.model.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
-import 'package:immich_mobile/presentation/widgets/people/person_edit_name_modal.widget.dart';
 import 'package:immich_mobile/providers/infrastructure/asset_viewer/current_asset.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/people.provider.dart';
 import 'package:immich_mobile/providers/routes.provider.dart';
@@ -31,18 +30,6 @@ class _SheetPeopleDetailsState extends ConsumerState<SheetPeopleDetails> {
 
     final peopleFuture = ref.watch(driftPeopleAssetProvider(asset.id));
 
-    Future<void> showNameEditModal(DriftPerson person) async {
-      await showDialog(
-        context: context,
-        useRootNavigator: false,
-        builder: (BuildContext context) {
-          return DriftPersonNameEditForm(person: person);
-        },
-      );
-
-      ref.invalidate(driftPeopleAssetProvider(asset.id));
-    }
-
     return peopleFuture.when(
       data: (people) {
         return AnimatedCrossFade(
@@ -75,14 +62,35 @@ class _SheetPeopleDetailsState extends ConsumerState<SheetPeopleDetails> {
                           final previousRouteArgs = previousRouteData?.arguments;
 
                           // Prevent circular navigation
-                          if (previousRouteArgs is DriftPersonRouteArgs && previousRouteArgs.person.id == person.id) {
+                          if (previousRouteArgs is DriftPersonRouteArgs &&
+                              previousRouteArgs.initialPerson.id == person.id) {
                             context.back();
                             return;
                           }
                           context.pop();
-                          context.pushRoute(DriftPersonRoute(person: person));
+                          context.pushRoute(DriftPersonRoute(initialPerson: person));
+                        },
+                        onNameTap: () async {
+                          // Needs to be before the modal, as this overwrites the previousRouteDataProvider
+                          final previousRouteData = ref.read(previousRouteDataProvider);
+                          final previousRouteArgs = previousRouteData?.arguments;
+                          final previousPersonId = previousRouteArgs is DriftPersonRouteArgs
+                              ? previousRouteArgs.initialPerson.id
+                              : null;
+
+                          DriftPerson? newPerson = await showNameEditModal(context, person);
+
+                          // If the name edit resulted in a new person (e.g. from merging)
+                          // And if we are currently nested below the drift person page if said
+                          // old person id, we need to pop, otherwise the timeline provider complains
+                          // and the asset viewer goes black
+                          // TODO: Preferably we would replace the timeline provider, and let it listen to the new person id (Relevant function is the ```TimelineService person(String userId, String personId)``` in timeline.service.dart)
+                          if (newPerson != null && newPerson.id != person.id && previousPersonId == person.id) {
+                            await context.maybePop();
+                          }
+
+                          ref.invalidate(driftPeopleAssetProvider(asset.id));
                         },
-                        onNameTap: () => showNameEditModal(person),
                       ),
                   ],
                 ),

mobile/lib/presentation/widgets/people/person_edit_birthday_modal.widget.dart

@@ -6,9 +6,9 @@ import 'package:immich_mobile/domain/models/person.model.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/providers/infrastructure/people.provider.dart';
+import 'package:immich_mobile/utils/debug_print.dart';
 import 'package:immich_mobile/widgets/common/immich_toast.dart';
 import 'package:scroll_date_picker/scroll_date_picker.dart';
-import 'package:immich_mobile/utils/debug_print.dart';
 
 class DriftPersonBirthdayEditForm extends ConsumerStatefulWidget {
   final DriftPerson person;
@@ -16,10 +16,10 @@ class DriftPersonBirthdayEditForm extends ConsumerStatefulWidget {
   const DriftPersonBirthdayEditForm({super.key, required this.person});
 
   @override
-  ConsumerState<DriftPersonBirthdayEditForm> createState() => _DriftPersonNameEditFormState();
+  ConsumerState<DriftPersonBirthdayEditForm> createState() => _DriftPersonBirthdayEditFormState();
 }
 
-class _DriftPersonNameEditFormState extends ConsumerState<DriftPersonBirthdayEditForm> {
+class _DriftPersonBirthdayEditFormState extends ConsumerState<DriftPersonBirthdayEditForm> {
   late DateTime _selectedDate;
 
   @override

mobile/lib/presentation/widgets/people/person_edit_name_modal.widget.dart

@@ -5,9 +5,13 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/models/person.model.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
+import 'package:immich_mobile/pages/common/large_leading_tile.dart';
+import 'package:immich_mobile/presentation/widgets/people/person_tile.widget.dart';
 import 'package:immich_mobile/providers/infrastructure/people.provider.dart';
-import 'package:immich_mobile/widgets/common/immich_toast.dart';
 import 'package:immich_mobile/utils/debug_print.dart';
+import 'package:immich_mobile/utils/people.utils.dart';
+import 'package:immich_mobile/widgets/common/immich_toast.dart';
+import 'package:logging/logging.dart';
 
 class DriftPersonNameEditForm extends ConsumerStatefulWidget {
   final DriftPerson person;
@@ -20,6 +24,7 @@ class DriftPersonNameEditForm extends ConsumerStatefulWidget {
 
 class _DriftPersonNameEditFormState extends ConsumerState<DriftPersonNameEditForm> {
   late TextEditingController _formController;
+  List<DriftPerson> _filteredPeople = [];
 
   @override
   void initState() {
@@ -27,12 +32,30 @@ class _DriftPersonNameEditFormState extends ConsumerState<DriftPersonNameEditFor
     _formController = TextEditingController(text: widget.person.name);
   }
 
-  void onEdit(String personId, String newName) async {
+  @override
+  void dispose() {
+    _formController.dispose();
+    super.dispose();
+  }
+
+  void onMerge({required BuildContext context, required DriftPerson person, required DriftPerson mergeTarget}) async {
+    DriftPerson? response = await showMergeModal(context, person, mergeTarget);
+    if (response != null) {
+      if (mounted) {
+        context.pop<DriftPerson?>(response);
+      }
+    }
+    return;
+  }
+
+  void onEdit(DriftPerson person, String newName) async {
     try {
-      final result = await ref.read(driftPeopleServiceProvider).updateName(personId, newName);
+      final result = await ref.read(driftPeopleServiceProvider).updateName(person.id, newName);
       if (result != 0) {
         ref.invalidate(driftGetAllPeopleProvider);
-        context.pop<String>(newName);
+        if (mounted) {
+          context.pop<DriftPerson>(person);
+        }
       }
     } catch (error) {
       dPrint(() => 'Error updating name: $error');
@@ -50,16 +73,107 @@ class _DriftPersonNameEditFormState extends ConsumerState<DriftPersonNameEditFor
     }
   }
 
+  // TODO: Add diacritic filtering?
+  void _filterPeople(List<DriftPerson> people, String query) {
+    final queryParts = query.toLowerCase().split(' ').where((e) => e.isNotEmpty).toList();
+
+    List<DriftPerson> startsWithMatches = [];
+    List<DriftPerson> containsMatches = [];
+
+    for (final p in people) {
+      if (p.id == widget.person.id) continue;
+
+      final nameParts = p.name.toLowerCase().split(' ').where((e) => e.isNotEmpty).toList();
+
+      final allStart = queryParts.every((q) => nameParts.any((n) => n.startsWith(q)));
+      final allContain = queryParts.every((q) => nameParts.any((n) => n.contains(q)));
+
+      if (allStart) {
+        // Prioritize names (first or surname) that start with the query
+        startsWithMatches.add(p);
+      } else if (allContain) {
+        containsMatches.add(p);
+      }
+    }
+
+    if (!mounted) return;
+    setState(() {
+      // TODO:  What happens if there are more than 3 matches with the exact same name?
+      _filteredPeople = query.isEmpty ? [] : (startsWithMatches + containsMatches).take(3).toList();
+    });
+  }
+
   @override
   Widget build(BuildContext context) {
+    final curatedPeople = ref.watch(driftGetAllPeopleProvider);
+    List<DriftPerson> people = [];
+
     return AlertDialog(
       title: const Text("edit_name", style: TextStyle(fontWeight: FontWeight.bold)).tr(),
       content: SingleChildScrollView(
-        child: TextFormField(
+        child: Column(
-          controller: _formController,
+          mainAxisSize: MainAxisSize.min,
-          textCapitalization: TextCapitalization.words,
+          children: [
-          autofocus: true,
+            TextFormField(
-          decoration: InputDecoration(hintText: 'name'.tr(), border: const OutlineInputBorder()),
+              autofocus: true,
+              controller: _formController,
+              textCapitalization: TextCapitalization.words,
+              decoration: InputDecoration(
+                hintText: 'add_a_name'.tr(),
+                border: const OutlineInputBorder(borderRadius: BorderRadius.all(Radius.circular(8))),
+              ),
+              onChanged: (value) => _filterPeople(people, value),
+              onTapOutside: (event) => FocusScope.of(context).unfocus(),
+            ),
+            curatedPeople.when(
+              data: (p) {
+                people = p;
+                return AnimatedSize(
+                  duration: const Duration(milliseconds: 200),
+                  child: SizedBox(
+                    width: double.infinity,
+                    child: _filteredPeople.isEmpty
+                        // Tile instead of a blank space to avoid horizontal layout shift
+                        ? LargeLeadingTile(
+                            leading: const SizedBox.shrink(),
+                            onTap: () {},
+                            title: const SizedBox.shrink(),
+                            disabled: true,
+                          )
+                        : Container(
+                            margin: const EdgeInsets.only(top: 8),
+                            decoration: const BoxDecoration(borderRadius: BorderRadius.all(Radius.circular(8))),
+                            child: Column(
+                              mainAxisSize: MainAxisSize.min,
+                              children: _filteredPeople.map((person) {
+                                return PersonTile(
+                                  isSelected: false,
+                                  onTap: () {
+                                    if (!mounted) return;
+                                    setState(() {
+                                      _formController.text = person.name;
+                                    });
+                                    _formController.selection = TextSelection.fromPosition(
+                                      TextPosition(offset: _formController.text.length),
+                                    );
+                                    onMerge(context: context, person: widget.person, mergeTarget: person);
+                                  },
+                                  personName: person.name,
+                                  personId: person.id,
+                                );
+                              }).toList(),
+                            ),
+                          ),
+                  ),
+                );
+              },
+              loading: () => const Center(child: CircularProgressIndicator()),
+              error: (err, stack) {
+                Logger('PersonEditNameModal').warning('Error loading people for name edit modal', err, stack);
+                return Center(child: Text('Error loading people for name edit modal: $err'));
+              },
+            ),
+          ],
         ),
       ),
       actions: [
@@ -71,7 +185,7 @@ class _DriftPersonNameEditFormState extends ConsumerState<DriftPersonNameEditFor
           ).tr(),
         ),
         TextButton(
-          onPressed: () => onEdit(widget.person.id, _formController.text),
+          onPressed: () => onEdit(widget.person, _formController.text),
           child: Text(
             "save",
             style: TextStyle(color: context.primaryColor, fontWeight: FontWeight.bold),

mobile/lib/presentation/widgets/people/person_merge_modal.widget.dart

@@ -0,0 +1,136 @@
+import 'package:easy_localization/easy_localization.dart';
+import 'package:flutter/material.dart';
+import 'package:fluttertoast/fluttertoast.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/domain/models/person.model.dart';
+import 'package:immich_mobile/providers/infrastructure/people.provider.dart';
+import 'package:immich_mobile/services/api.service.dart';
+import 'package:immich_mobile/utils/image_url_builder.dart';
+import 'package:immich_mobile/widgets/common/immich_toast.dart';
+
+class DriftPersonMergeForm extends ConsumerStatefulWidget {
+  final DriftPerson person;
+  final DriftPerson mergeTarget;
+
+  const DriftPersonMergeForm({super.key, required this.person, required this.mergeTarget});
+
+  @override
+  ConsumerState<DriftPersonMergeForm> createState() => _DriftPersonMergeFormState();
+}
+
+class _DriftPersonMergeFormState extends ConsumerState<DriftPersonMergeForm> {
+  bool _isMerging = false;
+
+  Future<void> _mergePeople(BuildContext context) async {
+    setState(() => _isMerging = true);
+    try {
+      await ref
+          .read(driftPeopleServiceProvider)
+          .mergePeople(targetPersonId: widget.mergeTarget.id, mergePersonIds: [widget.person.id]);
+
+      // Record the merge in the tracker service
+      ref
+          .read(personMergeTrackerProvider)
+          .recordMerge(mergedPersonId: widget.person.id, targetPersonId: widget.mergeTarget.id);
+
+      if (mounted) {
+        Navigator.of(context).pop(widget.mergeTarget);
+        ImmichToast.show(
+          context: context,
+          msg: "merge_people_successfully".tr(),
+          gravity: ToastGravity.BOTTOM,
+          toastType: ToastType.success,
+        );
+      }
+      ref.invalidate(driftGetAllPeopleProvider);
+    } catch (e) {
+      if (mounted) {
+        setState(() => _isMerging = false);
+        ImmichToast.show(
+          context: context,
+          msg: "error_title".tr(),
+          gravity: ToastGravity.BOTTOM,
+          toastType: ToastType.error,
+        );
+      }
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final headers = ApiService.getRequestHeaders();
+
+    return AlertDialog(
+      title: const Text("merge_people", style: TextStyle(fontWeight: FontWeight.bold)).tr(),
+      content: Column(
+        mainAxisSize: MainAxisSize.min,
+        children: [
+          Row(
+            mainAxisAlignment: MainAxisAlignment.center,
+            children: [
+              CircleAvatar(
+                radius: 32,
+                backgroundImage: NetworkImage(getFaceThumbnailUrl(widget.person.id), headers: headers),
+              ),
+              const SizedBox(width: 16),
+              const RotatedBox(quarterTurns: 1, child: Icon(Icons.merge_type, size: 32)),
+              const SizedBox(width: 16),
+              CircleAvatar(
+                radius: 32,
+                backgroundImage: NetworkImage(getFaceThumbnailUrl(widget.mergeTarget.id), headers: headers),
+              ),
+            ],
+          ),
+          const SizedBox(height: 24),
+          const Text(
+            "are_these_the_same_person",
+            style: TextStyle(fontWeight: FontWeight.w600, fontSize: 18),
+            textAlign: TextAlign.center,
+          ).tr(),
+          const SizedBox(height: 8),
+          const Text(
+            "they_will_be_merged_together",
+            style: TextStyle(fontSize: 14, color: Colors.black54),
+            textAlign: TextAlign.center,
+          ).tr(),
+          const SizedBox(height: 24),
+          Row(
+            children: [
+              Expanded(
+                child: ElevatedButton(
+                  style: ElevatedButton.styleFrom(
+                    backgroundColor: Theme.of(context).colorScheme.onSurface,
+                    foregroundColor: Theme.of(context).colorScheme.onInverseSurface,
+                    elevation: 0,
+                  ),
+                  onPressed: _isMerging ? null : () => Navigator.of(context).pop(),
+                  child: const Text("no", style: TextStyle(fontWeight: FontWeight.bold)).tr(),
+                ),
+              ),
+              const SizedBox(width: 12),
+              Expanded(
+                child: ElevatedButton(
+                  style: ElevatedButton.styleFrom(
+                    backgroundColor: Theme.of(context).colorScheme.primary,
+                    foregroundColor: Theme.of(context).colorScheme.onPrimary,
+                  ),
+                  onPressed: _isMerging ? null : () => _mergePeople(context),
+                  child: _isMerging
+                      ? SizedBox(
+                          height: 20,
+                          width: 20,
+                          child: CircularProgressIndicator(
+                            strokeWidth: 2,
+                            color: Theme.of(context).colorScheme.onPrimary,
+                          ),
+                        )
+                      : const Text("yes", style: TextStyle(fontWeight: FontWeight.bold)).tr(),
+                ),
+              ),
+            ],
+          ),
+        ],
+      ),
+    );
+  }
+}

mobile/lib/presentation/widgets/people/person_tile.widget.dart

@@ -0,0 +1,58 @@
+import 'package:flutter/material.dart';
+import 'package:immich_mobile/extensions/build_context_extensions.dart';
+import 'package:immich_mobile/pages/common/large_leading_tile.dart';
+import 'package:immich_mobile/services/api.service.dart';
+import 'package:immich_mobile/utils/image_url_builder.dart';
+
+// TODO: Only pass person object, instead of id and name when PersonDto and DriftPerson are unified
+class PersonTile extends StatelessWidget {
+  final bool isSelected;
+  final String personId;
+  final String personName;
+  final double imageSize;
+  final Function() onTap;
+
+  const PersonTile({
+    super.key,
+    required this.isSelected,
+    required this.personId,
+    required this.personName,
+    this.imageSize = 60.0,
+    required this.onTap,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    final headers = ApiService.getRequestHeaders();
+
+    return Padding(
+      padding: const EdgeInsets.only(bottom: 2.0),
+      child: LargeLeadingTile(
+        title: Text(
+          personName,
+          style: context.textTheme.bodyLarge?.copyWith(
+            fontSize: 20,
+            fontWeight: FontWeight.w500,
+            color: isSelected ? context.colorScheme.onPrimary : context.colorScheme.onSurface,
+          ),
+        ),
+        leading: SizedBox(
+          height: imageSize,
+          child: Material(
+            shape: const CircleBorder(side: BorderSide.none),
+            elevation: 3,
+            child: CircleAvatar(
+              maxRadius: imageSize / 2,
+              backgroundImage: NetworkImage(getFaceThumbnailUrl(personId), headers: headers),
+            ),
+          ),
+        ),
+        onTap: () => onTap(),
+
+        selected: isSelected,
+        selectedTileColor: context.primaryColor,
+        tileColor: context.primaryColor.withAlpha(25),
+      ),
+    );
+  }
+}

mobile/lib/providers/infrastructure/people.provider.dart

@@ -1,6 +1,7 @@
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/models/person.model.dart';
 import 'package:immich_mobile/domain/services/people.service.dart';
+import 'package:immich_mobile/domain/services/person_merge_tracker.service.dart';
 import 'package:immich_mobile/infrastructure/repositories/people.repository.dart';
 import 'package:immich_mobile/providers/infrastructure/db.provider.dart';
 import 'package:immich_mobile/repositories/person_api.repository.dart';
@@ -22,3 +23,9 @@ final driftGetAllPeopleProvider = FutureProvider<List<DriftPerson>>((ref) async
   final service = ref.watch(driftPeopleServiceProvider);
   return service.getAllPeople();
 });
+
+final driftGetPersonByIdProvider = StreamProvider.family<DriftPerson?, String>((ref, personId) {
+  return ref.watch(driftPeopleServiceProvider).watchPersonById(personId);
+});
+
+final personMergeTrackerProvider = Provider<PersonMergeTrackerService>((ref) => PersonMergeTrackerService());

mobile/lib/repositories/person_api.repository.dart

@@ -21,6 +21,10 @@ class PersonApiRepository extends ApiRepository {
     return _toPerson(dto);
   }
 
+  Future<List<BulkIdResponseDto>?> merge(String targetId, List<String> mergeIds) async {
+    return await checkNull(_api.mergePerson(targetId, MergePersonDto(ids: mergeIds)));
+  }
+
   static PersonDto _toPerson(PersonResponseDto dto) => PersonDto(
     birthDate: dto.birthDate,
     id: dto.id,

mobile/lib/routing/router.gr.dart

@@ -1328,12 +1328,12 @@ class DriftPeopleCollectionRoute extends PageRouteInfo<void> {
 /// [DriftPersonPage]
 class DriftPersonRoute extends PageRouteInfo<DriftPersonRouteArgs> {
   DriftPersonRoute({
+    required DriftPerson initialPerson,
     Key? key,
-    required DriftPerson person,
     List<PageRouteInfo>? children,
   }) : super(
          DriftPersonRoute.name,
-         args: DriftPersonRouteArgs(key: key, person: person),
+         args: DriftPersonRouteArgs(initialPerson: initialPerson, key: key),
          initialChildren: children,
        );
 
@@ -1343,21 +1343,21 @@ class DriftPersonRoute extends PageRouteInfo<DriftPersonRouteArgs> {
     name,
     builder: (data) {
       final args = data.argsAs<DriftPersonRouteArgs>();
-      return DriftPersonPage(key: args.key, person: args.person);
+      return DriftPersonPage(args.initialPerson, key: args.key);
     },
   );
 }
 
 class DriftPersonRouteArgs {
-  const DriftPersonRouteArgs({this.key, required this.person});
+  const DriftPersonRouteArgs({required this.initialPerson, this.key});
 
-  final Key? key;
+  final DriftPerson initialPerson;
 
-  final DriftPerson person;
+  final Key? key;
 
   @override
   String toString() {
-    return 'DriftPersonRouteArgs{key: $key, person: $person}';
+    return 'DriftPersonRouteArgs{initialPerson: $initialPerson, key: $key}';
   }
 }
 

mobile/lib/utils/people.utils.dart

@@ -3,6 +3,7 @@ import 'package:immich_mobile/domain/models/person.model.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/presentation/widgets/people/person_edit_birthday_modal.widget.dart';
 import 'package:immich_mobile/presentation/widgets/people/person_edit_name_modal.widget.dart';
+import 'package:immich_mobile/presentation/widgets/people/person_merge_modal.widget.dart';
 
 String formatAge(DateTime birthDate, DateTime referenceDate) {
   int ageInYears = _calculateAge(birthDate, referenceDate);
@@ -33,8 +34,8 @@ int _calculateAgeInMonths(DateTime birthDate, DateTime referenceDate) {
       (referenceDate.day < birthDate.day ? 1 : 0);
 }
 
-Future<String?> showNameEditModal(BuildContext context, DriftPerson person) {
+Future<DriftPerson?> showNameEditModal(BuildContext context, DriftPerson person) {
-  return showDialog<String?>(
+  return showDialog<DriftPerson?>(
     context: context,
     useRootNavigator: false,
     builder: (BuildContext context) {
@@ -52,3 +53,13 @@ Future<DateTime?> showBirthdayEditModal(BuildContext context, DriftPerson person
     },
   );
 }
+
+Future<DriftPerson?> showMergeModal(BuildContext context, DriftPerson person, DriftPerson mergeTarget) {
+  return showDialog<DriftPerson?>(
+    context: context,
+    useRootNavigator: false,
+    builder: (BuildContext context) {
+      return DriftPersonMergeForm(person: person, mergeTarget: mergeTarget);
+    },
+  );
+}

mobile/lib/widgets/search/search_filter/people_picker.dart

@@ -1,14 +1,12 @@
-import 'package:flutter/material.dart';
 import 'package:easy_localization/easy_localization.dart';
+import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/models/person.model.dart';
 import 'package:immich_mobile/extensions/asyncvalue_extensions.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
-import 'package:immich_mobile/pages/common/large_leading_tile.dart';
+import 'package:immich_mobile/presentation/widgets/people/person_tile.widget.dart';
 import 'package:immich_mobile/providers/search/people.provider.dart';
-import 'package:immich_mobile/services/api.service.dart';
-import 'package:immich_mobile/utils/image_url_builder.dart';
 import 'package:immich_mobile/widgets/common/search_field.dart';
 
 class PeoplePicker extends HookConsumerWidget {
@@ -20,10 +18,9 @@ class PeoplePicker extends HookConsumerWidget {
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     final formFocus = useFocusNode();
-    final imageSize = 60.0;
+
     final searchQuery = useState('');
     final people = ref.watch(getAllPeopleProvider);
-    final headers = ApiService.getRequestHeaders();
     final selectedPeople = useState<Set<PersonDto>>(filter ?? {});
 
     return Column(
@@ -57,42 +54,19 @@ class PeoplePicker extends HookConsumerWidget {
                       .toList()[index];
                   final isSelected = selectedPeople.value.contains(person);
 
-                  return Padding(
+                  return PersonTile(
-                    padding: const EdgeInsets.only(bottom: 2.0),
+                    isSelected: isSelected,
-                    child: LargeLeadingTile(
+                    personId: person.id,
-                      title: Text(
+                    personName: person.name,
-                        person.name,
+                    onTap: () {
-                        style: context.textTheme.bodyLarge?.copyWith(
+                      if (selectedPeople.value.contains(person)) {
-                          fontSize: 20,
+                        selectedPeople.value.remove(person);
-                          fontWeight: FontWeight.w500,
+                      } else {
-                          color: isSelected ? context.colorScheme.onPrimary : context.colorScheme.onSurface,
+                        selectedPeople.value.add(person);
-                        ),
+                      }
-                      ),
+                      selectedPeople.value = {...selectedPeople.value};
-                      leading: SizedBox(
+                      onSelect(selectedPeople.value);
-                        height: imageSize,
+                    },
-                        child: Material(
-                          shape: const CircleBorder(side: BorderSide.none),
-                          elevation: 3,
-                          child: CircleAvatar(
-                            maxRadius: imageSize / 2,
-                            backgroundImage: NetworkImage(getFaceThumbnailUrl(person.id), headers: headers),
-                          ),
-                        ),
-                      ),
-                      onTap: () {
-                        if (selectedPeople.value.contains(person)) {
-                          selectedPeople.value.remove(person);
-                        } else {
-                          selectedPeople.value.add(person);
-                        }
-
-                        selectedPeople.value = {...selectedPeople.value};
-                        onSelect(selectedPeople.value);
-                      },
-                      selected: isSelected,
-                      selectedTileColor: context.primaryColor,
-                      tileColor: context.primaryColor.withAlpha(25),
-                    ),
                   );
                 },
               );