diff --git a/lib/ui/home_widget.dart b/lib/ui/home_widget.dart index fb9152bc4..8551cd04e 100644 --- a/lib/ui/home_widget.dart +++ b/lib/ui/home_widget.dart @@ -28,8 +28,7 @@ import 'package:photos/theme/colors.dart'; import 'package:photos/theme/ente_theme.dart'; import 'package:photos/ui/collections_gallery_widget.dart'; import 'package:photos/ui/common/bottom_shadow.dart'; -import 'package:photos/ui/create_collection_sheet.dart' - as create_collection_sheet; +import 'package:photos/ui/create_collection_sheet.dart'; import 'package:photos/ui/extents_page_view.dart'; import 'package:photos/ui/home/grant_permissions_widget.dart'; import 'package:photos/ui/home/header_widget.dart'; @@ -329,11 +328,11 @@ class _HomeWidgetState extends State { _shouldRenderCreateCollectionSheet = false; ReceiveSharingIntent.reset(); Future.delayed(const Duration(milliseconds: 10), () { - create_collection_sheet.createCollectionSheet( + createCollectionSheet( null, _sharedFiles, context, - actionType: create_collection_sheet.CollectionActionType.addFiles, + actionType: CollectionActionType.addFiles, ); }); } diff --git a/lib/ui/viewer/actions/file_selection_actions_widget.dart b/lib/ui/viewer/actions/file_selection_actions_widget.dart index 0f70fb50b..a595a8d90 100644 --- a/lib/ui/viewer/actions/file_selection_actions_widget.dart +++ b/lib/ui/viewer/actions/file_selection_actions_widget.dart @@ -18,8 +18,7 @@ import 'package:photos/ui/components/blur_menu_item_widget.dart'; import 'package:photos/ui/components/bottom_action_bar/expanded_menu_widget.dart'; import 'package:photos/ui/components/button_widget.dart'; import 'package:photos/ui/components/models/button_type.dart'; -import 'package:photos/ui/create_collection_sheet.dart' - as create_collection_sheet; +import 'package:photos/ui/create_collection_sheet.dart'; import 'package:photos/ui/sharing/manage_links_widget.dart'; import 'package:photos/utils/delete_file_util.dart'; import 'package:photos/utils/magic_util.dart'; @@ -254,11 +253,11 @@ class _FileSelectionActionWidgetState extends State { widget.selectedFiles .unSelectAll(split.ownedByOtherUsers.toSet(), skipNotify: true); } - create_collection_sheet.createCollectionSheet( + createCollectionSheet( widget.selectedFiles, null, context, - actionType: create_collection_sheet.CollectionActionType.moveFiles, + actionType: CollectionActionType.moveFiles, ); } @@ -267,7 +266,7 @@ class _FileSelectionActionWidgetState extends State { widget.selectedFiles .unSelectAll(split.ownedByOtherUsers.toSet(), skipNotify: true); } - create_collection_sheet.createCollectionSheet( + createCollectionSheet( widget.selectedFiles, null, context, @@ -347,11 +346,11 @@ class _FileSelectionActionWidgetState extends State { widget.selectedFiles .unSelectAll(split.ownedByOtherUsers.toSet(), skipNotify: true); } - create_collection_sheet.createCollectionSheet( + createCollectionSheet( widget.selectedFiles, null, context, - actionType: create_collection_sheet.CollectionActionType.unHide, + actionType: CollectionActionType.unHide, ); } diff --git a/lib/ui/viewer/actions/file_selection_overlay_bar.dart b/lib/ui/viewer/actions/file_selection_overlay_bar.dart index 11d8925d9..6d20241bb 100644 --- a/lib/ui/viewer/actions/file_selection_overlay_bar.dart +++ b/lib/ui/viewer/actions/file_selection_overlay_bar.dart @@ -7,8 +7,7 @@ import 'package:photos/models/selected_files.dart'; import 'package:photos/theme/ente_theme.dart'; import 'package:photos/ui/components/bottom_action_bar/bottom_action_bar_widget.dart'; import 'package:photos/ui/components/icon_button_widget.dart'; -import 'package:photos/ui/create_collection_sheet.dart' - as create_collection_sheet; +import 'package:photos/ui/create_collection_sheet.dart'; import 'package:photos/ui/viewer/actions/file_selection_actions_widget.dart'; import 'package:photos/utils/delete_file_util.dart'; import 'package:photos/utils/magic_util.dart'; @@ -86,11 +85,11 @@ class _FileSelectionOverlayBarState extends State { iconButtonType: IconButtonType.primary, iconColor: iconColor, onTap: () { - create_collection_sheet.createCollectionSheet( + createCollectionSheet( widget.selectedFiles, null, context, - actionType: create_collection_sheet.CollectionActionType.unHide, + actionType: CollectionActionType.unHide, ); }, ), diff --git a/lib/ui/viewer/file/fading_app_bar.dart b/lib/ui/viewer/file/fading_app_bar.dart index b841080f8..b9bcf5d27 100644 --- a/lib/ui/viewer/file/fading_app_bar.dart +++ b/lib/ui/viewer/file/fading_app_bar.dart @@ -25,8 +25,7 @@ import 'package:photos/ui/common/progress_dialog.dart'; import 'package:photos/ui/components/action_sheet_widget.dart'; import 'package:photos/ui/components/button_widget.dart'; import 'package:photos/ui/components/models/button_type.dart'; -import 'package:photos/ui/create_collection_sheet.dart' - as create_collection_sheet; +import 'package:photos/ui/create_collection_sheet.dart'; import 'package:photos/ui/viewer/file/custom_app_bar.dart'; import 'package:photos/utils/delete_file_util.dart'; import 'package:photos/utils/dialog_util.dart'; @@ -273,11 +272,11 @@ class FadingAppBarState extends State { final s = SelectedFiles(); s.files.add(widget.file); Navigator.pop(context); - create_collection_sheet.createCollectionSheet( + createCollectionSheet( s, null, context, - actionType: create_collection_sheet.CollectionActionType.unHide, + actionType: CollectionActionType.unHide, ); } diff --git a/lib/ui/viewer/file/fading_bottom_bar.dart b/lib/ui/viewer/file/fading_bottom_bar.dart index b24ece11c..806a00007 100644 --- a/lib/ui/viewer/file/fading_bottom_bar.dart +++ b/lib/ui/viewer/file/fading_bottom_bar.dart @@ -12,8 +12,7 @@ import 'package:photos/models/trash_file.dart'; import 'package:photos/services/collections_service.dart'; import 'package:photos/theme/colors.dart'; import 'package:photos/theme/ente_theme.dart'; -import 'package:photos/ui/create_collection_sheet.dart' - as create_collection_sheet; +import 'package:photos/ui/create_collection_sheet.dart'; import 'package:photos/ui/viewer/file/file_info_widget.dart'; import 'package:photos/utils/delete_file_util.dart'; import 'package:photos/utils/magic_util.dart'; @@ -239,12 +238,11 @@ class FadingBottomBarState extends State { final selectedFiles = SelectedFiles(); selectedFiles.toggleSelection(widget.file); Navigator.pop(context); - create_collection_sheet.createCollectionSheet( + createCollectionSheet( selectedFiles, null, context, - actionType: - create_collection_sheet.CollectionActionType.restoreFiles, + actionType: CollectionActionType.restoreFiles, ); }, ), diff --git a/lib/ui/viewer/gallery/gallery_overlay_widget.dart b/lib/ui/viewer/gallery/gallery_overlay_widget.dart index 2729c3a5d..a98ea0d0b 100644 --- a/lib/ui/viewer/gallery/gallery_overlay_widget.dart +++ b/lib/ui/viewer/gallery/gallery_overlay_widget.dart @@ -15,8 +15,7 @@ import 'package:photos/models/magic_metadata.dart'; import 'package:photos/models/selected_files.dart'; import 'package:photos/services/collections_service.dart'; import 'package:photos/services/hidden_service.dart'; -import 'package:photos/ui/create_collection_sheet.dart' - as create_collection_sheet; +import 'package:photos/ui/create_collection_sheet.dart'; import 'package:photos/utils/delete_file_util.dart'; import 'package:photos/utils/dialog_util.dart'; import 'package:photos/utils/magic_util.dart'; @@ -413,12 +412,11 @@ class _OverlayWidgetState extends State { Icons.restore, ), onPressed: () { - create_collection_sheet.createCollectionSheet( + createCollectionSheet( widget.selectedFiles, null, context, - actionType: - create_collection_sheet.CollectionActionType.restoreFiles, + actionType: CollectionActionType.restoreFiles, ); }, ),