diff --git a/lib/ui/actions/collection/collection_file_actions.dart b/lib/ui/actions/collection/collection_file_actions.dart index 232520664..846f56744 100644 --- a/lib/ui/actions/collection/collection_file_actions.dart +++ b/lib/ui/actions/collection/collection_file_actions.dart @@ -16,13 +16,15 @@ extension CollectionFileActions on CollectionActions { BuildContext bContext, Collection collection, SelectedFiles selectedFiles, + bool removingOthersFile, ) async { final actionResult = await showActionSheet( context: bContext, buttons: [ ButtonWidget( - labelText: "Yes, remove", - buttonType: ButtonType.neutral, + labelText: "Remove", + buttonType: + removingOthersFile ? ButtonType.critical : ButtonType.neutral, buttonSize: ButtonSize.large, shouldStickToDarkTheme: true, isInAlert: true, @@ -48,9 +50,11 @@ extension CollectionFileActions on CollectionActions { isInAlert: true, ), ], - title: "Remove from album?", - body: "Selected items will be removed from this album. Items which are " - "only in this album will be moved to Uncategorized.", + title: removingOthersFile ? "Remove from album?" : null, + body: removingOthersFile + ? "Some of the items you are removing were " + "added by other people, and you will lose access to them" + : "Selected items will be removed from this album", actionSheetType: ActionSheetType.defaultActionSheet, ); if (actionResult != null && actionResult == ButtonAction.error) { diff --git a/lib/ui/viewer/actions/file_selection_actions_widget.dart b/lib/ui/viewer/actions/file_selection_actions_widget.dart index ce1f6aed3..2f2c65a48 100644 --- a/lib/ui/viewer/actions/file_selection_actions_widget.dart +++ b/lib/ui/viewer/actions/file_selection_actions_widget.dart @@ -316,10 +316,13 @@ class _FileSelectionActionWidgetState extends State { widget.selectedFiles .unSelectAll(split.ownedByOtherUsers.toSet(), skipNotify: true); } + final bool removingOthersFile = + isCollectionOwner && split.ownedByOtherUsers.isNotEmpty; await collectionActions.showRemoveFromCollectionSheetV2( context, widget.collection!, widget.selectedFiles, + removingOthersFile, ); }