|
@@ -23,7 +23,7 @@ import 'package:photos/utils/share_util.dart';
|
|
|
import 'package:photos/utils/toast_util.dart';
|
|
|
import 'package:receive_sharing_intent/receive_sharing_intent.dart';
|
|
|
|
|
|
-enum CollectionActionType { addFiles, moveFiles, restoreFiles }
|
|
|
+enum CollectionActionType { addFiles, moveFiles, restoreFiles, unHide }
|
|
|
|
|
|
String _actionName(CollectionActionType type, bool plural) {
|
|
|
final titleSuffix = (plural ? "s" : "");
|
|
@@ -38,6 +38,9 @@ String _actionName(CollectionActionType type, bool plural) {
|
|
|
case CollectionActionType.restoreFiles:
|
|
|
text = "Restore file";
|
|
|
break;
|
|
|
+ case CollectionActionType.unHide:
|
|
|
+ text = "Unhide file";
|
|
|
+ break;
|
|
|
}
|
|
|
return text + titleSuffix;
|
|
|
}
|
|
@@ -193,7 +196,7 @@ class _CreateCollectionPageState extends State<CreateCollectionPage> {
|
|
|
for (final file in latestCollectionFiles) {
|
|
|
final c =
|
|
|
CollectionsService.instance.getCollectionByID(file.collectionID);
|
|
|
- if (c.owner.id == Configuration.instance.getUserID()) {
|
|
|
+ if (c.owner.id == Configuration.instance.getUserID() && !c.isHidden()) {
|
|
|
collectionsWithThumbnail.add(CollectionWithThumbnail(c, file));
|
|
|
}
|
|
|
}
|
|
@@ -279,6 +282,8 @@ class _CreateCollectionPageState extends State<CreateCollectionPage> {
|
|
|
return _addToCollection(collectionID);
|
|
|
case CollectionActionType.moveFiles:
|
|
|
return _moveFilesToCollection(collectionID);
|
|
|
+ case CollectionActionType.unHide:
|
|
|
+ return _moveFilesToCollection(collectionID);
|
|
|
case CollectionActionType.restoreFiles:
|
|
|
return _restoreFilesToCollection(collectionID);
|
|
|
}
|
|
@@ -286,7 +291,10 @@ class _CreateCollectionPageState extends State<CreateCollectionPage> {
|
|
|
}
|
|
|
|
|
|
Future<bool> _moveFilesToCollection(int toCollectionID) async {
|
|
|
- final dialog = createProgressDialog(context, "Moving files to album...");
|
|
|
+ final String message = widget.actionType == CollectionActionType.moveFiles
|
|
|
+ ? "Moving files to album..."
|
|
|
+ : "Un hide files to album";
|
|
|
+ final dialog = createProgressDialog(context, message);
|
|
|
await dialog.show();
|
|
|
try {
|
|
|
final int fromCollectionID =
|