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

Fixed UI on archive screen

Browse source
This commit is contained in:
ashilkn 2023-04-20 15:50:49 +05:30
parent bf82b2dff3
commit 2c5d2c0d80
2 changed files with 57 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
lib/ui/components/album_horizontal_list_widget.dart
View file

@ -47,17 +47,7 @@ class _AlbumHorizontalListWidgetState extends State<AlbumHorizontalListWidget> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
debugPrint('$runtimeType widget build'); debugPrint('$runtimeType widget build');
return Column( return FutureBuilder<List<CollectionWithThumbnail>>(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Padding(
padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 12),
child: Text(
S.of(context).albums,
style: getEnteTextTheme(context).large,
),
),
FutureBuilder<List<CollectionWithThumbnail>>(
future: widget.collectionsFuture(), future: widget.collectionsFuture(),
builder: (context, snapshot) { builder: (context, snapshot) {
if (snapshot.hasError) { if (snapshot.hasError) {
@ -69,7 +59,20 @@ class _AlbumHorizontalListWidgetState extends State<AlbumHorizontalListWidget> {
} }
final collectionsWithThumbnail = final collectionsWithThumbnail =
snapshot.data as List<CollectionWithThumbnail>; snapshot.data as List<CollectionWithThumbnail>;
return Align( return Padding(
padding: const EdgeInsets.only(bottom: 24, top: 8),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Padding(
padding:
const EdgeInsets.symmetric(horizontal: 16, vertical: 12),
child: Text(
S.of(context).albums,
style: getEnteTextTheme(context).large,
),
),
Align(
alignment: Alignment.centerLeft, alignment: Alignment.centerLeft,
child: SizedBox( child: SizedBox(
height: 147, //139 + 8 (calculated from figma design) height: 147, //139 + 8 (calculated from figma design)
@ -90,13 +93,17 @@ class _AlbumHorizontalListWidgetState extends State<AlbumHorizontalListWidget> {
}, },
), ),
), ),
);
} else {
return const EnteLoadingWidget();
}
},
), ),
], ],
),
);
} else {
return const Padding(
padding: EdgeInsets.only(bottom: 24, top: 8),
child: EnteLoadingWidget(),
);
}
},
); );
} }
} }

5
lib/ui/viewer/gallery/archive_page.dart
View file

@ -67,12 +67,9 @@ class ArchivePage extends StatelessWidget {
emptyState: EmptyState( emptyState: EmptyState(
text: S.of(context).youDontHaveAnyArchivedItems, text: S.of(context).youDontHaveAnyArchivedItems,
), ),
header: Padding( header: AlbumHorizontalListWidget(
padding: const EdgeInsets.only(bottom: 24, top: 8),
child: AlbumHorizontalListWidget(
CollectionsService.instance.getArchivedCollectionWithThumb, CollectionsService.instance.getArchivedCollectionWithThumb,
), ),
),
); );
return Scaffold( return Scaffold(
appBar: PreferredSize( appBar: PreferredSize(