TerribleDev/ente
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[mob][photos] Use better names

Browse Source
This commit is contained in:
ashilkn
2024-11-07 20:23:34 +05:30
parent ae3b784463
commit b83b7ad295
4 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mobile/lib/ui/viewer/gallery/gallery_app_bar_widget.dart
View File

@@ -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<GalleryAppBarWidget> {
.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<GalleryAppBarWidget> {
? const SizedBox(
// +1 to account for the filter's outer stroke width
height: kFilterChipHeight + 1,
child: AppliedFilters(),
child: AppliedFiltersForAppbar(),
)
: Text(
_appBarTitle!,

9
mobile/lib/ui/viewer/hierarchicial_search/applied_filters.dart → mobile/lib/ui/viewer/hierarchicial_search/applied_filters_for_appbar.dart
View File

@@ -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<AppliedFilters> createState() => _AppliedFiltersState();
State<AppliedFiltersForAppbar> createState() =>
_AppliedFiltersForAppbarState();
}
class _AppliedFiltersState extends State<AppliedFilters> {
class _AppliedFiltersForAppbarState extends State<AppliedFiltersForAppbar> {
late SearchFilterDataProvider _searchFilterDataProvider;
late List<HierarchicalSearchFilter> _appliedFilters;

10
mobile/lib/ui/viewer/hierarchicial_search/recommended_filters.dart → mobile/lib/ui/viewer/hierarchicial_search/recommended_filters_for_appbar.dart
View File

@@ -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<RecommendedFilters> createState() => _RecommendedFiltersState();
State<RecommendedFiltersForAppbar> createState() =>
_RecommendedFiltersForAppbarState();
}
class _RecommendedFiltersState extends State<RecommendedFilters> {
class _RecommendedFiltersForAppbarState
extends State<RecommendedFiltersForAppbar> {
late SearchFilterDataProvider _searchFilterDataProvider;
late List<HierarchicalSearchFilter> _recommendations;
int _filtersUpdateCount = 0;

8
mobile/lib/ui/viewer/people/people_app_bar.dart
View File

@@ -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<PeopleAppBar> {
.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<PeopleAppBar> {
? const SizedBox(
// +1 to account for the filter's outer stroke width
height: kFilterChipHeight + 1,
child: AppliedFilters(),
child: AppliedFiltersForAppbar(),
)
: Text(
_appBarTitle!,