beenull/ente
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

[mob][photos] Use separate isIgnored getter instead of isHidden

Browse source
This commit is contained in:
laurenspriem 2024-05-03 17:25:30 +05:30
parent 35aed07bc6
commit ade70f40a9
7 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
mobile/lib/face/model/person.dart
View file

@ -56,6 +56,9 @@ class PersonData {
bool hasAvatar() => avatarFaceId != null;
bool get isIgnored =>
(name.isEmpty || name == '(hidden)' || name == '(ignored)');
PersonData({
required this.name,
this.assigned,

3
mobile/lib/services/machine_learning/face_ml/feedback/cluster_feedback.dart
View file

@ -294,8 +294,7 @@ class ClusterFeedbackService {
}
Future<void> ignoreCluster(int clusterID) async {
await PersonService.instance
.addPerson('(ignored)', clusterID, isHidden: true);
await PersonService.instance.addPerson('', clusterID);
Bus.instance.fire(PeopleChangedEvent());
return;
}

2
mobile/lib/services/search_service.dart
View file

@ -787,7 +787,7 @@ class SearchService {
continue;
}
final PersonEntity p = personIdToPerson[personID]!;
if (p.data.isHidden) continue;
if (p.data.isIgnored) continue;
facesResult.add(
GenericSearchResult(
ResultType.faces,

4
mobile/lib/ui/viewer/file_details/face_widget.dart
View file

@ -202,7 +202,9 @@ class _FaceWidgetState extends State<FaceWidget> {
const SizedBox(height: 8),
if (widget.person != null)
Text(
widget.person!.data.name.trim(),
widget.person!.data.isIgnored
? '(ignored)'
: widget.person!.data.name.trim(),
style: Theme.of(context).textTheme.bodySmall,
overflow: TextOverflow.ellipsis,
maxLines: 1,

4
mobile/lib/ui/viewer/file_details/faces_item_widget.dart
View file

@ -123,9 +123,9 @@ class _FacesItemWidgetState extends State<FacesItemWidget> {
// Make sure hidden faces are last
faces.sort((Face a, Face b) {
final aIsHidden =
persons[faceIdToPersonID[a.faceID]]?.data.isHidden ?? false;
persons[faceIdToPersonID[a.faceID]]?.data.isIgnored ?? false;
final bIsHidden =
persons[faceIdToPersonID[b.faceID]]?.data.isHidden ?? false;
persons[faceIdToPersonID[b.faceID]]?.data.isIgnored ?? false;
if (aIsHidden && !bIsHidden) {
return 1;
} else if (!aIsHidden && bIsHidden) {

2
mobile/lib/ui/viewer/people/add_person_action_sheet.dart
View file

@ -294,7 +294,7 @@ class _PersonActionSheetState extends State<PersonActionSheet> {
}) async {
final persons = await PersonService.instance.getPersons();
if (excludeHidden) {
persons.removeWhere((person) => person.data.isHidden);
persons.removeWhere((person) => person.data.isIgnored);
}
return persons;
}

4
mobile/lib/ui/viewer/people/people_app_bar.dart
View file

@ -27,7 +27,7 @@ class PeopleAppBar extends StatefulWidget {
final SelectedFiles selectedFiles;
final PersonEntity person;
bool get isHidden => person.data.isHidden;
bool get isIgnored => person.data.isIgnored;
const PeopleAppBar(
this.type,
@ -143,7 +143,7 @@ class _AppBarWidgetState extends State<PeopleAppBar> {
final List<PopupMenuItem<PeoplPopupAction>> items = [];
if (!widget.isHidden) {
if (!widget.isIgnored) {
items.addAll(
[
PopupMenuItem(