Browse Source

Minor refactoring

ashilkn 2 years ago
parent
commit
7daba6326b

+ 8 - 8
lib/ui/create_collection_sheet.dart

@@ -54,17 +54,17 @@ String _actionName(CollectionActionType type, bool plural) {
   return addTitleSuffix ? text + titleSuffix : text;
   return addTitleSuffix ? text + titleSuffix : text;
 }
 }
 
 
-void createCollectionSheet(
+void showCollectionActionSheet(
+  BuildContext context, {
   SelectedFiles? selectedFiles,
   SelectedFiles? selectedFiles,
   List<SharedMediaFile>? sharedFiles,
   List<SharedMediaFile>? sharedFiles,
-  BuildContext context, {
   CollectionActionType actionType = CollectionActionType.addFiles,
   CollectionActionType actionType = CollectionActionType.addFiles,
   bool showOptionToCreateNewAlbum = true,
   bool showOptionToCreateNewAlbum = true,
 }) {
 }) {
   showBarModalBottomSheet(
   showBarModalBottomSheet(
     context: context,
     context: context,
     builder: (context) {
     builder: (context) {
-      return CreateCollectionSheet(
+      return CollectionActionSheet(
         selectedFiles: selectedFiles,
         selectedFiles: selectedFiles,
         sharedFiles: sharedFiles,
         sharedFiles: sharedFiles,
         actionType: actionType,
         actionType: actionType,
@@ -84,12 +84,12 @@ void createCollectionSheet(
   );
   );
 }
 }
 
 
-class CreateCollectionSheet extends StatefulWidget {
+class CollectionActionSheet extends StatefulWidget {
   final SelectedFiles? selectedFiles;
   final SelectedFiles? selectedFiles;
   final List<SharedMediaFile>? sharedFiles;
   final List<SharedMediaFile>? sharedFiles;
   final CollectionActionType actionType;
   final CollectionActionType actionType;
   final bool showOptionToCreateNewAlbum;
   final bool showOptionToCreateNewAlbum;
-  const CreateCollectionSheet({
+  const CollectionActionSheet({
     required this.selectedFiles,
     required this.selectedFiles,
     required this.sharedFiles,
     required this.sharedFiles,
     required this.actionType,
     required this.actionType,
@@ -98,11 +98,11 @@ class CreateCollectionSheet extends StatefulWidget {
   });
   });
 
 
   @override
   @override
-  State<CreateCollectionSheet> createState() => _CreateCollectionSheetState();
+  State<CollectionActionSheet> createState() => _CollectionActionSheetState();
 }
 }
 
 
-class _CreateCollectionSheetState extends State<CreateCollectionSheet> {
-  final _logger = Logger((_CreateCollectionSheetState).toString());
+class _CollectionActionSheetState extends State<CollectionActionSheet> {
+  final _logger = Logger((_CollectionActionSheetState).toString());
 
 
   @override
   @override
   Widget build(BuildContext context) {
   Widget build(BuildContext context) {

+ 2 - 3
lib/ui/home_widget.dart

@@ -336,10 +336,9 @@ class _HomeWidgetState extends State<HomeWidget> {
       _shouldRenderCreateCollectionSheet = false;
       _shouldRenderCreateCollectionSheet = false;
       ReceiveSharingIntent.reset();
       ReceiveSharingIntent.reset();
       Future.delayed(const Duration(milliseconds: 10), () {
       Future.delayed(const Duration(milliseconds: 10), () {
-        createCollectionSheet(
-          null,
-          _sharedFiles,
+        showCollectionActionSheet(
           context,
           context,
+          sharedFiles: _sharedFiles,
           actionType: CollectionActionType.addFiles,
           actionType: CollectionActionType.addFiles,
         );
         );
       });
       });

+ 7 - 14
lib/ui/viewer/actions/file_selection_actions_widget.dart

@@ -283,10 +283,9 @@ class _FileSelectionActionWidgetState extends State<FileSelectionActionWidget> {
       widget.selectedFiles
       widget.selectedFiles
           .unSelectAll(split.ownedByOtherUsers.toSet(), skipNotify: true);
           .unSelectAll(split.ownedByOtherUsers.toSet(), skipNotify: true);
     }
     }
-    createCollectionSheet(
-      widget.selectedFiles,
-      null,
+    showCollectionActionSheet(
       context,
       context,
+      selectedFiles: widget.selectedFiles,
       actionType: CollectionActionType.moveFiles,
       actionType: CollectionActionType.moveFiles,
     );
     );
   }
   }
@@ -296,11 +295,7 @@ class _FileSelectionActionWidgetState extends State<FileSelectionActionWidget> {
       widget.selectedFiles
       widget.selectedFiles
           .unSelectAll(split.ownedByOtherUsers.toSet(), skipNotify: true);
           .unSelectAll(split.ownedByOtherUsers.toSet(), skipNotify: true);
     }
     }
-    createCollectionSheet(
-      widget.selectedFiles,
-      null,
-      context,
-    );
+    showCollectionActionSheet(context, selectedFiles: widget.selectedFiles);
   }
   }
 
 
   Future<void> _onDeleteClick() async {
   Future<void> _onDeleteClick() async {
@@ -381,10 +376,9 @@ class _FileSelectionActionWidgetState extends State<FileSelectionActionWidget> {
       widget.selectedFiles
       widget.selectedFiles
           .unSelectAll(split.ownedByOtherUsers.toSet(), skipNotify: true);
           .unSelectAll(split.ownedByOtherUsers.toSet(), skipNotify: true);
     }
     }
-    createCollectionSheet(
-      widget.selectedFiles,
-      null,
+    showCollectionActionSheet(
       context,
       context,
+      selectedFiles: widget.selectedFiles,
       actionType: CollectionActionType.unHide,
       actionType: CollectionActionType.unHide,
     );
     );
   }
   }
@@ -459,10 +453,9 @@ class _FileSelectionActionWidgetState extends State<FileSelectionActionWidget> {
   }
   }
 
 
   void _restore() {
   void _restore() {
-    createCollectionSheet(
-      widget.selectedFiles,
-      null,
+    showCollectionActionSheet(
       context,
       context,
+      selectedFiles: widget.selectedFiles,
       actionType: CollectionActionType.restoreFiles,
       actionType: CollectionActionType.restoreFiles,
     );
     );
   }
   }

+ 2 - 3
lib/ui/viewer/actions/file_selection_overlay_bar.dart

@@ -85,10 +85,9 @@ class _FileSelectionOverlayBarState extends State<FileSelectionOverlayBar> {
           iconButtonType: IconButtonType.primary,
           iconButtonType: IconButtonType.primary,
           iconColor: iconColor,
           iconColor: iconColor,
           onTap: () {
           onTap: () {
-            createCollectionSheet(
-              widget.selectedFiles,
-              null,
+            showCollectionActionSheet(
               context,
               context,
+              selectedFiles: widget.selectedFiles,
               actionType: CollectionActionType.unHide,
               actionType: CollectionActionType.unHide,
             );
             );
           },
           },

+ 4 - 5
lib/ui/viewer/file/fading_app_bar.dart

@@ -269,12 +269,11 @@ class FadingAppBarState extends State<FadingAppBar> {
   }
   }
 
 
   Future<void> _handleUnHideRequest(BuildContext context) async {
   Future<void> _handleUnHideRequest(BuildContext context) async {
-    final s = SelectedFiles();
-    s.files.add(widget.file);
-    createCollectionSheet(
-      s,
-      null,
+    final selectedFiles = SelectedFiles();
+    selectedFiles.files.add(widget.file);
+    showCollectionActionSheet(
       context,
       context,
+      selectedFiles: selectedFiles,
       actionType: CollectionActionType.unHide,
       actionType: CollectionActionType.unHide,
     );
     );
   }
   }

+ 2 - 3
lib/ui/viewer/file/fading_bottom_bar.dart

@@ -237,10 +237,9 @@ class FadingBottomBarState extends State<FadingBottomBar> {
             onPressed: () {
             onPressed: () {
               final selectedFiles = SelectedFiles();
               final selectedFiles = SelectedFiles();
               selectedFiles.toggleSelection(widget.file);
               selectedFiles.toggleSelection(widget.file);
-              createCollectionSheet(
-                selectedFiles,
-                null,
+              showCollectionActionSheet(
                 context,
                 context,
+                selectedFiles: selectedFiles,
                 actionType: CollectionActionType.restoreFiles,
                 actionType: CollectionActionType.restoreFiles,
               );
               );
             },
             },