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

[mob] Fix search tab

Browse source
This commit is contained in:
Neeraj Gupta 2024-03-13 17:49:10 +05:30
parent f239959067
commit 614db863bc
2 changed files with 20 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
mobile/lib/ui/viewer/search_tab/people_section.dart
View file

@ -13,7 +13,6 @@ import "package:photos/models/search/search_types.dart";
import "package:photos/theme/ente_theme.dart";
import "package:photos/ui/viewer/file/no_thumbnail_widget.dart";
import "package:photos/ui/viewer/file/thumbnail_widget.dart";
import "package:photos/ui/viewer/gallery/collection_page.dart";
import 'package:photos/ui/viewer/search/result/person_face_widget.dart';
import "package:photos/ui/viewer/search/result/search_result_page.dart";
import 'package:photos/ui/viewer/search/result/search_section_all_page.dart';
@ -215,11 +214,11 @@ class SearchExample extends StatelessWidget {
);
}
} else if (searchResult is AlbumSearchResult) {
final albumSearchResult = searchResult as AlbumSearchResult;
final albumSearchResult = searchResult as GenericSearchResult;
routeToPage(
context,
CollectionPage(
albumSearchResult.collectionWithThumbnail,
SearchResultPage(
albumSearchResult,
tagPrefix: albumSearchResult.heroTag(),
),
);

27
mobile/lib/ui/viewer/search_tab/search_tab.dart
View file

@ -6,6 +6,7 @@ import "package:logging/logging.dart";
import "package:photos/models/search/album_search_result.dart";
import "package:photos/models/search/generic_search_result.dart";
import "package:photos/models/search/index_of_indexed_stack.dart";
import "package:photos/models/search/search_result.dart";
import "package:photos/models/search/search_types.dart";
import "package:photos/states/all_sections_examples_state.dart";
import "package:photos/ui/common/loading_widget.dart";
@ -80,16 +81,13 @@ class _AllSearchSectionsState extends State<AllSearchSections> {
@override
Widget build(BuildContext context) {
final searchTypes = SectionType.values.toList(growable: true);
// remove face and content sectionType
// searchTypes.remove(SectionType.face);
// TODO: re-add album section
searchTypes.remove(SectionType.content);
searchTypes.remove(SectionType.album);
return Padding(
padding: const EdgeInsets.only(top: 8),
child: Stack(
children: [
FutureBuilder(
FutureBuilder<List<List<SearchResult>>>(
future: InheritedAllSectionsExamples.of(context)
.allSectionsExamplesFuture,
builder: (context, snapshot) {
@ -100,6 +98,14 @@ class _AllSearchSectionsState extends State<AllSearchSections> {
child: SearchTabEmptyState(),
);
}
if (snapshot.data!.length != searchTypes.length) {
return Padding(
padding: const EdgeInsets.only(bottom: 72),
child: Text(
'Sections length mismatch: ${snapshot.data!.length} != ${searchTypes.length}',
),
);
}
return ListView.builder(
padding: const EdgeInsets.only(bottom: 180),
physics: const BouncingScrollPhysics(),
@ -107,17 +113,18 @@ class _AllSearchSectionsState extends State<AllSearchSections> {
// ignore: body_might_complete_normally_nullable
itemBuilder: (context, index) {
switch (searchTypes[index]) {
case SectionType.album:
return AlbumsSection(
snapshot.data!.elementAt(index)
as List<AlbumSearchResult>,
);
case SectionType.face:
return SearchSection(
sectionType: SectionType.face,
examples: snapshot.data!.elementAt(index),
limit: 7,
);
case SectionType.album:
// return const SizedBox.shrink();
return AlbumsSection(
snapshot.data!.elementAt(index)
as List<AlbumSearchResult>,
);
case SectionType.moment:
return MomentsSection(
snapshot.data!.elementAt(index)