From 9691f91fb17c43297c393d1a5c95cc1bcbe4a467 Mon Sep 17 00:00:00 2001 From: Juan Angel Dausa Date: Thu, 15 Sep 2022 18:06:04 -0300 Subject: [PATCH] Update iOS example to use the proper properties when filtering files. --- packages/file_selector/file_selector_ios/CHANGELOG.md | 3 ++- .../file_selector_ios/example/lib/open_image_page.dart | 2 -- .../example/lib/open_multiple_images_page.dart | 4 ---- .../file_selector_ios/example/lib/open_text_page.dart | 2 -- .../file_selector_ios/lib/file_selector_ios.dart | 2 ++ packages/file_selector/file_selector_ios/pubspec.yaml | 3 +-- 6 files changed, 5 insertions(+), 11 deletions(-) diff --git a/packages/file_selector/file_selector_ios/CHANGELOG.md b/packages/file_selector/file_selector_ios/CHANGELOG.md index 2b2d2f8c2d58..625600a7cb12 100644 --- a/packages/file_selector/file_selector_ios/CHANGELOG.md +++ b/packages/file_selector/file_selector_ios/CHANGELOG.md @@ -1,5 +1,6 @@ -## NEXT +## 0.5.0+2 +* Removes the unnecessary `label` and `extensions` parameters for the `_openTextFile`, `_openImageFile` and `_openImageFile`(for multiple images) mehtods. * Updates minimum Flutter version to 2.10. ## 0.5.0+1 diff --git a/packages/file_selector/file_selector_ios/example/lib/open_image_page.dart b/packages/file_selector/file_selector_ios/example/lib/open_image_page.dart index fd0f4e711d7f..0f4c78ae379f 100644 --- a/packages/file_selector/file_selector_ios/example/lib/open_image_page.dart +++ b/packages/file_selector/file_selector_ios/example/lib/open_image_page.dart @@ -16,8 +16,6 @@ class OpenImagePage extends StatelessWidget { Future _openImageFile(BuildContext context) async { final XTypeGroup typeGroup = XTypeGroup( - label: 'images', - extensions: ['jpg', 'png'], macUTIs: ['public.image'], ); final XFile? file = await FileSelectorPlatform.instance diff --git a/packages/file_selector/file_selector_ios/example/lib/open_multiple_images_page.dart b/packages/file_selector/file_selector_ios/example/lib/open_multiple_images_page.dart index 29b27c1d637c..94187d0fd5e9 100644 --- a/packages/file_selector/file_selector_ios/example/lib/open_multiple_images_page.dart +++ b/packages/file_selector/file_selector_ios/example/lib/open_multiple_images_page.dart @@ -16,13 +16,9 @@ class OpenMultipleImagesPage extends StatelessWidget { Future _openImageFile(BuildContext context) async { final XTypeGroup jpgsTypeGroup = XTypeGroup( - label: 'JPEGs', - extensions: ['jpg', 'jpeg'], macUTIs: ['public.jpeg'], ); final XTypeGroup pngTypeGroup = XTypeGroup( - label: 'PNGs', - extensions: ['png'], macUTIs: ['public.png'], ); final List files = await FileSelectorPlatform.instance diff --git a/packages/file_selector/file_selector_ios/example/lib/open_text_page.dart b/packages/file_selector/file_selector_ios/example/lib/open_text_page.dart index b747aa89611c..a23619c55d55 100644 --- a/packages/file_selector/file_selector_ios/example/lib/open_text_page.dart +++ b/packages/file_selector/file_selector_ios/example/lib/open_text_page.dart @@ -13,8 +13,6 @@ class OpenTextPage extends StatelessWidget { Future _openTextFile(BuildContext context) async { final XTypeGroup typeGroup = XTypeGroup( - label: 'text', - extensions: ['txt', 'json'], macUTIs: ['public.text'], ); final XFile? file = await FileSelectorPlatform.instance diff --git a/packages/file_selector/file_selector_ios/lib/file_selector_ios.dart b/packages/file_selector/file_selector_ios/lib/file_selector_ios.dart index e75f67e4f1bd..5e45f1201cfd 100644 --- a/packages/file_selector/file_selector_ios/lib/file_selector_ios.dart +++ b/packages/file_selector/file_selector_ios/lib/file_selector_ios.dart @@ -53,10 +53,12 @@ class FileSelectorIOS extends FileSelectorPlatform { if (typeGroup.allowsAny) { return []; } + if (typeGroup.macUTIs?.isEmpty ?? true) { throw ArgumentError('The provided type group $typeGroup should either ' 'allow all files, or have a non-empty "macUTIs"'); } + allowedUTIs.addAll(typeGroup.macUTIs!); } return allowedUTIs; diff --git a/packages/file_selector/file_selector_ios/pubspec.yaml b/packages/file_selector/file_selector_ios/pubspec.yaml index b69db86b2950..014e95d97a89 100644 --- a/packages/file_selector/file_selector_ios/pubspec.yaml +++ b/packages/file_selector/file_selector_ios/pubspec.yaml @@ -2,7 +2,7 @@ name: file_selector_ios description: iOS implementation of the file_selector plugin. repository: https://github.com/flutter/plugins/tree/main/packages/file_selector/file_selector_ios issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+file_selector%22 -version: 0.5.0+1 +version: 0.5.0+2 environment: sdk: ">=2.14.4 <3.0.0" @@ -27,4 +27,3 @@ dev_dependencies: sdk: flutter mockito: ^5.1.0 pigeon: ^3.2.5 -