binding: Add pickFiles, wrapping file_picker.pickFiles

Author: chrisbobbe

lib/model/binding.dart

@@ -1,4 +1,5 @@
 import 'package:device_info_plus/device_info_plus.dart' as device_info_plus;
+import 'package:file_picker/file_picker.dart' as file_picker;
 import 'package:firebase_core/firebase_core.dart' as firebase_core;
 import 'package:firebase_messaging/firebase_messaging.dart' as firebase_messaging;
 import 'package:flutter/foundation.dart';
@@ -11,6 +12,8 @@ import '../log.dart';
 import '../widgets/store.dart';
 import 'store.dart';
 
+export 'package:file_picker/file_picker.dart' show FilePickerResult, FileType, PlatformFile;
+
 /// Alias for [url_launcher.LaunchMode].
 typedef UrlLaunchMode = url_launcher.LaunchMode;
 
@@ -152,6 +155,15 @@ abstract class ZulipBinding {
 
  /// Wraps the [AndroidNotificationHostApi] constructor.
  AndroidNotificationHostApi get androidNotificationHost;
+
+ /// Pick files from the media library, via package:file_picker.
+ ///
+ /// This wraps [file_picker.pickFiles].
+ Future<file_picker.FilePickerResult?> pickFiles({
+ bool allowMultiple,
+ bool withReadStream,
+ file_picker.FileType type,
+ });
 }
 
 /// Like [device_info_plus.BaseDeviceInfo], but without things we don't use.
@@ -389,4 +401,17 @@ class LiveZulipBinding extends ZulipBinding {
 
  @override
  AndroidNotificationHostApi get androidNotificationHost => AndroidNotificationHostApi();
+
+ @override
+ Future<file_picker.FilePickerResult?> pickFiles({
+ bool allowMultiple = false,
+ bool withReadStream = false,
+ file_picker.FileType type = file_picker.FileType.any,
+ }) async {
+ return file_picker.FilePicker.platform.pickFiles(
+ allowMultiple: allowMultiple,
+ withReadStream: withReadStream,
+ type: type,
+ );
+ }
 }

lib/widgets/compose_box.dart

@@ -1,5 +1,4 @@
 import 'package:app_settings/app_settings.dart';
-import 'package:file_picker/file_picker.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_gen/gen_l10n/zulip_localizations.dart';
@@ -8,6 +7,7 @@ import 'package:image_picker/image_picker.dart';
 import '../api/exception.dart';
 import '../api/model/model.dart';
 import '../api/route/messages.dart';
+import '../model/binding.dart';
 import '../model/compose.dart';
 import '../model/narrow.dart';
 import '../model/store.dart';
@@ -542,7 +542,7 @@ abstract class _AttachUploadsButton extends StatelessWidget {
 Future<Iterable<_File>> _getFilePickerFiles(BuildContext context, FileType type) async {
  FilePickerResult? result;
  try {
- result = await FilePicker.platform
+ result = await ZulipBinding.instance
  .pickFiles(allowMultiple: true, withReadStream: true, type: type);
  } catch (e) {
  if (!context.mounted) return [];

test/model/binding.dart

@@ -73,6 +73,7 @@ class TestZulipBinding extends ZulipBinding {
  _resetPackageInfo();
  _resetFirebase();
  _resetNotifications();
+ _resetPickFiles();
  }
 
  /// The current global store offered to a [GlobalStoreWidget].
@@ -285,6 +286,48 @@ class TestZulipBinding extends ZulipBinding {
  FakeAndroidNotificationHostApi get androidNotificationHost {
  return (_androidNotificationHostApi ??= FakeAndroidNotificationHostApi());
  }
+
+ /// The value that `ZulipBinding.instance.pickFiles()` should return.
+ ///
+ /// See also [takePickFilesCalls].
+ FilePickerResult? pickFilesResult;
+
+ void _resetPickFiles() {
+ pickFilesResult = null;
+ _pickFilesCalls = null;
+ }
+
+ /// Consume the log of calls made to `ZulipBinding.instance.pickFiles()`.
+ ///
+ /// This returns a list of the arguments to all calls made
+ /// to `ZulipBinding.instance.pickFiles()` since the last call to
+ /// either this method or [reset].
+ ///
+ /// See also [pickFilesResult].
+ List<({
+ bool? allowMultiple,
+ bool? withReadStream,
+ FileType? type,
+ })> takePickFilesCalls() {
+ final result = _pickFilesCalls;
+ _pickFilesCalls = null;
+ return result ?? [];
+ }
+ List<({
+ bool? allowMultiple,
+ bool? withReadStream,
+ FileType? type,
+ })>? _pickFilesCalls;
+
+ @override
+ Future<FilePickerResult?> pickFiles({
+ bool? allowMultiple,
+ bool? withReadStream,
+ FileType? type,
+ }) async {
+ (_pickFilesCalls ??= []).add((allowMultiple: allowMultiple, withReadStream: withReadStream, type: type));
+ return pickFilesResult;
+ }
 }
 
 class FakeFirebaseMessaging extends Fake implements FirebaseMessaging {