Skip to content

[file_selector] Remove uses of macUTIs #3859

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
auto-submit merged 6 commits into from
May 1, 2023
Merged

[file_selector] Remove uses of macUTIs #3859

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a9a954d
Migrate macOS to new name
stuartmorgan-g May 1, 2023
be2382a
Migrate iOS to new name
stuartmorgan-g May 1, 2023
55d80db
Update tests in packages that don't support it
stuartmorgan-g May 1, 2023
4d88931
Update app-facing README
stuartmorgan-g May 1, 2023
4e89bff
Version bumps
stuartmorgan-g May 1, 2023
a36beb6
Merge branch 'main' into file-selector-macuti-migration-implementations
stuartmorgan-g May 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Migrate iOS to new name
  • Loading branch information
@stuartmorgan-g
stuartmorgan-g committed May 1, 2023
commit be2382ac25bbf6c1387904183275b9513b03bcee
2 changes: 1 addition & 1 deletion packages/file_selector/file_selector_ios/example/lib/open_image_page.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ class OpenImagePage extends StatelessWidget {
const XTypeGroup typeGroup = XTypeGroup(
label: 'images',
extensions: <String>['jpg', 'png'],
macUTIs: <String>['public.image'],
uniformTypeIdentifiers: <String>['public.image'],
);
final XFile? file = await FileSelectorPlatform.instance
.openFile(acceptedTypeGroups: <XTypeGroup>[typeGroup]);
Expand Down
4 changes: 2 additions & 2 deletions packages/file_selector/file_selector_ios/example/lib/open_multiple_images_page.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@ class OpenMultipleImagesPage extends StatelessWidget {
const XTypeGroup jpgsTypeGroup = XTypeGroup(
label: 'JPEGs',
extensions: <String>['jpg', 'jpeg'],
macUTIs: <String>['public.jpeg'],
uniformTypeIdentifiers: <String>['public.jpeg'],
);
const XTypeGroup pngTypeGroup = XTypeGroup(
label: 'PNGs',
extensions: <String>['png'],
macUTIs: <String>['public.png'],
uniformTypeIdentifiers: <String>['public.png'],
);
final List<XFile> files = await FileSelectorPlatform.instance
.openFiles(acceptedTypeGroups: <XTypeGroup>[
Expand Down
2 changes: 1 addition & 1 deletion packages/file_selector/file_selector_ios/example/lib/open_text_page.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ class OpenTextPage extends StatelessWidget {
const XTypeGroup typeGroup = XTypeGroup(
label: 'text',
extensions: <String>['txt', 'json'],
macUTIs: <String>['public.text'],
uniformTypeIdentifiers: <String>['public.text'],
);
final XFile? file = await FileSelectorPlatform.instance
.openFile(acceptedTypeGroups: <XTypeGroup>[typeGroup]);
Expand Down
6 changes: 3 additions & 3 deletions packages/file_selector/file_selector_ios/lib/file_selector_ios.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,11 @@ class FileSelectorIOS extends FileSelectorPlatform {
if (typeGroup.allowsAny) {
return <String>[];
}
if (typeGroup.macUTIs?.isEmpty ?? true) {
if (typeGroup.uniformTypeIdentifiers?.isEmpty ?? true) {
throw ArgumentError('The provided type group $typeGroup should either '
'allow all files, or have a non-empty "macUTIs"');
'allow all files, or have a non-empty "uniformTypeIdentifiers"');
}
allowedUTIs.addAll(typeGroup.macUTIs!);
allowedUTIs.addAll(typeGroup.uniformTypeIdentifiers!);
}
return allowedUTIs;
}
Expand Down
2 changes: 1 addition & 1 deletion packages/file_selector/file_selector_ios/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ flutter:
pluginClass: FFSFileSelectorPlugin

dependencies:
file_selector_platform_interface: ^2.2.0
file_selector_platform_interface: ^2.3.0
flutter:
sdk: flutter

Expand Down
12 changes: 6 additions & 6 deletions packages/file_selector/file_selector_ios/test/file_selector_ios_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,14 +40,14 @@ void main() {
label: 'text',
extensions: <String>['txt'],
mimeTypes: <String>['text/plain'],
macUTIs: <String>['public.text'],
uniformTypeIdentifiers: <String>['public.text'],
);

const XTypeGroup groupTwo = XTypeGroup(
label: 'image',
extensions: <String>['jpg'],
mimeTypes: <String>['image/jpg'],
macUTIs: <String>['public.image'],
uniformTypeIdentifiers: <String>['public.image'],
webWildCards: <String>['image/*']);

await plugin.openFile(acceptedTypeGroups: <XTypeGroup>[group, groupTwo]);
Expand All @@ -56,7 +56,7 @@ void main() {
final FileSelectorConfig config =
result.captured[0] as FileSelectorConfig;

// iOS only accepts macUTIs.
// iOS only accepts uniformTypeIdentifiers.
expect(listEquals(config.utis, <String>['public.text', 'public.image']),
isTrue);
expect(config.allowMultiSelection, isFalse);
Expand Down Expand Up @@ -92,14 +92,14 @@ void main() {
label: 'text',
extensions: <String>['txt'],
mimeTypes: <String>['text/plain'],
macUTIs: <String>['public.text'],
uniformTypeIdentifiers: <String>['public.text'],
);

const XTypeGroup groupTwo = XTypeGroup(
label: 'image',
extensions: <String>['jpg'],
mimeTypes: <String>['image/jpg'],
macUTIs: <String>['public.image'],
uniformTypeIdentifiers: <String>['public.image'],
webWildCards: <String>['image/*']);

await plugin.openFiles(acceptedTypeGroups: <XTypeGroup>[group, groupTwo]);
Expand All @@ -108,7 +108,7 @@ void main() {
final FileSelectorConfig config =
result.captured[0] as FileSelectorConfig;

// iOS only accepts macUTIs.
// iOS only accepts uniformTypeIdentifiers.
expect(listEquals(config.utis, <String>['public.text', 'public.image']),
isTrue);
expect(config.allowMultiSelection, isTrue);
Expand Down