helpy4/immich
1
0
Fork 0
mirror of https://github.com/immich-app/immich synced 2025-11-14 17:36:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat: Allow merging faces on mobile

Browse source
This commit is contained in:
Marvin M 2025-10-01 20:38:29 +02:00
parent 7a4bfc21c9
commit ca4a75abdf
15 changed files with 566 additions and 120 deletions
Download patch file Download diff file Expand all files Collapse all files

42
mobile/lib/presentation/widgets/asset_viewer/bottom_sheet/sheet_people_details.widget.dart
View file

@ -5,14 +5,13 @@ 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';
import 'package:immich_mobile/routing/router.dart';
import 'package:immich_mobile/services/api.service.dart';
import 'package:immich_mobile/utils/people.utils.dart';
import 'package:immich_mobile/utils/image_url_builder.dart';
import 'package:immich_mobile/utils/people.utils.dart';
class SheetPeopleDetails extends ConsumerStatefulWidget {
const SheetPeopleDetails({super.key});
@ -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(
@ -74,15 +61,36 @@ class _SheetPeopleDetailsState extends ConsumerState<SheetPeopleDetails> {
final previousRouteData = ref.read(previousRouteDataProvider);
final previousRouteArgs = previousRouteData?.arguments;
// TODO: Check what happens if the person id from the previous route is not the correct one anymore e.g. after a merge
// 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 {
DriftPerson? newPerson = await showNameEditModal(context, person);
ref.invalidate(driftPeopleAssetProvider(asset.id));
// 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 because the indexes are off
// 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)
final previousRouteData = ref.read(previousRouteDataProvider);
final previousRouteArgs = previousRouteData?.arguments;
final previousPersonId = previousRouteArgs is DriftPersonRouteArgs
? previousRouteArgs.initialPerson.id
: null;
if (newPerson != null && newPerson.id != person.id && previousPersonId == person.id) {
context.pop();
}
},
onNameTap: () => showNameEditModal(person),
),
],
),

6
mobile/lib/presentation/widgets/people/person_edit_birthday_modal.widget.dart
View file

@ -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

128
mobile/lib/presentation/widgets/people/person_edit_name_modal.widget.dart
View file

@ -5,9 +5,12 @@ 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';
class DriftPersonNameEditForm extends ConsumerStatefulWidget {
final DriftPerson person;
@ -20,6 +23,7 @@ class DriftPersonNameEditForm extends ConsumerStatefulWidget {
class _DriftPersonNameEditFormState extends ConsumerState<DriftPersonNameEditForm> {
late TextEditingController _formController;
List<DriftPerson> _filteredPeople = [];
@override
void initState() {
@ -27,12 +31,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,17 +72,99 @@ class _DriftPersonNameEditFormState extends ConsumerState<DriftPersonNameEditFor
}
}
// TODO: Add diacritic filtering? We would need to add a package.
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) {
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 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);
return AlertDialog(
title: const Text("edit_name", style: TextStyle(fontWeight: FontWeight.bold)).tr(),
content: SingleChildScrollView(
child: TextFormField(
controller: _formController,
textCapitalization: TextCapitalization.words,
autofocus: true,
decoration: InputDecoration(hintText: 'name'.tr(), border: const OutlineInputBorder()),
),
content: curatedPeople.when(
data: (people) {
return SingleChildScrollView(
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
TextFormField(
autofocus: true,
controller: _formController,
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(),
),
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: BoxDecoration(borderRadius: BorderRadius.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) => Text('Error: $err'),
),
actions: [
TextButton(
@ -71,7 +175,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),

136
mobile/lib/presentation/widgets/people/person_merge_modal.widget.dart Normal file
View file

@ -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(),
),
),
],
),
],
),
);
}
}

58
mobile/lib/presentation/widgets/people/person_tile.widget.dart Normal file
View file

@ -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),
),
);
}
}