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

feat: empty state for collection

Browse Source
This commit is contained in:
Prateek Sunal
2025-07-25 12:58:18 +05:30
parent 495d8449f7
commit e4b1adfd1d
8 changed files with 128 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mobile/apps/photos/lib/generated/intl/messages_en.dart generated
View File

@@ -380,6 +380,12 @@ class MessageLookup extends MessageLookupByLibrary {
"Add a people widget to your homescreen and come back here to customize."),
"addPhotos": MessageLookupByLibrary.simpleMessage("Add photos"),
"addSelected": MessageLookupByLibrary.simpleMessage("Add selected"),
"addSomePhotosDesc1":
MessageLookupByLibrary.simpleMessage("Add some photos or pick "),
"addSomePhotosDesc2":
MessageLookupByLibrary.simpleMessage("familiar faces"),
"addSomePhotosDesc3":
MessageLookupByLibrary.simpleMessage("\nto begin with"),
"addToAlbum": MessageLookupByLibrary.simpleMessage("Add to album"),
"addToEnte": MessageLookupByLibrary.simpleMessage("Add to Ente"),
"addToHiddenAlbum":

30
mobile/apps/photos/lib/generated/l10n.dart generated
View File

@@ -12365,6 +12365,36 @@ class S {
args: [],
);
}
/// `Add some photos or pick `
String get addSomePhotosDesc1 {
return Intl.message(
'Add some photos or pick ',
name: 'addSomePhotosDesc1',
desc: '',
args: [],
);
}
/// `familiar faces`
String get addSomePhotosDesc2 {
return Intl.message(
'familiar faces',
name: 'addSomePhotosDesc2',
desc: '',
args: [],
);
}
/// `\nto begin with`
String get addSomePhotosDesc3 {
return Intl.message(
'\nto begin with',
name: 'addSomePhotosDesc3',
desc: '',
args: [],
);
}
}
class AppLocalizationDelegate extends LocalizationsDelegate<S> {

5
mobile/apps/photos/lib/l10n/intl_en.arb
View File

@@ -1795,5 +1795,8 @@
"autoAddPeople": "Auto-add people",
"shouldRemoveFilesSmartAlbumsDesc": "Should the files related to the person that were previously selected in smart albums be removed?",
"addingPhotos": "Adding photos",
"gettingReady": "Getting ready"
"gettingReady": "Getting ready",
"addSomePhotosDesc1": "Add some photos or pick ",
"addSomePhotosDesc2": "familiar faces",
"addSomePhotosDesc3": "\nto begin with"
}

1
mobile/apps/photos/lib/ui/viewer/gallery/collection_page.dart
View File

@@ -95,6 +95,7 @@ class CollectionPage extends StatelessWidget {
albumName: c.collection.displayName,
sortAsyncFn: () => c.collection.pubMagicMetadata.asc ?? false,
showSelectAllByDefault: galleryType != GalleryType.sharedCollection,
addHeaderOrFooterEmptyState: false,
emptyState: galleryType == GalleryType.ownedCollection
? EmptyAlbumState(
c.collection,

6
mobile/apps/photos/lib/ui/viewer/gallery/component/multiple_groups_gallery_view.dart
View File

@@ -43,6 +43,7 @@ class MultipleGroupsGalleryView extends StatelessWidget {
final Logger logger;
final bool showSelectAllByDefault;
final bool isScrollablePositionedList;
final bool addHeaderOrFooterEmptyState;
const MultipleGroupsGalleryView({
required this.itemScroller,
@@ -50,6 +51,7 @@ class MultipleGroupsGalleryView extends StatelessWidget {
required this.disableScroll,
this.header,
this.footer,
this.addHeaderOrFooterEmptyState = true,
required this.emptyState,
required this.asyncLoader,
this.reloadEvent,
@@ -81,7 +83,7 @@ class MultipleGroupsGalleryView extends StatelessWidget {
},
emptyResultBuilder: (_) {
final List<Widget> children = [];
if (header != null) {
if (header != null && addHeaderOrFooterEmptyState) {
children.add(header!);
}
children.add(
@@ -89,7 +91,7 @@ class MultipleGroupsGalleryView extends StatelessWidget {
child: emptyState,
),
);
if (footer != null) {
if (footer != null && addHeaderOrFooterEmptyState) {
children.add(footer!);
}
return Column(

36
mobile/apps/photos/lib/ui/viewer/gallery/empty_album_state.dart
View File

@@ -1,6 +1,7 @@
import "package:flutter/material.dart";
import "package:photos/generated/l10n.dart";
import 'package:photos/models/collection/collection.dart';
import "package:photos/theme/ente_theme.dart";
import "package:photos/ui/collections/album/smart_album_people.dart";
import "package:photos/ui/components/buttons/button_widget.dart";
import "package:photos/ui/components/models/button_type.dart";
@@ -35,10 +36,36 @@ class EmptyAlbumState extends StatelessWidget {
)
: Stack(
children: [
Center(
child: Opacity(
opacity: 0.5,
child: Image.asset('assets/loading_photos_background.png'),
SizedBox(
width: double.infinity,
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Image.asset(
"assets/albums-widget-static.png",
height: 160,
),
const SizedBox(height: 16),
Text.rich(
TextSpan(
text: S.of(context).addSomePhotosDesc1,
children: [
TextSpan(
text: S.of(context).addSomePhotosDesc2,
style: TextStyle(
color: getEnteColorScheme(context).primary500,
),
),
TextSpan(
text: S.of(context).addSomePhotosDesc3,
),
],
),
style: getEnteTextTheme(context).smallMuted,
textAlign: TextAlign.center,
),
const SizedBox(height: 140),
],
),
),
Padding(
@@ -82,6 +109,7 @@ class EmptyAlbumState extends StatelessWidget {
);
},
),
const SizedBox(height: 48),
],
),
),

4
mobile/apps/photos/lib/ui/viewer/gallery/gallery.dart
View File

@@ -55,6 +55,8 @@ class Gallery extends StatefulWidget {
/// will select even when no other item is selected.
final bool limitSelectionToOne;
final bool addHeaderOrFooterEmptyState;
/// When true, the gallery will be in selection mode. Tapping on any item
/// will select it even when no other item is selected. This is only used to
/// make selection possible without long pressing. If a gallery has selected
@@ -77,6 +79,7 @@ class Gallery extends StatefulWidget {
this.removalEventTypes = const {},
this.header,
this.footer = const SizedBox(height: 212),
this.addHeaderOrFooterEmptyState = true,
this.emptyState = const EmptyState(),
this.scrollBottomSafeArea = 120.0,
this.albumName = '',
@@ -396,6 +399,7 @@ class GalleryState extends State<Gallery> {
reloadEvent: widget.reloadEvent,
header: widget.header,
footer: widget.footer,
addHeaderOrFooterEmptyState: widget.addHeaderOrFooterEmptyState,
selectedFiles: widget.selectedFiles,
showSelectAllByDefault:
widget.showSelectAllByDefault && widget.groupType.showGroupHeader(),

94
mobile/apps/photos/pubspec.lock
View File

@@ -130,10 +130,10 @@ packages:
dependency: "direct main"
description:
name: async
sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c"
sha256: d2872f9c19731c2e5f10444b14686eb7cc85c76274bd6c16e1816bff9a3bab63
url: "https://pub.dev"
source: hosted
version: "2.11.0"
version: "2.12.0"
battery_info:
dependency: "direct main"
description:
@@ -155,10 +155,10 @@ packages:
dependency: transitive
description:
name: boolean_selector
sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66"
sha256: "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea"
url: "https://pub.dev"
source: hosted
version: "2.1.1"
version: "2.1.2"
brotli:
dependency: transitive
description:
@@ -268,10 +268,10 @@ packages:
dependency: transitive
description:
name: characters
sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605"
sha256: f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803
url: "https://pub.dev"
source: hosted
version: "1.3.0"
version: "1.4.0"
checked_yaml:
dependency: transitive
description:
@@ -301,10 +301,10 @@ packages:
dependency: transitive
description:
name: clock
sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf
sha256: fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b
url: "https://pub.dev"
source: hosted
version: "1.1.1"
version: "1.1.2"
code_builder:
dependency: transitive
description:
@@ -317,10 +317,10 @@ packages:
dependency: "direct main"
description:
name: collection
sha256: a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf
sha256: "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76"
url: "https://pub.dev"
source: hosted
version: "1.19.0"
version: "1.19.1"
computer:
dependency: "direct main"
description:
@@ -619,10 +619,10 @@ packages:
dependency: transitive
description:
name: fake_async
sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78"
sha256: "6a95e56b2449df2273fd8c45a662d6947ce1ebb7aafe80e550a3f68297f3cacc"
url: "https://pub.dev"
source: hosted
version: "1.3.1"
version: "1.3.2"
fast_base58:
dependency: "direct main"
description:
@@ -668,10 +668,10 @@ packages:
dependency: transitive
description:
name: file
sha256: "5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c"
sha256: a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4
url: "https://pub.dev"
source: hosted
version: "7.0.0"
version: "7.0.1"
file_saver:
dependency: "direct main"
description:
@@ -1416,18 +1416,18 @@ packages:
dependency: transitive
description:
name: leak_tracker
sha256: "7bb2830ebd849694d1ec25bf1f44582d6ac531a57a365a803a6034ff751d2d06"
sha256: c35baad643ba394b40aac41080300150a4f08fd0fd6a10378f8f7c6bc161acec
url: "https://pub.dev"
source: hosted
version: "10.0.7"
version: "10.0.8"
leak_tracker_flutter_testing:
dependency: transitive
description:
name: leak_tracker_flutter_testing
sha256: "9491a714cca3667b60b5c420da8217e6de0d1ba7a5ec322fab01758f6998f379"
sha256: f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573
url: "https://pub.dev"
source: hosted
version: "3.0.8"
version: "3.0.9"
leak_tracker_testing:
dependency: transitive
description:
@@ -1552,10 +1552,10 @@ packages:
dependency: transitive
description:
name: matcher
sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb
sha256: dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2
url: "https://pub.dev"
source: hosted
version: "0.12.16+1"
version: "0.12.17"
material_color_utilities:
dependency: transitive
description:
@@ -1645,10 +1645,10 @@ packages:
dependency: transitive
description:
name: meta
sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7
sha256: e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c
url: "https://pub.dev"
source: hosted
version: "1.15.0"
version: "1.16.0"
mgrs_dart:
dependency: transitive
description:
@@ -1859,10 +1859,10 @@ packages:
dependency: "direct main"
description:
name: path
sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af"
sha256: "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5"
url: "https://pub.dev"
source: hosted
version: "1.9.0"
version: "1.9.1"
path_drawing:
dependency: transitive
description:
@@ -2019,10 +2019,10 @@ packages:
dependency: transitive
description:
name: platform
sha256: "9b71283fc13df574056616011fb138fd3b793ea47cc509c189a6c3fa5f8a1a65"
sha256: "5d6b1b0036a5f331ebc77c850ebc8506cbc1e9416c27e59b439f917a902a4984"
url: "https://pub.dev"
source: hosted
version: "3.1.5"
version: "3.1.6"
plugin_platform_interface:
dependency: transitive
description:
@@ -2068,10 +2068,10 @@ packages:
dependency: transitive
description:
name: process
sha256: "21e54fd2faf1b5bdd5102afd25012184a6793927648ea81eea80552ac9405b32"
sha256: "107d8be718f120bbba9dcd1e95e3bd325b1b4a4f07db64154635ba03f2567a0d"
url: "https://pub.dev"
source: hosted
version: "5.0.2"
version: "5.0.3"
proj4dart:
dependency: transitive
description:
@@ -2346,10 +2346,10 @@ packages:
dependency: transitive
description:
name: source_span
sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c"
sha256: "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c"
url: "https://pub.dev"
source: hosted
version: "1.10.0"
version: "1.10.1"
sprintf:
dependency: transitive
description:
@@ -2434,10 +2434,10 @@ packages:
dependency: transitive
description:
name: stack_trace
sha256: "9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377"
sha256: "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1"
url: "https://pub.dev"
source: hosted
version: "1.12.0"
version: "1.12.1"
step_progress_indicator:
dependency: "direct main"
description:
@@ -2450,10 +2450,10 @@ packages:
dependency: transitive
description:
name: stream_channel
sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7
sha256: "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d"
url: "https://pub.dev"
source: hosted
version: "2.1.2"
version: "2.1.4"
stream_transform:
dependency: transitive
description:
@@ -2466,10 +2466,10 @@ packages:
dependency: transitive
description:
name: string_scanner
sha256: "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3"
sha256: "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43"
url: "https://pub.dev"
source: hosted
version: "1.3.0"
version: "1.4.1"
styled_text:
dependency: "direct main"
description:
@@ -2522,34 +2522,34 @@ packages:
dependency: transitive
description:
name: term_glyph
sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84
sha256: "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e"
url: "https://pub.dev"
source: hosted
version: "1.2.1"
version: "1.2.2"
test:
dependency: "direct dev"
description:
name: test
sha256: "713a8789d62f3233c46b4a90b174737b2c04cb6ae4500f2aa8b1be8f03f5e67f"
sha256: "301b213cd241ca982e9ba50266bd3f5bd1ea33f1455554c5abb85d1be0e2d87e"
url: "https://pub.dev"
source: hosted
version: "1.25.8"
version: "1.25.15"
test_api:
dependency: transitive
description:
name: test_api
sha256: "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c"
sha256: fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd
url: "https://pub.dev"
source: hosted
version: "0.7.3"
version: "0.7.4"
test_core:
dependency: transitive
description:
name: test_core
sha256: "12391302411737c176b0b5d6491f466b0dd56d4763e347b6714efbaa74d7953d"
sha256: "84d17c3486c8dfdbe5e12a50c8ae176d15e2a771b96909a9442b40173649ccaa"
url: "https://pub.dev"
source: hosted
version: "0.6.5"
version: "0.6.8"
thermal:
dependency: "direct main"
description:
@@ -2813,10 +2813,10 @@ packages:
dependency: transitive
description:
name: vm_service
sha256: f6be3ed8bd01289b34d679c2b62226f63c0e69f9fd2e50a6b3c1c729a961041b
sha256: "0968250880a6c5fe7edc067ed0a13d4bae1577fe2771dcf3010d52c4a9d3ca14"
url: "https://pub.dev"
source: hosted
version: "14.3.0"
version: "14.3.1"
volume_controller:
dependency: transitive
description:
@@ -2978,5 +2978,5 @@ packages:
source: hosted
version: "3.1.3"
sdks:
dart: ">=3.5.0 <4.0.0"
dart: ">=3.7.0-0 <4.0.0"
flutter: ">=3.24.0"