Migrate to file_selector, related to #558

app/lib/actions/export.dart

@@ -1,4 +1,4 @@
-import 'package:butterfly/api/save_data.dart';
+import 'package:butterfly/api/save.dart';
 import 'package:butterfly/bloc/document_bloc.dart';
 import 'package:butterfly_api/butterfly_api.dart';
 import 'package:flutter/material.dart';

app/lib/api/open.dart

@@ -1,8 +1,8 @@
 import 'dart:async';
-import 'dart:io';
 
+import 'package:butterfly/visualizer/asset.dart';
 import 'package:butterfly_api/butterfly_api.dart';
-import 'package:file_picker/file_picker.dart';
+import 'package:file_selector/file_selector.dart' as fs;
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:go_router/go_router.dart';
@@ -18,21 +18,19 @@ Future<bool> openHelp(List<String> pageLocation, [String? fragment]) {
       mode: LaunchMode.externalApplication);
 }
 
-Future<(Uint8List?, String?)> openSupported(
-    [List<String>? fileExtension]) async {
-  final isMobile = !kIsWeb && (Platform.isAndroid || Platform.isIOS);
-  final files = await FilePicker.platform.pickFiles(
-    type: isMobile ? FileType.any : FileType.custom,
-    allowedExtensions: isMobile
-        ? null
-        : (fileExtension ??
-            AssetFileType.values.expand((e) => e.getFileExtensions()).toList()),
-    allowMultiple: false,
-    withData: true,
+Future<(Uint8List?, String?)> importFile(BuildContext context,
+    [List<AssetFileType>? types]) async {
+  final result = await fs.openFile(
+    acceptedTypeGroups: (types ?? AssetFileType.values)
+        .map((e) => fs.XTypeGroup(
+              label: e.getLocalizedName(context),
+              extensions: e.getFileExtensions(),
+              mimeTypes: [e.getMime()],
+            ))
+        .toList(),
   );
-  if (files?.files.isEmpty ?? true) return (null, null);
-  var e = files!.files.first;
-  return (e.bytes, e.extension);
+  final data = await result?.readAsBytes();
+  return (data, result?.name.split('.').lastOrNull);
 }
 
 Future<void> openFile(

app/lib/api/save_data.dart → app/lib/api/save.dart

@@ -1,7 +1,4 @@
-import 'package:butterfly/api/save_data_stub.dart'
-    if (dart.library.io) 'package:butterfly/api/save_data_io.dart'
-    if (dart.library.js) 'package:butterfly/api/save_data_html.dart'
-    as save_data;
+import 'package:file_selector/file_selector.dart' as fs;
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
@@ -11,8 +8,21 @@ Future<void> exportFile(
   List<int> bytes,
   String fileExtension,
   String mimeType,
-) async =>
-    save_data.exportFile(context, bytes, fileExtension, mimeType);
+) async {
+  final result = await fs.getSaveLocation(
+    acceptedTypeGroups: [
+      fs.XTypeGroup(
+        label: AppLocalizations.of(context).export,
+        extensions: [fileExtension],
+        mimeTypes: [mimeType],
+      ),
+    ],
+  );
+  if (result == null) return;
+  final file = fs.XFile.fromData(Uint8List.fromList(bytes),
+      mimeType: mimeType, name: 'output.$fileExtension');
+  await file.saveTo(result.path);
+}
 
 Future<void> exportSvg(BuildContext context, String data) =>
     exportFile(context, data.codeUnits, 'svg', 'image/svg');

app/lib/dialogs/background/dialog.dart

@@ -1,13 +1,10 @@
-import 'dart:io';
 import 'dart:ui' as ui;
 
 import 'package:butterfly/api/open.dart';
 import 'package:butterfly/bloc/document_bloc.dart';
 import 'package:butterfly/dialogs/texture.dart';
 import 'package:butterfly/visualizer/preset.dart';
 import 'package:butterfly_api/butterfly_api.dart';
-import 'package:file_picker/file_picker.dart';
-import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';

app/lib/dialogs/background/general.dart

@@ -49,16 +49,13 @@ class _GeneralBackgroundPropertiesView extends StatelessWidget {
               onTap: () async {
                 final state = context.read<DocumentBloc>().state;
                 if (state is! DocumentLoaded) return;
-                final files = await FilePicker.platform.pickFiles(
-                    type: FileType.image, allowMultiple: false, withData: true);
-                if (files?.files.isEmpty ?? true) return;
-                final e = files!.files.first;
-                var content = e.bytes ?? Uint8List(0);
-                if (!kIsWeb) {
-                  content = await File(e.path ?? '').readAsBytes();
-                }
-                final dataPath = Uri.dataFromBytes(content).toString();
-                final codec = await ui.instantiateImageCodec(content);
+                final (result, _) = await importFile(
+                  context,
+                  [AssetFileType.image],
+                );
+                if (result == null) return;
+                final dataPath = Uri.dataFromBytes(result).toString();
+                final codec = await ui.instantiateImageCodec(result);
                 final frame = await codec.getNextFrame();
                 final image = frame.image;
                 final width = image.width.toDouble(),

app/lib/dialogs/collaboration/dialog.dart

@@ -1,4 +1,4 @@
-import 'package:butterfly/api/save_data.dart';
+import 'package:butterfly/api/save.dart';
 import 'package:butterfly/bloc/document_bloc.dart';
 import 'package:butterfly/cubits/current_index.dart';
 import 'package:butterfly/services/network.dart';

app/lib/dialogs/export/image.dart

@@ -1,6 +1,6 @@
 import 'dart:ui' as ui;
 
-import 'package:butterfly/api/save_data.dart';
+import 'package:butterfly/api/save.dart';
 import 'package:butterfly/bloc/document_bloc.dart';
 import 'package:butterfly_api/butterfly_api.dart';
 import 'package:flutter/foundation.dart';

app/lib/dialogs/export/svg.dart

@@ -9,7 +9,7 @@ import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:material_leap/material_leap.dart';
 import 'package:phosphor_flutter/phosphor_flutter.dart';
 
-import '../../api/save_data.dart';
+import '../../api/save.dart';
 
 class SvgExportDialog extends StatefulWidget {
   final double x, y;

app/lib/dialogs/packs/color_pick.dart

@@ -1,4 +1,4 @@
-import 'package:butterfly/api/save_data.dart';
+import 'package:butterfly/api/save.dart';
 import 'package:butterfly/bloc/document_bloc.dart';
 import 'package:butterfly_api/butterfly_api.dart';
 import 'package:collection/collection.dart';

app/lib/dialogs/packs/dialog.dart

@@ -10,7 +10,7 @@ import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:material_leap/material_leap.dart';
 import 'package:phosphor_flutter/phosphor_flutter.dart';
 
-import '../../api/save_data.dart';
+import '../../api/save.dart';
 import '../../widgets/remote_button.dart';
 import 'pack.dart';
 
@@ -337,7 +337,8 @@ class _PacksDialogState extends State<PacksDialog>
                                   PhosphorIconsLight.arrowSquareIn),
                               onTap: () async {
                                 Navigator.of(ctx).pop();
-                                final (data, _) = await openSupported(['bfly']);
+                                final (data, _) = await importFile(
+                                    context, [AssetFileType.note]);
                                 if (data == null) return;
                                 final pack = NoteData.fromData(data);
                                 final metadata = pack.getMetadata();

app/lib/handlers/asset.dart

@@ -28,34 +28,17 @@ Future<void> showImportAssetWizard(ImportType type, BuildContext context,
         position: position, advanced: advanced);
   }
 
-  Future<void> importWithDialog(
-    AssetFileType assetType, {
-    FileType type = FileType.any,
-    List<String>? allowedExtensions,
-  }) async {
-    final files = await FilePicker.platform.pickFiles(
-      type: type,
-      allowedExtensions: allowedExtensions,
-      allowMultiple: false,
-      withData: true,
-    );
-    if (files?.files.isEmpty ?? true) return;
-    final e = files!.files.first;
-    var content = e.bytes ?? Uint8List(0);
-    if (!kIsWeb) {
-      content = await File(e.path ?? '').readAsBytes();
-    }
-    return importAsset(assetType, content);
+  Future<void> importWithDialog(AssetFileType type) async {
+    final (result, _) = await importFile(context, [type]);
+    if (result == null) return;
+    return importAsset(type, result);
   }
 
   if (!type.isAvailable()) return;
 
   switch (type) {
     case ImportType.image:
-      return importWithDialog(
-        AssetFileType.image,
-        type: FileType.image,
-      );
+      return importWithDialog(AssetFileType.image);
     case ImportType.camera:
       final content = await showDialog<Uint8List>(
         context: context,
@@ -64,34 +47,14 @@ Future<void> showImportAssetWizard(ImportType type, BuildContext context,
       if (content == null) return;
       return importAsset(AssetFileType.image, content);
     case ImportType.svg:
-      return importWithDialog(
-        AssetFileType.svg,
-        type: FileType.custom,
-        allowedExtensions: ['svg'],
-      );
+      return importWithDialog(AssetFileType.svg);
     case ImportType.pdf:
-      return importWithDialog(
-        AssetFileType.pdf,
-        type: FileType.custom,
-        allowedExtensions: ['pdf'],
-      );
+      return importWithDialog(AssetFileType.pdf);
     case ImportType.document:
-      return importWithDialog(
-        AssetFileType.note,
-        type: FileType.custom,
-        allowedExtensions: ['bfly'],
-      );
+      return importWithDialog(AssetFileType.note);
     case ImportType.markdown:
-      return importWithDialog(
-        AssetFileType.markdown,
-        type: FileType.custom,
-        allowedExtensions: ['md', 'markdown'],
-      );
+      return importWithDialog(AssetFileType.markdown);
     case ImportType.xopp:
-      return importWithDialog(
-        AssetFileType.xopp,
-        type: FileType.custom,
-        allowedExtensions: ['xopp'],
-      );
+      return importWithDialog(AssetFileType.xopp);
   }
 }

app/lib/handlers/handler.dart

@@ -1,9 +1,9 @@
 import 'dart:async';
 import 'dart:convert';
-import 'dart:io';
 import 'dart:math';
 
 import 'package:animations/animations.dart';
+import 'package:butterfly/api/open.dart';
 import 'package:butterfly/bloc/document_bloc.dart';
 import 'package:butterfly/cubits/settings.dart';
 import 'package:butterfly/cubits/transform.dart';
@@ -19,7 +19,6 @@ import 'package:butterfly/visualizer/tool.dart';
 import 'package:butterfly_api/butterfly_api.dart';
 import 'package:butterfly_api/butterfly_text.dart' as text;
 import 'package:collection/collection.dart';
-import 'package:file_picker/file_picker.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
@@ -34,7 +33,7 @@ import 'package:share_plus/share_plus.dart';
 
 import '../actions/paste.dart';
 import '../actions/select.dart';
-import '../api/save_data.dart';
+import '../api/save.dart';
 import '../cubits/current_index.dart';
 import '../dialogs/import/camera.dart';
 import '../dialogs/name.dart';

app/lib/services/export.dart

@@ -1,4 +1,4 @@
-import 'package:butterfly/api/save_data.dart';
+import 'package:butterfly/api/save.dart';
 import 'package:butterfly/bloc/document_bloc.dart';
 import 'package:butterfly/cubits/current_index.dart';
 import 'package:butterfly/helpers/element.dart';

app/lib/services/import.dart

@@ -21,7 +21,7 @@ import 'package:pdf/pdf.dart';
 import 'package:printing/printing.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 
-import '../api/save_data.dart';
+import '../api/save.dart';
 import '../cubits/current_index.dart';
 import '../cubits/settings.dart';
 import '../dialogs/error.dart';