Merge pull request #1802 from MoonlightWave-12/improve-file-selection-for-videos-and-images

Make more file-types visible when selecting images or videos to send

lib/utils/file_selector.dart

@@ -30,17 +30,11 @@ Future<List<XFile>> selectFiles(
 
   if (allowMultiple) {
     return await AppLock.of(context).pauseWhile(
-      openFiles(
+      openFiles(confirmButtonText: title, acceptedTypeGroups: type.groups),
-        confirmButtonText: title,
-        acceptedTypeGroups: type.groups,
-      ),
     );
   }
   final file = await AppLock.of(context).pauseWhile(
-    openFile(
+    openFile(confirmButtonText: title, acceptedTypeGroups: type.groups),
-      confirmButtonText: title,
-      acceptedTypeGroups: type.groups,
-    ),
   );
   if (file == null) return [];
   return [file];
@@ -50,38 +44,46 @@ enum FileSelectorType {
   any([], FileType.any, null),
   images(
     [
+      XTypeGroup(
+        label: 'Images',
+        extensions: <String>[
+          'jpg',
+          'JPG',
+          'jpeg',
+          'JPEG',
+          'png',
+          'PNG',
+          'webp',
+          'WebP',
+          'WEBP',
+          'gif',
+          'GIF',
+          'bmp',
+          'BMP',
+          'tiff',
+          'TIFF',
+          'tif',
+          'TIF',
+          'heic',
+          'HEIC',
+          'svg',
+          'SVG',
+        ],
+      ),
       XTypeGroup(
         label: 'JPG',
         extensions: <String>['jpg', 'JPG', 'jpeg', 'JPEG'],
       ),
-      XTypeGroup(
+      XTypeGroup(label: 'PNG', extensions: <String>['png', 'PNG']),
-        label: 'PNGs',
+      XTypeGroup(label: 'WebP', extensions: <String>['webp', 'WebP', 'WEBP']),
-        extensions: <String>['png', 'PNG'],
+      XTypeGroup(label: 'GIF', extensions: <String>['gif', 'GIF']),
-      ),
+      XTypeGroup(label: 'BMP', extensions: <String>['bmp', 'BMP']),
-      XTypeGroup(
-        label: 'WEBP',
-        extensions: <String>['WebP', 'WEBP'],
-      ),
-      XTypeGroup(
-        label: 'GIF',
-        extensions: <String>['gif', 'GIF'],
-      ),
-      XTypeGroup(
-        label: 'BMP',
-        extensions: <String>['bmp', 'BMP'],
-      ),
       XTypeGroup(
         label: 'TIFF',
         extensions: <String>['tiff', 'TIFF', 'tif', 'TIF'],
       ),
-      XTypeGroup(
+      XTypeGroup(label: 'HEIC', extensions: <String>['heic', 'HEIC']),
-        label: 'HEIC',
+      XTypeGroup(label: 'SVG', extensions: <String>['svg', 'SVG']),
-        extensions: <String>['heic', 'HEIC'],
-      ),
-      XTypeGroup(
-        label: 'SVG',
-        extensions: <String>['svg', 'SVG'],
-      ),
     ],
     FileType.image,
     null,
@@ -89,51 +91,48 @@ enum FileSelectorType {
   videos(
     [
       XTypeGroup(
-        label: 'MP4',
+        label: 'Videos',
-        extensions: <String>['mp4', 'MP4'],
+        extensions: <String>[
-      ),
+          'mp4',
-      XTypeGroup(
+          'MP4',
-        label: 'AVI',
+          'avi',
-        extensions: <String>['avi', 'AVI'],
+          'AVI',
-      ),
+          'webm',
-      XTypeGroup(
+          'WebM',
-        label: 'MOV',
+          'WEBM',
-        extensions: <String>['mov', 'MOV'],
+          'mov',
-      ),
+          'MOV',
-      XTypeGroup(
+          'mkv',
-        label: 'MKV',
+          'MKV',
-        extensions: <String>['mkv', 'MKV'],
+          'wmv',
-      ),
+          'WMV',
-      XTypeGroup(
+          'flv',
-        label: 'WMV',
+          'FLV',
-        extensions: <String>['wmv', 'WMV'],
+          'mpeg',
-      ),
+          'MPEG',
-      XTypeGroup(
+          '3gp',
-        label: 'FLV',
+          '3GP',
-        extensions: <String>['flv', 'FLV'],
+          'ogg',
-      ),
+          'OGG',
-      XTypeGroup(
+        ],
-        label: 'MPEG',
-        extensions: <String>['mpeg', 'MPEG'],
-      ),
-      XTypeGroup(
-        label: '3GP',
-        extensions: <String>['3gp', '3GP'],
-      ),
-      XTypeGroup(
-        label: 'OGG',
-        extensions: <String>['ogg', 'OGG'],
       ),
+      XTypeGroup(label: 'MP4', extensions: <String>['mp4', 'MP4']),
+      XTypeGroup(label: 'WebM', extensions: <String>['webm', 'WebM', 'WEBM']),
+      XTypeGroup(label: 'AVI', extensions: <String>['avi', 'AVI']),
+      XTypeGroup(label: 'MOV', extensions: <String>['mov', 'MOV']),
+      XTypeGroup(label: 'MKV', extensions: <String>['mkv', 'MKV']),
+      XTypeGroup(label: 'WMV', extensions: <String>['wmv', 'WMV']),
+      XTypeGroup(label: 'FLV', extensions: <String>['flv', 'FLV']),
+      XTypeGroup(label: 'MPEG', extensions: <String>['mpeg', 'MPEG']),
+      XTypeGroup(label: '3GP', extensions: <String>['3gp', '3GP']),
+      XTypeGroup(label: 'OGG', extensions: <String>['ogg', 'OGG']),
     ],
     FileType.video,
     null,
   ),
   zip(
     [
-      XTypeGroup(
+      XTypeGroup(label: 'ZIP', extensions: <String>['zip', 'ZIP']),
-        label: 'ZIP',
-        extensions: <String>['zip', 'ZIP'],
-      ),
     ],
     FileType.custom,
     ['zip', 'ZIP'],