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

Beautify archived UI (#909)

Browse source
This commit is contained in:
Ashil 2023-03-07 16:23:42 +05:30 committed by GitHub
parent 2ef6997b05 318fbe1ad2
commit e01fea40d5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 80 additions and 71 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
lib/ui/collections/collection_item_widget.dart
View file

@ -15,11 +15,13 @@ class CollectionItem extends StatelessWidget {
final CollectionWithThumbnail c;
final double sideOfThumbnail;
final bool shouldRender;
final bool showFileCount;
CollectionItem(
this.c,
this.sideOfThumbnail, {
this.shouldRender = false,
this.showFileCount = true,
Key? key,
}) : super(key: Key(c.collection.id.toString()));
@ -63,26 +65,29 @@ class CollectionItem extends StatelessWidget {
style: enteTextTheme.small,
overflow: TextOverflow.ellipsis,
),
FutureBuilder<int>(
future: FilesDB.instance.collectionFileCount(c.collection.id),
builder: (context, snapshot) {
if (snapshot.hasData) {
return Text(
snapshot.data.toString(),
style: enteTextTheme.small.copyWith(
color: enteColorScheme.textMuted,
),
);
} else {
return Text(
"",
style: enteTextTheme.small.copyWith(
color: enteColorScheme.textMuted,
),
);
}
},
),
showFileCount
? FutureBuilder<int>(
future:
FilesDB.instance.collectionFileCount(c.collection.id),
builder: (context, snapshot) {
if (snapshot.hasData) {
return Text(
snapshot.data.toString(),
style: enteTextTheme.small.copyWith(
color: enteColorScheme.textMuted,
),
);
} else {
return Text(
"",
style: enteTextTheme.small.copyWith(
color: enteColorScheme.textMuted,
),
);
}
},
)
: const SizedBox.shrink(),
],
),
],

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

@ -5,9 +5,9 @@ import "package:logging/logging.dart";
import "package:photos/core/event_bus.dart";
import "package:photos/events/collection_updated_event.dart";
import "package:photos/models/collection_items.dart";
import "package:photos/theme/ente_theme.dart";
import "package:photos/ui/collections/collection_item_widget.dart";
import "package:photos/ui/common/loading_widget.dart";
import "package:photos/ui/components/divider_widget.dart";
class AlbumHorizontalListWidget extends StatefulWidget {
final Future<List<CollectionWithThumbnail>> Function() collectionsFuture;
@ -46,55 +46,56 @@ class _AlbumHorizontalListWidgetState extends State<AlbumHorizontalListWidget> {
@override
Widget build(BuildContext context) {
debugPrint('$runtimeType widget build');
return FutureBuilder<List<CollectionWithThumbnail>>(
future: widget.collectionsFuture(),
builder: (context, snapshot) {
if (snapshot.hasError) {
_logger.severe("failed to fetch albums", snapshot.error);
return const Text("Something went wrong");
} else if (snapshot.hasData) {
if (snapshot.data!.isEmpty) {
return const SizedBox.shrink();
}
final collectionsWithThumbnail =
snapshot.data as List<CollectionWithThumbnail>;
return Align(
alignment: Alignment.centerLeft,
child: SizedBox(
height: 190,
child: Column(
children: [
Expanded(
child: ListView.builder(
scrollDirection: Axis.horizontal,
itemCount: collectionsWithThumbnail.length,
padding: const EdgeInsets.fromLTRB(6, 6, 6, 6),
itemBuilder: (context, index) {
final item = collectionsWithThumbnail[index];
return GestureDetector(
behavior: HitTestBehavior.opaque,
onTap: () async {},
child: Padding(
padding: const EdgeInsets.all(2.0),
child: CollectionItem(
item,
120,
shouldRender: true,
),
),
);
},
),
return Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Padding(
padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 12),
child: Text(
"Albums",
style: getEnteTextTheme(context).large,
),
),
FutureBuilder<List<CollectionWithThumbnail>>(
future: widget.collectionsFuture(),
builder: (context, snapshot) {
if (snapshot.hasError) {
_logger.severe("failed to fetch albums", snapshot.error);
return const Text("Something went wrong");
} else if (snapshot.hasData) {
if (snapshot.data!.isEmpty) {
return const SizedBox.shrink();
}
final collectionsWithThumbnail =
snapshot.data as List<CollectionWithThumbnail>;
return Align(
alignment: Alignment.centerLeft,
child: SizedBox(
height: 147, //139 + 8 (calculated from figma design)
child: ListView.separated(
separatorBuilder: (context, index) =>
const SizedBox(width: 4),
scrollDirection: Axis.horizontal,
itemCount: collectionsWithThumbnail.length,
padding: const EdgeInsets.symmetric(horizontal: 8),
itemBuilder: (context, index) {
final item = collectionsWithThumbnail[index];
return CollectionItem(
item,
120,
shouldRender: true,
showFileCount: false,
);
},
),
const DividerWidget(dividerType: DividerType.solid),
],
),
),
);
} else {
return const EnteLoadingWidget();
}
},
),
);
} else {
return const EnteLoadingWidget();
}
},
),
],
);
}
}

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

@ -66,8 +66,11 @@ class ArchivePage extends StatelessWidget {
emptyState: const EmptyState(
text: "You don't have any archived items.",
),
header: AlbumHorizontalListWidget(
CollectionsService.instance.getArchivedCollectionWithThumb,
header: Padding(
padding: const EdgeInsets.only(bottom: 24, top: 8),
child: AlbumHorizontalListWidget(
CollectionsService.instance.getArchivedCollectionWithThumb,
),
),
);
return Scaffold(