From c4d49f41768d22f2b5bce7cd32814ae36a13eafe Mon Sep 17 00:00:00 2001 From: ashilkn Date: Thu, 17 Oct 2024 09:05:30 +0530 Subject: [PATCH] [mob][photos] Use FaceFilterChip instead of GenericFilterChip where ever necessary --- .../hierarchicial_search/applied_filters.dart | 9 ++++---- .../recommended_filters.dart | 22 +++++++++++++------ 2 files changed, 19 insertions(+), 12 deletions(-) diff --git a/mobile/lib/ui/viewer/hierarchicial_search/applied_filters.dart b/mobile/lib/ui/viewer/hierarchicial_search/applied_filters.dart index a1753de75f..327e613da8 100644 --- a/mobile/lib/ui/viewer/hierarchicial_search/applied_filters.dart +++ b/mobile/lib/ui/viewer/hierarchicial_search/applied_filters.dart @@ -1,7 +1,7 @@ import "package:flutter/material.dart"; import "package:photos/models/file/file.dart"; +import "package:photos/models/search/hierarchical/face_filter.dart"; import "package:photos/models/search/hierarchical/hierarchical_search_filter.dart"; -import "package:photos/models/search/search_types.dart"; import "package:photos/ui/viewer/gallery/state/inherited_search_filter_data.dart"; import "package:photos/ui/viewer/gallery/state/search_filter_data_provider.dart"; import "package:photos/ui/viewer/hierarchicial_search/filter_chip.dart"; @@ -49,13 +49,12 @@ class _AppliedFiltersState extends State { return ListView.builder( itemBuilder: (context, index) { final filter = _appliedFilters[index]; - final isFaceFilter = filter.resultType() == ResultType.faces; return Padding( padding: const EdgeInsets.symmetric(horizontal: 4), - child: isFaceFilter + child: filter is FaceFilter ? FaceFilterChip( - personId: "", - clusterId: "", + personId: filter.personId, + clusterId: filter.clusterId, faceThumbnailFile: EnteFile(), ) : GenericFilterChip( diff --git a/mobile/lib/ui/viewer/hierarchicial_search/recommended_filters.dart b/mobile/lib/ui/viewer/hierarchicial_search/recommended_filters.dart index 71df5fad89..c83e42e03b 100644 --- a/mobile/lib/ui/viewer/hierarchicial_search/recommended_filters.dart +++ b/mobile/lib/ui/viewer/hierarchicial_search/recommended_filters.dart @@ -1,4 +1,5 @@ import "package:flutter/material.dart"; +import "package:photos/models/search/hierarchical/face_filter.dart"; import "package:photos/models/search/hierarchical/hierarchical_search_filter.dart"; import "package:photos/ui/viewer/gallery/state/inherited_search_filter_data.dart"; import "package:photos/ui/viewer/gallery/state/search_filter_data_provider.dart"; @@ -46,15 +47,22 @@ class _RecommendedFiltersState extends State { Widget build(BuildContext context) { return ListView.builder( itemBuilder: (context, index) { + final filter = _recommendations[index]; return Padding( padding: const EdgeInsets.symmetric(horizontal: 4), - child: GenericFilterChip( - label: _recommendations[index].name(), - onTap: () { - _searchFilterDataProvider.applyFilters([_recommendations[index]]); - }, - leadingIcon: _recommendations[index].icon(), - ), + child: filter is FaceFilter + ? FaceFilterChip( + personId: filter.personId, + clusterId: filter.clusterId, + faceThumbnailFile: filter.faceFile, + ) + : GenericFilterChip( + label: filter.name(), + onTap: () { + _searchFilterDataProvider.applyFilters([filter]); + }, + leadingIcon: filter.icon(), + ), ); }, scrollDirection: Axis.horizontal,