Skip to content

armgit / ente

Public Imported from GitHub
0

πŸ’š End-to-end encrypted cloud for everything.

[mobile][photos] Hide delete all for empty trash

Priyanshu Dangaree53c40402d4d
diff --git a/mobile/apps/photos/lib/ui/viewer/gallery/trash_page.dart b/mobile/apps/photos/lib/ui/viewer/gallery/trash_page.dart
index 6b6b8169f6..fa878b5f77 100644
--- a/mobile/apps/photos/lib/ui/viewer/gallery/trash_page.dart
+++ b/mobile/apps/photos/lib/ui/viewer/gallery/trash_page.dart
@@ -51,6 +51,7 @@ class _TrashPage extends StatefulWidget {
class _TrashPageState extends State<_TrashPage> {
bool _isOnEnteTrash = !isLocalGalleryMode;
+ bool _hasTrashFiles = false;
final _selectedFiles = SelectedFiles();
@override
@@ -71,6 +72,7 @@ class _TrashPageState extends State<_TrashPage> {
setState(() {
_selectedFiles.clearAll();
_isOnEnteTrash = true;
+ _hasTrashFiles = false;
});
}
},
@@ -83,6 +85,7 @@ class _TrashPageState extends State<_TrashPage> {
setState(() {
_selectedFiles.clearAll();
_isOnEnteTrash = false;
+ _hasTrashFiles = false;
});
}
},
@@ -145,7 +148,7 @@ class _TrashPageState extends State<_TrashPage> {
floatingActionButton: ListenableBuilder(
listenable: _selectedFiles,
builder: (context, _) {
- if (_selectedFiles.files.isNotEmpty) {
+ if (_selectedFiles.files.isNotEmpty || !_hasTrashFiles) {
return const SizedBox.shrink();
}
return Padding(
@@ -153,10 +156,8 @@ class _TrashPageState extends State<_TrashPage> {
child: FABComponent(
label: l10n.deleteAll,
icon: const HugeIcon(icon: HugeIcons.strokeRoundedDelete02),
- onTap: () => showConfirmDeleteAllTrashSheet(
- context,
- _isOnEnteTrash,
- ),
+ onTap: () =>
+ showConfirmDeleteAllTrashSheet(context, _isOnEnteTrash),
),
);
},
@@ -176,30 +177,40 @@ class _TrashPageState extends State<_TrashPage> {
int? limit,
bool? asc,
}) async {
- if (_isOnEnteTrash) {
- return await TrashDB.instance.getTrashedFiles(
+ final isOnEnteTrash = _isOnEnteTrash;
+ late final FileLoadResult result;
+ if (isOnEnteTrash) {
+ result = await TrashDB.instance.getTrashedFiles(
creationStartTime,
creationEndTime,
limit: limit,
asc: asc,
);
- }
- final deviceTrash = await DeviceTrashClient.instance.getFiles();
- final deviceTrashAssets = await Future.wait(
- deviceTrash.map((t) => AssetEntity.fromId(t.localID.toString())),
- );
- final List<EnteFile> files = [];
- for (var i = 0; i < deviceTrash.length; i++) {
- final trash = deviceTrash[i];
- final asset = deviceTrashAssets[i];
- if (asset == null) continue;
- files.add(
- DeviceTrashFile.from(
- fileFromAsset(trash.deviceFolder, asset),
- deleteBy: trash.deleteBy,
- ),
+ } else {
+ final deviceTrash = await DeviceTrashClient.instance.getFiles();
+ final deviceTrashAssets = await Future.wait(
+ deviceTrash.map((t) => AssetEntity.fromId(t.localID.toString())),
);
+ final List<EnteFile> files = [];
+ for (var i = 0; i < deviceTrash.length; i++) {
+ final trash = deviceTrash[i];
+ final asset = deviceTrashAssets[i];
+ if (asset == null) continue;
+ files.add(
+ DeviceTrashFile.from(
+ fileFromAsset(trash.deviceFolder, asset),
+ deleteBy: trash.deleteBy,
+ ),
+ );
+ }
+ result = FileLoadResult(files, false);
+ }
+ if (mounted && _isOnEnteTrash == isOnEnteTrash) {
+ final hasTrashFiles = result.files.isNotEmpty;
+ if (_hasTrashFiles != hasTrashFiles) {
+ setState(() => _hasTrashFiles = hasTrashFiles);
+ }
}
- return FileLoadResult(files, false);
+ return result;
}
}