From b83b7ad2954bdd7120003f0bf4533f7fd810dafe Mon Sep 17 00:00:00 2001 From: ashilkn Date: Thu, 7 Nov 2024 20:23:34 +0530 Subject: [PATCH] [mob][photos] Use better names --- .../lib/ui/viewer/gallery/gallery_app_bar_widget.dart | 8 ++++---- ...ed_filters.dart => applied_filters_for_appbar.dart} | 9 +++++---- ...ilters.dart => recommended_filters_for_appbar.dart} | 10 ++++++---- mobile/lib/ui/viewer/people/people_app_bar.dart | 8 ++++---- 4 files changed, 19 insertions(+), 16 deletions(-) rename mobile/lib/ui/viewer/hierarchicial_search/{applied_filters.dart => applied_filters_for_appbar.dart} (94%) rename mobile/lib/ui/viewer/hierarchicial_search/{recommended_filters.dart => recommended_filters_for_appbar.dart} (95%) diff --git a/mobile/lib/ui/viewer/gallery/gallery_app_bar_widget.dart b/mobile/lib/ui/viewer/gallery/gallery_app_bar_widget.dart index bb7266f45f..5672fcc5c1 100644 --- a/mobile/lib/ui/viewer/gallery/gallery_app_bar_widget.dart +++ b/mobile/lib/ui/viewer/gallery/gallery_app_bar_widget.dart @@ -43,8 +43,8 @@ import 'package:photos/ui/tools/free_space_page.dart'; import "package:photos/ui/viewer/gallery/hooks/add_photos_sheet.dart"; import 'package:photos/ui/viewer/gallery/hooks/pick_cover_photo.dart'; import "package:photos/ui/viewer/gallery/state/inherited_search_filter_data.dart"; -import "package:photos/ui/viewer/hierarchicial_search/applied_filters.dart"; -import "package:photos/ui/viewer/hierarchicial_search/recommended_filters.dart"; +import "package:photos/ui/viewer/hierarchicial_search/applied_filters_for_appbar.dart"; +import "package:photos/ui/viewer/hierarchicial_search/recommended_filters_for_appbar.dart"; import "package:photos/ui/viewer/location/edit_location_sheet.dart"; import 'package:photos/utils/data_util.dart'; import 'package:photos/utils/dialog_util.dart'; @@ -145,7 +145,7 @@ class _GalleryAppBarWidgetState extends State { .searchFilterDataProvider!.isSearchingNotifier, child: const PreferredSize( preferredSize: Size.fromHeight(0), - child: Flexible(child: RecommendedFilters()), + child: Flexible(child: RecommendedFiltersForAppbar()), ), builder: (context, isSearching, child) { return AppBar( @@ -155,7 +155,7 @@ class _GalleryAppBarWidgetState extends State { ? const SizedBox( // +1 to account for the filter's outer stroke width height: kFilterChipHeight + 1, - child: AppliedFilters(), + child: AppliedFiltersForAppbar(), ) : Text( _appBarTitle!, diff --git a/mobile/lib/ui/viewer/hierarchicial_search/applied_filters.dart b/mobile/lib/ui/viewer/hierarchicial_search/applied_filters_for_appbar.dart similarity index 94% rename from mobile/lib/ui/viewer/hierarchicial_search/applied_filters.dart rename to mobile/lib/ui/viewer/hierarchicial_search/applied_filters_for_appbar.dart index 4d272543d6..bc41ed77af 100644 --- a/mobile/lib/ui/viewer/hierarchicial_search/applied_filters.dart +++ b/mobile/lib/ui/viewer/hierarchicial_search/applied_filters_for_appbar.dart @@ -9,14 +9,15 @@ import "package:photos/ui/viewer/hierarchicial_search/chip_widgets/face_filter_c import "package:photos/ui/viewer/hierarchicial_search/chip_widgets/generic_filter_chip.dart"; import "package:photos/ui/viewer/hierarchicial_search/chip_widgets/only_them_filter_chip.dart"; -class AppliedFilters extends StatefulWidget { - const AppliedFilters({super.key}); +class AppliedFiltersForAppbar extends StatefulWidget { + const AppliedFiltersForAppbar({super.key}); @override - State createState() => _AppliedFiltersState(); + State createState() => + _AppliedFiltersForAppbarState(); } -class _AppliedFiltersState extends State { +class _AppliedFiltersForAppbarState extends State { late SearchFilterDataProvider _searchFilterDataProvider; late List _appliedFilters; diff --git a/mobile/lib/ui/viewer/hierarchicial_search/recommended_filters.dart b/mobile/lib/ui/viewer/hierarchicial_search/recommended_filters_for_appbar.dart similarity index 95% rename from mobile/lib/ui/viewer/hierarchicial_search/recommended_filters.dart rename to mobile/lib/ui/viewer/hierarchicial_search/recommended_filters_for_appbar.dart index bd846dba03..132f3a2b2b 100644 --- a/mobile/lib/ui/viewer/hierarchicial_search/recommended_filters.dart +++ b/mobile/lib/ui/viewer/hierarchicial_search/recommended_filters_for_appbar.dart @@ -13,14 +13,16 @@ import "package:photos/ui/viewer/hierarchicial_search/chip_widgets/only_them_fil import "package:photos/ui/viewer/hierarchicial_search/filter_options_bottom_sheet.dart"; import "package:photos/utils/hierarchical_search_util.dart"; -class RecommendedFilters extends StatefulWidget { - const RecommendedFilters({super.key}); +class RecommendedFiltersForAppbar extends StatefulWidget { + const RecommendedFiltersForAppbar({super.key}); @override - State createState() => _RecommendedFiltersState(); + State createState() => + _RecommendedFiltersForAppbarState(); } -class _RecommendedFiltersState extends State { +class _RecommendedFiltersForAppbarState + extends State { late SearchFilterDataProvider _searchFilterDataProvider; late List _recommendations; int _filtersUpdateCount = 0; diff --git a/mobile/lib/ui/viewer/people/people_app_bar.dart b/mobile/lib/ui/viewer/people/people_app_bar.dart index 58de04985f..05da13c8b2 100644 --- a/mobile/lib/ui/viewer/people/people_app_bar.dart +++ b/mobile/lib/ui/viewer/people/people_app_bar.dart @@ -17,8 +17,8 @@ import 'package:photos/services/collections_service.dart'; import "package:photos/services/machine_learning/face_ml/person/person_service.dart"; import 'package:photos/ui/actions/collection/collection_sharing_actions.dart'; import "package:photos/ui/viewer/gallery/state/inherited_search_filter_data.dart"; -import "package:photos/ui/viewer/hierarchicial_search/applied_filters.dart"; -import "package:photos/ui/viewer/hierarchicial_search/recommended_filters.dart"; +import "package:photos/ui/viewer/hierarchicial_search/applied_filters_for_appbar.dart"; +import "package:photos/ui/viewer/hierarchicial_search/recommended_filters_for_appbar.dart"; import "package:photos/ui/viewer/people/add_person_action_sheet.dart"; import "package:photos/ui/viewer/people/people_page.dart"; import "package:photos/ui/viewer/people/person_cluster_suggestion.dart"; @@ -98,7 +98,7 @@ class _AppBarWidgetState extends State { .searchFilterDataProvider!.isSearchingNotifier, child: const PreferredSize( preferredSize: Size.fromHeight(0), - child: Flexible(child: RecommendedFilters()), + child: Flexible(child: RecommendedFiltersForAppbar()), ), builder: (context, isSearching, child) { return AppBar( @@ -108,7 +108,7 @@ class _AppBarWidgetState extends State { ? const SizedBox( // +1 to account for the filter's outer stroke width height: kFilterChipHeight + 1, - child: AppliedFilters(), + child: AppliedFiltersForAppbar(), ) : Text( _appBarTitle!,