From dd7851f0336777e44f8101ef8620e5547d3eff15 Mon Sep 17 00:00:00 2001 From: eugerossetto Date: Wed, 5 Oct 2022 11:21:48 -0300 Subject: [PATCH 01/11] Remove ignores and add consts for file_selector folder. Version pump for file_selector_platform_interface --- .../file_selector/example/lib/open_image_page.dart | 5 +---- .../example/lib/open_multiple_images_page.dart | 7 ++----- .../file_selector/example/lib/open_text_page.dart | 6 +----- packages/file_selector/file_selector/pubspec.yaml | 2 +- .../file_selector/test/file_selector_test.dart | 9 +-------- 5 files changed, 6 insertions(+), 23 deletions(-) diff --git a/packages/file_selector/file_selector/example/lib/open_image_page.dart b/packages/file_selector/file_selector/example/lib/open_image_page.dart index b72d4e5f562f..ba18e6e78594 100644 --- a/packages/file_selector/file_selector/example/lib/open_image_page.dart +++ b/packages/file_selector/file_selector/example/lib/open_image_page.dart @@ -2,9 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// TODO(stuartmorgan): https://github.com/flutter/flutter/issues/111906 -// ignore_for_file: prefer_const_constructors, prefer_const_literals_to_create_immutables - import 'dart:io'; import 'package:file_selector/file_selector.dart'; @@ -18,7 +15,7 @@ class OpenImagePage extends StatelessWidget { Future _openImageFile(BuildContext context) async { // #docregion SingleOpen - final XTypeGroup typeGroup = XTypeGroup( + const XTypeGroup typeGroup = XTypeGroup( label: 'images', extensions: ['jpg', 'png'], ); diff --git a/packages/file_selector/file_selector/example/lib/open_multiple_images_page.dart b/packages/file_selector/file_selector/example/lib/open_multiple_images_page.dart index 87549e046549..8ae83c2a85dc 100644 --- a/packages/file_selector/file_selector/example/lib/open_multiple_images_page.dart +++ b/packages/file_selector/file_selector/example/lib/open_multiple_images_page.dart @@ -2,9 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// TODO(stuartmorgan): https://github.com/flutter/flutter/issues/111906 -// ignore_for_file: prefer_const_constructors, prefer_const_literals_to_create_immutables - import 'dart:io'; import 'package:file_selector/file_selector.dart'; @@ -18,11 +15,11 @@ class OpenMultipleImagesPage extends StatelessWidget { Future _openImageFile(BuildContext context) async { // #docregion MultiOpen - final XTypeGroup jpgsTypeGroup = XTypeGroup( + const XTypeGroup jpgsTypeGroup = XTypeGroup( label: 'JPEGs', extensions: ['jpg', 'jpeg'], ); - final XTypeGroup pngTypeGroup = XTypeGroup( + const XTypeGroup pngTypeGroup = XTypeGroup( label: 'PNGs', extensions: ['png'], ); diff --git a/packages/file_selector/file_selector/example/lib/open_text_page.dart b/packages/file_selector/file_selector/example/lib/open_text_page.dart index 04d48afc21e4..f052db1eefc1 100644 --- a/packages/file_selector/file_selector/example/lib/open_text_page.dart +++ b/packages/file_selector/file_selector/example/lib/open_text_page.dart @@ -12,12 +12,8 @@ class OpenTextPage extends StatelessWidget { const OpenTextPage({Key? key}) : super(key: key); Future _openTextFile(BuildContext context) async { - // TODO(stuartmorgan): https://github.com/flutter/flutter/issues/111906 - // ignore: prefer_const_constructors - final XTypeGroup typeGroup = XTypeGroup( + const XTypeGroup typeGroup = XTypeGroup( label: 'text', - // TODO(stuartmorgan): https://github.com/flutter/flutter/issues/111906 - // ignore: prefer_const_literals_to_create_immutables extensions: ['txt', 'json'], ); // This demonstrates using an initial directory for the prompt, which should diff --git a/packages/file_selector/file_selector/pubspec.yaml b/packages/file_selector/file_selector/pubspec.yaml index 556ddf23b3be..f63d89900704 100644 --- a/packages/file_selector/file_selector/pubspec.yaml +++ b/packages/file_selector/file_selector/pubspec.yaml @@ -27,7 +27,7 @@ dependencies: file_selector_ios: ^0.5.0 file_selector_linux: ^0.9.0 file_selector_macos: ^0.9.0 - file_selector_platform_interface: ^2.0.0 + file_selector_platform_interface: ^2.2.0 file_selector_web: ^0.9.0 file_selector_windows: ^0.9.0 flutter: diff --git a/packages/file_selector/file_selector/test/file_selector_test.dart b/packages/file_selector/file_selector/test/file_selector_test.dart index 0bef946142ee..13c986b09922 100644 --- a/packages/file_selector/file_selector/test/file_selector_test.dart +++ b/packages/file_selector/file_selector/test/file_selector_test.dart @@ -2,9 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// TODO(stuartmorgan): https://github.com/flutter/flutter/issues/111906 -// ignore_for_file: prefer_const_literals_to_create_immutables - import 'package:file_selector/file_selector.dart'; import 'package:file_selector_platform_interface/file_selector_platform_interface.dart'; import 'package:flutter_test/flutter_test.dart'; @@ -15,15 +12,11 @@ void main() { const String initialDirectory = '/home/flutteruser'; const String confirmButtonText = 'Use this profile picture'; const String suggestedName = 'suggested_name'; - final List acceptedTypeGroups = [ - // TODO(stuartmorgan): https://github.com/flutter/flutter/issues/111906 - // ignore: prefer_const_constructors + const List acceptedTypeGroups = [ XTypeGroup(label: 'documents', mimeTypes: [ 'application/msword', 'application/vnd.openxmlformats-officedocument.wordprocessing', ]), - // TODO(stuartmorgan): https://github.com/flutter/flutter/issues/111906 - // ignore: prefer_const_constructors XTypeGroup(label: 'images', extensions: [ 'jpg', 'png', From 1dbffc3eef90bf8b6e8e5a6e5b73b19096194fb1 Mon Sep 17 00:00:00 2001 From: eugerossetto Date: Wed, 5 Oct 2022 11:38:01 -0300 Subject: [PATCH 02/11] Remove ignores and add consts for file_selector_ios. Version pump for file_selector_platform_interface --- .../example/lib/open_image_page.dart | 8 +---- .../lib/open_multiple_images_page.dart | 11 ++---- .../example/lib/open_text_page.dart | 8 +---- .../file_selector_ios/example/pubspec.yaml | 2 +- .../file_selector_ios/pubspec.yaml | 2 +- .../test/file_selector_ios_test.dart | 35 +++++-------------- 6 files changed, 14 insertions(+), 52 deletions(-) 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 eff6c4f7c028..606a64870566 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 @@ -15,15 +15,9 @@ class OpenImagePage extends StatelessWidget { const OpenImagePage({Key? key}) : super(key: key); Future _openImageFile(BuildContext context) async { - // TODO(stuartmorgan): https://github.com/flutter/flutter/issues/111906 - // ignore: prefer_const_constructors - final XTypeGroup typeGroup = XTypeGroup( + const XTypeGroup typeGroup = XTypeGroup( label: 'images', - // TODO(stuartmorgan): https://github.com/flutter/flutter/issues/111906 - // ignore: prefer_const_literals_to_create_immutables extensions: ['jpg', 'png'], - // TODO(stuartmorgan): https://github.com/flutter/flutter/issues/111906 - // ignore: prefer_const_literals_to_create_immutables 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 0035ebcba5eb..adc4a65f12b5 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 @@ -2,9 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// TODO(stuartmorgan): https://github.com/flutter/flutter/issues/111906 -// ignore_for_file: prefer_const_literals_to_create_immutables - import 'dart:io'; import 'package:file_selector_platform_interface/file_selector_platform_interface.dart'; @@ -18,16 +15,12 @@ class OpenMultipleImagesPage extends StatelessWidget { const OpenMultipleImagesPage({Key? key}) : super(key: key); Future _openImageFile(BuildContext context) async { - // TODO(stuartmorgan): https://github.com/flutter/flutter/issues/111906 - // ignore: prefer_const_constructors - final XTypeGroup jpgsTypeGroup = XTypeGroup( + const XTypeGroup jpgsTypeGroup = XTypeGroup( label: 'JPEGs', extensions: ['jpg', 'jpeg'], macUTIs: ['public.jpeg'], ); - // TODO(stuartmorgan): https://github.com/flutter/flutter/issues/111906 - // ignore: prefer_const_constructors - final XTypeGroup pngTypeGroup = XTypeGroup( + const XTypeGroup pngTypeGroup = XTypeGroup( label: 'PNGs', extensions: ['png'], macUTIs: ['public.png'], 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 b91195ef4a3d..e7bbf8bc937f 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 @@ -12,15 +12,9 @@ class OpenTextPage extends StatelessWidget { const OpenTextPage({Key? key}) : super(key: key); Future _openTextFile(BuildContext context) async { - // TODO(stuartmorgan): https://github.com/flutter/flutter/issues/111906 - // ignore: prefer_const_constructors - final XTypeGroup typeGroup = XTypeGroup( + const XTypeGroup typeGroup = XTypeGroup( label: 'text', - // TODO(stuartmorgan): https://github.com/flutter/flutter/issues/111906 - // ignore: prefer_const_literals_to_create_immutables extensions: ['txt', 'json'], - // TODO(stuartmorgan): https://github.com/flutter/flutter/issues/111906 - // ignore: prefer_const_literals_to_create_immutables macUTIs: ['public.text'], ); final XFile? file = await FileSelectorPlatform.instance diff --git a/packages/file_selector/file_selector_ios/example/pubspec.yaml b/packages/file_selector/file_selector_ios/example/pubspec.yaml index eae4a2b45492..5a2eaa6f7dcd 100644 --- a/packages/file_selector/file_selector_ios/example/pubspec.yaml +++ b/packages/file_selector/file_selector_ios/example/pubspec.yaml @@ -17,7 +17,7 @@ dependencies: # The example app is bundled with the plugin so we use a path dependency on # the parent directory to use the current plugin's version. path: .. - file_selector_platform_interface: ^2.0.0 + file_selector_platform_interface: ^2.2.0 flutter: sdk: flutter diff --git a/packages/file_selector/file_selector_ios/pubspec.yaml b/packages/file_selector/file_selector_ios/pubspec.yaml index b69db86b2950..4b9e1ac74de5 100644 --- a/packages/file_selector/file_selector_ios/pubspec.yaml +++ b/packages/file_selector/file_selector_ios/pubspec.yaml @@ -17,7 +17,7 @@ flutter: pluginClass: FFSFileSelectorPlugin dependencies: - file_selector_platform_interface: ^2.1.0 + file_selector_platform_interface: ^2.2.0 flutter: sdk: flutter diff --git a/packages/file_selector/file_selector_ios/test/file_selector_ios_test.dart b/packages/file_selector/file_selector_ios/test/file_selector_ios_test.dart index a388fe951a4c..f66bd7dc7ced 100644 --- a/packages/file_selector/file_selector_ios/test/file_selector_ios_test.dart +++ b/packages/file_selector/file_selector_ios/test/file_selector_ios_test.dart @@ -2,9 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// TODO(stuartmorgan): https://github.com/flutter/flutter/issues/111906 -// ignore_for_file: prefer_const_literals_to_create_immutables - import 'package:file_selector_ios/file_selector_ios.dart'; import 'package:file_selector_ios/src/messages.g.dart'; import 'package:file_selector_platform_interface/file_selector_platform_interface.dart'; @@ -39,18 +36,14 @@ void main() { }); test('passes the accepted type groups correctly', () async { - // TODO(stuartmorgan): https://github.com/flutter/flutter/issues/111906 - // ignore: prefer_const_constructors - final XTypeGroup group = XTypeGroup( + const XTypeGroup group = XTypeGroup( label: 'text', extensions: ['txt'], mimeTypes: ['text/plain'], macUTIs: ['public.text'], ); - // TODO(stuartmorgan): https://github.com/flutter/flutter/issues/111906 - // ignore: prefer_const_constructors - final XTypeGroup groupTwo = XTypeGroup( + const XTypeGroup groupTwo = XTypeGroup( label: 'image', extensions: ['jpg'], mimeTypes: ['image/jpg'], @@ -69,9 +62,7 @@ void main() { expect(config.allowMultiSelection, isFalse); }); test('throws for a type group that does not support iOS', () async { - // TODO(stuartmorgan): https://github.com/flutter/flutter/issues/111906 - // ignore: prefer_const_constructors - final XTypeGroup group = XTypeGroup( + const XTypeGroup group = XTypeGroup( label: 'images', webWildCards: ['images/*'], ); @@ -82,9 +73,7 @@ void main() { }); test('allows a wildcard group', () async { - // TODO(stuartmorgan): https://github.com/flutter/flutter/issues/111906 - // ignore: prefer_const_constructors - final XTypeGroup group = XTypeGroup( + const XTypeGroup group = XTypeGroup( label: 'text', ); @@ -99,18 +88,14 @@ void main() { }); test('passes the accepted type groups correctly', () async { - // TODO(stuartmorgan): https://github.com/flutter/flutter/issues/111906 - // ignore: prefer_const_constructors - final XTypeGroup group = XTypeGroup( + const XTypeGroup group = XTypeGroup( label: 'text', extensions: ['txt'], mimeTypes: ['text/plain'], macUTIs: ['public.text'], ); - // TODO(stuartmorgan): https://github.com/flutter/flutter/issues/111906 - // ignore: prefer_const_constructors - final XTypeGroup groupTwo = XTypeGroup( + const XTypeGroup groupTwo = XTypeGroup( label: 'image', extensions: ['jpg'], mimeTypes: ['image/jpg'], @@ -129,9 +114,7 @@ void main() { expect(config.allowMultiSelection, isTrue); }); test('throws for a type group that does not support iOS', () async { - // TODO(stuartmorgan): https://github.com/flutter/flutter/issues/111906 - // ignore: prefer_const_constructors - final XTypeGroup group = XTypeGroup( + const XTypeGroup group = XTypeGroup( label: 'images', webWildCards: ['images/*'], ); @@ -142,9 +125,7 @@ void main() { }); test('allows a wildcard group', () async { - // TODO(stuartmorgan): https://github.com/flutter/flutter/issues/111906 - // ignore: prefer_const_constructors - final XTypeGroup group = XTypeGroup( + const XTypeGroup group = XTypeGroup( label: 'text', ); From 79a8dfab0e8cb372f06a85acc44d49f3ed84f2d8 Mon Sep 17 00:00:00 2001 From: eugerossetto Date: Wed, 5 Oct 2022 11:48:50 -0300 Subject: [PATCH 03/11] Remove ignores and add consts for file_selector_linux. Version pump for file_selector_platform_interface --- .../example/lib/open_image_page.dart | 6 +-- .../lib/open_multiple_images_page.dart | 12 +---- .../example/lib/open_text_page.dart | 6 +-- .../file_selector_linux/example/pubspec.yaml | 2 +- .../file_selector_linux/pubspec.yaml | 2 +- .../test/file_selector_linux_test.dart | 51 +++++-------------- 6 files changed, 18 insertions(+), 61 deletions(-) diff --git a/packages/file_selector/file_selector_linux/example/lib/open_image_page.dart b/packages/file_selector/file_selector_linux/example/lib/open_image_page.dart index 1925b27002df..b6ada56ebb2b 100644 --- a/packages/file_selector/file_selector_linux/example/lib/open_image_page.dart +++ b/packages/file_selector/file_selector_linux/example/lib/open_image_page.dart @@ -15,12 +15,8 @@ class OpenImagePage extends StatelessWidget { const OpenImagePage({Key? key}) : super(key: key); Future _openImageFile(BuildContext context) async { - // TODO(stuartmorgan): https://github.com/flutter/flutter/issues/111906 - // ignore: prefer_const_constructors - final XTypeGroup typeGroup = XTypeGroup( + const XTypeGroup typeGroup = XTypeGroup( label: 'images', - // TODO(stuartmorgan): https://github.com/flutter/flutter/issues/111906 - // ignore: prefer_const_literals_to_create_immutables extensions: ['jpg', 'png'], ); final XFile? file = await FileSelectorPlatform.instance diff --git a/packages/file_selector/file_selector_linux/example/lib/open_multiple_images_page.dart b/packages/file_selector/file_selector_linux/example/lib/open_multiple_images_page.dart index ee7e7d1a967d..c8e352a5b8bd 100644 --- a/packages/file_selector/file_selector_linux/example/lib/open_multiple_images_page.dart +++ b/packages/file_selector/file_selector_linux/example/lib/open_multiple_images_page.dart @@ -15,20 +15,12 @@ class OpenMultipleImagesPage extends StatelessWidget { const OpenMultipleImagesPage({Key? key}) : super(key: key); Future _openImageFile(BuildContext context) async { - // TODO(stuartmorgan): https://github.com/flutter/flutter/issues/111906 - // ignore: prefer_const_constructors - final XTypeGroup jpgsTypeGroup = XTypeGroup( + const XTypeGroup jpgsTypeGroup = XTypeGroup( label: 'JPEGs', - // TODO(stuartmorgan): https://github.com/flutter/flutter/issues/111906 - // ignore: prefer_const_literals_to_create_immutables extensions: ['jpg', 'jpeg'], ); - // TODO(stuartmorgan): https://github.com/flutter/flutter/issues/111906 - // ignore: prefer_const_constructors - final XTypeGroup pngTypeGroup = XTypeGroup( + const XTypeGroup pngTypeGroup = XTypeGroup( label: 'PNGs', - // TODO(stuartmorgan): https://github.com/flutter/flutter/issues/111906 - // ignore: prefer_const_literals_to_create_immutables extensions: ['png'], ); final List files = await FileSelectorPlatform.instance diff --git a/packages/file_selector/file_selector_linux/example/lib/open_text_page.dart b/packages/file_selector/file_selector_linux/example/lib/open_text_page.dart index d5e8d462de1d..4c88d7475049 100644 --- a/packages/file_selector/file_selector_linux/example/lib/open_text_page.dart +++ b/packages/file_selector/file_selector_linux/example/lib/open_text_page.dart @@ -12,12 +12,8 @@ class OpenTextPage extends StatelessWidget { const OpenTextPage({Key? key}) : super(key: key); Future _openTextFile(BuildContext context) async { - // TODO(stuartmorgan): https://github.com/flutter/flutter/issues/111906 - // ignore: prefer_const_constructors - final XTypeGroup typeGroup = XTypeGroup( + const XTypeGroup typeGroup = XTypeGroup( label: 'text', - // TODO(stuartmorgan): https://github.com/flutter/flutter/issues/111906 - // ignore: prefer_const_literals_to_create_immutables extensions: ['txt', 'json'], ); final XFile? file = await FileSelectorPlatform.instance diff --git a/packages/file_selector/file_selector_linux/example/pubspec.yaml b/packages/file_selector/file_selector_linux/example/pubspec.yaml index 857c950ecc95..51bdb28717aa 100644 --- a/packages/file_selector/file_selector_linux/example/pubspec.yaml +++ b/packages/file_selector/file_selector_linux/example/pubspec.yaml @@ -9,7 +9,7 @@ environment: dependencies: file_selector_linux: path: ../ - file_selector_platform_interface: ^2.0.0 + file_selector_platform_interface: ^2.2.0 flutter: sdk: flutter diff --git a/packages/file_selector/file_selector_linux/pubspec.yaml b/packages/file_selector/file_selector_linux/pubspec.yaml index e0b26d18e719..f90e9d4c264b 100644 --- a/packages/file_selector/file_selector_linux/pubspec.yaml +++ b/packages/file_selector/file_selector_linux/pubspec.yaml @@ -18,7 +18,7 @@ flutter: dependencies: cross_file: ^0.3.1 - file_selector_platform_interface: ^2.1.0 + file_selector_platform_interface: ^2.2.0 flutter: sdk: flutter diff --git a/packages/file_selector/file_selector_linux/test/file_selector_linux_test.dart b/packages/file_selector/file_selector_linux/test/file_selector_linux_test.dart index 54111c27140e..748f922ae6ef 100644 --- a/packages/file_selector/file_selector_linux/test/file_selector_linux_test.dart +++ b/packages/file_selector/file_selector_linux/test/file_selector_linux_test.dart @@ -2,9 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// TODO(stuartmorgan): https://github.com/flutter/flutter/issues/111906 -// ignore_for_file: prefer_const_literals_to_create_immutables - import 'package:file_selector_linux/file_selector_linux.dart'; import 'package:file_selector_platform_interface/file_selector_platform_interface.dart'; import 'package:flutter/services.dart'; @@ -32,18 +29,14 @@ void main() { group('#openFile', () { test('passes the accepted type groups correctly', () async { - // TODO(stuartmorgan): https://github.com/flutter/flutter/issues/111906 - // ignore: prefer_const_constructors - final XTypeGroup group = XTypeGroup( + const XTypeGroup group = XTypeGroup( label: 'text', extensions: ['txt'], mimeTypes: ['text/plain'], macUTIs: ['public.text'], ); - // TODO(stuartmorgan): https://github.com/flutter/flutter/issues/111906 - // ignore: prefer_const_constructors - final XTypeGroup groupTwo = XTypeGroup( + const XTypeGroup groupTwo = XTypeGroup( label: 'image', extensions: ['jpg'], mimeTypes: ['image/jpg'], @@ -108,9 +101,7 @@ void main() { }); test('throws for a type group that does not support Linux', () async { - // TODO(stuartmorgan): https://github.com/flutter/flutter/issues/111906 - // ignore: prefer_const_constructors - final XTypeGroup group = XTypeGroup( + const XTypeGroup group = XTypeGroup( label: 'images', webWildCards: ['images/*'], ); @@ -121,9 +112,7 @@ void main() { }); test('passes a wildcard group correctly', () async { - // TODO(stuartmorgan): https://github.com/flutter/flutter/issues/111906 - // ignore: prefer_const_constructors - final XTypeGroup group = XTypeGroup( + const XTypeGroup group = XTypeGroup( label: 'any', ); @@ -150,18 +139,14 @@ void main() { group('#openFiles', () { test('passes the accepted type groups correctly', () async { - // TODO(stuartmorgan): https://github.com/flutter/flutter/issues/111906 - // ignore: prefer_const_constructors - final XTypeGroup group = XTypeGroup( + const XTypeGroup group = XTypeGroup( label: 'text', extensions: ['txt'], mimeTypes: ['text/plain'], macUTIs: ['public.text'], ); - // TODO(stuartmorgan): https://github.com/flutter/flutter/issues/111906 - // ignore: prefer_const_constructors - final XTypeGroup groupTwo = XTypeGroup( + const XTypeGroup groupTwo = XTypeGroup( label: 'image', extensions: ['jpg'], mimeTypes: ['image/jpg'], @@ -226,9 +211,7 @@ void main() { }); test('throws for a type group that does not support Linux', () async { - // TODO(stuartmorgan): https://github.com/flutter/flutter/issues/111906 - // ignore: prefer_const_constructors - final XTypeGroup group = XTypeGroup( + const XTypeGroup group = XTypeGroup( label: 'images', webWildCards: ['images/*'], ); @@ -239,9 +222,7 @@ void main() { }); test('passes a wildcard group correctly', () async { - // TODO(stuartmorgan): https://github.com/flutter/flutter/issues/111906 - // ignore: prefer_const_constructors - final XTypeGroup group = XTypeGroup( + const XTypeGroup group = XTypeGroup( label: 'any', ); @@ -268,18 +249,14 @@ void main() { group('#getSavePath', () { test('passes the accepted type groups correctly', () async { - // TODO(stuartmorgan): https://github.com/flutter/flutter/issues/111906 - // ignore: prefer_const_constructors - final XTypeGroup group = XTypeGroup( + const XTypeGroup group = XTypeGroup( label: 'text', extensions: ['txt'], mimeTypes: ['text/plain'], macUTIs: ['public.text'], ); - // TODO(stuartmorgan): https://github.com/flutter/flutter/issues/111906 - // ignore: prefer_const_constructors - final XTypeGroup groupTwo = XTypeGroup( + const XTypeGroup groupTwo = XTypeGroup( label: 'image', extensions: ['jpg'], mimeTypes: ['image/jpg'], @@ -345,9 +322,7 @@ void main() { }); test('throws for a type group that does not support Linux', () async { - // TODO(stuartmorgan): https://github.com/flutter/flutter/issues/111906 - // ignore: prefer_const_constructors - final XTypeGroup group = XTypeGroup( + const XTypeGroup group = XTypeGroup( label: 'images', webWildCards: ['images/*'], ); @@ -358,9 +333,7 @@ void main() { }); test('passes a wildcard group correctly', () async { - // TODO(stuartmorgan): https://github.com/flutter/flutter/issues/111906 - // ignore: prefer_const_constructors - final XTypeGroup group = XTypeGroup( + const XTypeGroup group = XTypeGroup( label: 'any', ); From 98a84310eacb38ddb454eeb3148b8d6a0712658e Mon Sep 17 00:00:00 2001 From: eugerossetto Date: Wed, 5 Oct 2022 12:05:59 -0300 Subject: [PATCH 04/11] Remove ignores and add consts for file_selector_macos. Version pump for file_selector_platform_interface --- .../example/lib/open_image_page.dart | 6 +- .../lib/open_multiple_images_page.dart | 12 +--- .../example/lib/open_text_page.dart | 6 +- .../file_selector_macos/example/pubspec.yaml | 2 +- .../file_selector_macos/pubspec.yaml | 2 +- .../test/file_selector_macos_test.dart | 63 +++++-------------- 6 files changed, 21 insertions(+), 70 deletions(-) diff --git a/packages/file_selector/file_selector_macos/example/lib/open_image_page.dart b/packages/file_selector/file_selector_macos/example/lib/open_image_page.dart index 1925b27002df..b6ada56ebb2b 100644 --- a/packages/file_selector/file_selector_macos/example/lib/open_image_page.dart +++ b/packages/file_selector/file_selector_macos/example/lib/open_image_page.dart @@ -15,12 +15,8 @@ class OpenImagePage extends StatelessWidget { const OpenImagePage({Key? key}) : super(key: key); Future _openImageFile(BuildContext context) async { - // TODO(stuartmorgan): https://github.com/flutter/flutter/issues/111906 - // ignore: prefer_const_constructors - final XTypeGroup typeGroup = XTypeGroup( + const XTypeGroup typeGroup = XTypeGroup( label: 'images', - // TODO(stuartmorgan): https://github.com/flutter/flutter/issues/111906 - // ignore: prefer_const_literals_to_create_immutables extensions: ['jpg', 'png'], ); final XFile? file = await FileSelectorPlatform.instance diff --git a/packages/file_selector/file_selector_macos/example/lib/open_multiple_images_page.dart b/packages/file_selector/file_selector_macos/example/lib/open_multiple_images_page.dart index ee7e7d1a967d..c8e352a5b8bd 100644 --- a/packages/file_selector/file_selector_macos/example/lib/open_multiple_images_page.dart +++ b/packages/file_selector/file_selector_macos/example/lib/open_multiple_images_page.dart @@ -15,20 +15,12 @@ class OpenMultipleImagesPage extends StatelessWidget { const OpenMultipleImagesPage({Key? key}) : super(key: key); Future _openImageFile(BuildContext context) async { - // TODO(stuartmorgan): https://github.com/flutter/flutter/issues/111906 - // ignore: prefer_const_constructors - final XTypeGroup jpgsTypeGroup = XTypeGroup( + const XTypeGroup jpgsTypeGroup = XTypeGroup( label: 'JPEGs', - // TODO(stuartmorgan): https://github.com/flutter/flutter/issues/111906 - // ignore: prefer_const_literals_to_create_immutables extensions: ['jpg', 'jpeg'], ); - // TODO(stuartmorgan): https://github.com/flutter/flutter/issues/111906 - // ignore: prefer_const_constructors - final XTypeGroup pngTypeGroup = XTypeGroup( + const XTypeGroup pngTypeGroup = XTypeGroup( label: 'PNGs', - // TODO(stuartmorgan): https://github.com/flutter/flutter/issues/111906 - // ignore: prefer_const_literals_to_create_immutables extensions: ['png'], ); final List files = await FileSelectorPlatform.instance diff --git a/packages/file_selector/file_selector_macos/example/lib/open_text_page.dart b/packages/file_selector/file_selector_macos/example/lib/open_text_page.dart index d5e8d462de1d..4c88d7475049 100644 --- a/packages/file_selector/file_selector_macos/example/lib/open_text_page.dart +++ b/packages/file_selector/file_selector_macos/example/lib/open_text_page.dart @@ -12,12 +12,8 @@ class OpenTextPage extends StatelessWidget { const OpenTextPage({Key? key}) : super(key: key); Future _openTextFile(BuildContext context) async { - // TODO(stuartmorgan): https://github.com/flutter/flutter/issues/111906 - // ignore: prefer_const_constructors - final XTypeGroup typeGroup = XTypeGroup( + const XTypeGroup typeGroup = XTypeGroup( label: 'text', - // TODO(stuartmorgan): https://github.com/flutter/flutter/issues/111906 - // ignore: prefer_const_literals_to_create_immutables extensions: ['txt', 'json'], ); final XFile? file = await FileSelectorPlatform.instance diff --git a/packages/file_selector/file_selector_macos/example/pubspec.yaml b/packages/file_selector/file_selector_macos/example/pubspec.yaml index 58c5d6e22b49..d3f3114bb481 100644 --- a/packages/file_selector/file_selector_macos/example/pubspec.yaml +++ b/packages/file_selector/file_selector_macos/example/pubspec.yaml @@ -15,7 +15,7 @@ dependencies: # The example app is bundled with the plugin so we use a path dependency on # the parent directory to use the current plugin's version. path: .. - file_selector_platform_interface: ^2.0.0 + file_selector_platform_interface: ^2.2.0 flutter: sdk: flutter diff --git a/packages/file_selector/file_selector_macos/pubspec.yaml b/packages/file_selector/file_selector_macos/pubspec.yaml index b921cc8e8070..0636fd01c7f6 100644 --- a/packages/file_selector/file_selector_macos/pubspec.yaml +++ b/packages/file_selector/file_selector_macos/pubspec.yaml @@ -18,7 +18,7 @@ flutter: dependencies: cross_file: ^0.3.1 - file_selector_platform_interface: ^2.1.0 + file_selector_platform_interface: ^2.2.0 flutter: sdk: flutter diff --git a/packages/file_selector/file_selector_macos/test/file_selector_macos_test.dart b/packages/file_selector/file_selector_macos/test/file_selector_macos_test.dart index 29702a5421b1..789d70a51777 100644 --- a/packages/file_selector/file_selector_macos/test/file_selector_macos_test.dart +++ b/packages/file_selector/file_selector_macos/test/file_selector_macos_test.dart @@ -2,9 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// TODO(stuartmorgan): https://github.com/flutter/flutter/issues/111906 -// ignore_for_file: prefer_const_literals_to_create_immutables - import 'package:file_selector_macos/file_selector_macos.dart'; import 'package:file_selector_platform_interface/file_selector_platform_interface.dart'; import 'package:flutter/services.dart'; @@ -33,18 +30,14 @@ void main() { group('openFile', () { test('passes the accepted type groups correctly', () async { - // TODO(stuartmorgan): https://github.com/flutter/flutter/issues/111906 - // ignore: prefer_const_constructors - final XTypeGroup group = XTypeGroup( + const XTypeGroup group = XTypeGroup( label: 'text', extensions: ['txt'], mimeTypes: ['text/plain'], macUTIs: ['public.text'], ); - // TODO(stuartmorgan): https://github.com/flutter/flutter/issues/111906 - // ignore: prefer_const_constructors - final XTypeGroup groupTwo = XTypeGroup( + const XTypeGroup groupTwo = XTypeGroup( label: 'image', extensions: ['jpg'], mimeTypes: ['image/jpg'], @@ -103,9 +96,7 @@ void main() { }); test('throws for a type group that does not support macOS', () async { - // TODO(stuartmorgan): https://github.com/flutter/flutter/issues/111906 - // ignore: prefer_const_constructors - final XTypeGroup group = XTypeGroup( + const XTypeGroup group = XTypeGroup( label: 'images', webWildCards: ['images/*'], ); @@ -116,9 +107,7 @@ void main() { }); test('allows a wildcard group', () async { - // TODO(stuartmorgan): https://github.com/flutter/flutter/issues/111906 - // ignore: prefer_const_constructors - final XTypeGroup group = XTypeGroup( + const XTypeGroup group = XTypeGroup( label: 'text', ); @@ -129,18 +118,14 @@ void main() { group('openFiles', () { test('passes the accepted type groups correctly', () async { - // TODO(stuartmorgan): https://github.com/flutter/flutter/issues/111906 - // ignore: prefer_const_constructors - final XTypeGroup group = XTypeGroup( + const XTypeGroup group = XTypeGroup( label: 'text', extensions: ['txt'], mimeTypes: ['text/plain'], macUTIs: ['public.text'], ); - // TODO(stuartmorgan): https://github.com/flutter/flutter/issues/111906 - // ignore: prefer_const_constructors - final XTypeGroup groupTwo = XTypeGroup( + const XTypeGroup groupTwo = XTypeGroup( label: 'image', extensions: ['jpg'], mimeTypes: ['image/jpg'], @@ -199,9 +184,7 @@ void main() { }); test('throws for a type group that does not support macOS', () async { - // TODO(stuartmorgan): https://github.com/flutter/flutter/issues/111906 - // ignore: prefer_const_constructors - final XTypeGroup group = XTypeGroup( + const XTypeGroup group = XTypeGroup( label: 'images', webWildCards: ['images/*'], ); @@ -212,9 +195,7 @@ void main() { }); test('allows a wildcard group', () async { - // TODO(stuartmorgan): https://github.com/flutter/flutter/issues/111906 - // ignore: prefer_const_constructors - final XTypeGroup group = XTypeGroup( + const XTypeGroup group = XTypeGroup( label: 'text', ); @@ -225,18 +206,14 @@ void main() { group('getSavePath', () { test('passes the accepted type groups correctly', () async { - // TODO(stuartmorgan): https://github.com/flutter/flutter/issues/111906 - // ignore: prefer_const_constructors - final XTypeGroup group = XTypeGroup( + const XTypeGroup group = XTypeGroup( label: 'text', extensions: ['txt'], mimeTypes: ['text/plain'], macUTIs: ['public.text'], ); - // TODO(stuartmorgan): https://github.com/flutter/flutter/issues/111906 - // ignore: prefer_const_constructors - final XTypeGroup groupTwo = XTypeGroup( + const XTypeGroup groupTwo = XTypeGroup( label: 'image', extensions: ['jpg'], mimeTypes: ['image/jpg'], @@ -296,9 +273,7 @@ void main() { }); test('throws for a type group that does not support macOS', () async { - // TODO(stuartmorgan): https://github.com/flutter/flutter/issues/111906 - // ignore: prefer_const_constructors - final XTypeGroup group = XTypeGroup( + const XTypeGroup group = XTypeGroup( label: 'images', webWildCards: ['images/*'], ); @@ -309,9 +284,7 @@ void main() { }); test('allows a wildcard group', () async { - // TODO(stuartmorgan): https://github.com/flutter/flutter/issues/111906 - // ignore: prefer_const_constructors - final XTypeGroup group = XTypeGroup( + const XTypeGroup group = XTypeGroup( label: 'text', ); @@ -353,25 +326,19 @@ void main() { test('ignores all type groups if any of them is a wildcard', () async { await plugin.getSavePath(acceptedTypeGroups: [ - // TODO(stuartmorgan): https://github.com/flutter/flutter/issues/111906 - // ignore: prefer_const_constructors - XTypeGroup( + const XTypeGroup( label: 'text', extensions: ['txt'], mimeTypes: ['text/plain'], macUTIs: ['public.text'], ), - // TODO(stuartmorgan): https://github.com/flutter/flutter/issues/111906 - // ignore: prefer_const_constructors - XTypeGroup( + const XTypeGroup( label: 'image', extensions: ['jpg'], mimeTypes: ['image/jpg'], macUTIs: ['public.image'], ), - // TODO(stuartmorgan): https://github.com/flutter/flutter/issues/111906 - // ignore: prefer_const_constructors - XTypeGroup( + const XTypeGroup( label: 'any', ), ]); From ab6ba7b6917890d6fd5840537d115915acf645b1 Mon Sep 17 00:00:00 2001 From: eugerossetto Date: Wed, 5 Oct 2022 12:17:57 -0300 Subject: [PATCH 05/11] Remove ignores and add consts for file_selector_web. Version pump for file_selector_platform_interface --- .../file_selector_web_test.dart | 11 +---- .../file_selector_web/example/pubspec.yaml | 2 +- .../file_selector_web/pubspec.yaml | 2 +- .../file_selector_web/test/utils_test.dart | 47 +++++-------------- 4 files changed, 15 insertions(+), 47 deletions(-) diff --git a/packages/file_selector/file_selector_web/example/integration_test/file_selector_web_test.dart b/packages/file_selector/file_selector_web/example/integration_test/file_selector_web_test.dart index 5f476d937977..664c40871f49 100644 --- a/packages/file_selector/file_selector_web/example/integration_test/file_selector_web_test.dart +++ b/packages/file_selector/file_selector_web/example/integration_test/file_selector_web_test.dart @@ -2,9 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// TODO(stuartmorgan): https://github.com/flutter/flutter/issues/111906 -// ignore_for_file: prefer_const_literals_to_create_immutables - import 'dart:html'; import 'dart:typed_data'; @@ -29,9 +26,7 @@ void main() { final FileSelectorWeb plugin = FileSelectorWeb(domHelper: mockDomHelper); - // TODO(stuartmorgan): https://github.com/flutter/flutter/issues/111906 - // ignore: prefer_const_constructors - final XTypeGroup typeGroup = XTypeGroup( + const XTypeGroup typeGroup = XTypeGroup( label: 'images', extensions: ['jpg', 'jpeg'], mimeTypes: ['image/png'], @@ -61,9 +56,7 @@ void main() { final FileSelectorWeb plugin = FileSelectorWeb(domHelper: mockDomHelper); - // TODO(stuartmorgan): https://github.com/flutter/flutter/issues/111906 - // ignore: prefer_const_constructors - final XTypeGroup typeGroup = XTypeGroup( + const XTypeGroup typeGroup = XTypeGroup( label: 'files', extensions: ['.txt'], ); diff --git a/packages/file_selector/file_selector_web/example/pubspec.yaml b/packages/file_selector/file_selector_web/example/pubspec.yaml index 3a36ce5c74f3..e14f5c2eedea 100644 --- a/packages/file_selector/file_selector_web/example/pubspec.yaml +++ b/packages/file_selector/file_selector_web/example/pubspec.yaml @@ -6,7 +6,7 @@ environment: flutter: ">=2.10.0" dependencies: - file_selector_platform_interface: ^2.1.0 + file_selector_platform_interface: ^2.2.0 file_selector_web: path: ../ flutter: diff --git a/packages/file_selector/file_selector_web/pubspec.yaml b/packages/file_selector/file_selector_web/pubspec.yaml index 38229588fd27..cd9a2e026caa 100644 --- a/packages/file_selector/file_selector_web/pubspec.yaml +++ b/packages/file_selector/file_selector_web/pubspec.yaml @@ -17,7 +17,7 @@ flutter: fileName: file_selector_web.dart dependencies: - file_selector_platform_interface: ^2.1.0 + file_selector_platform_interface: ^2.2.0 flutter: sdk: flutter flutter_web_plugins: diff --git a/packages/file_selector/file_selector_web/test/utils_test.dart b/packages/file_selector/file_selector_web/test/utils_test.dart index dcb7c3d8c627..5d0b45e56202 100644 --- a/packages/file_selector/file_selector_web/test/utils_test.dart +++ b/packages/file_selector/file_selector_web/test/utils_test.dart @@ -2,9 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// TODO(stuartmorgan): https://github.com/flutter/flutter/issues/111906 -// ignore_for_file: prefer_const_literals_to_create_immutables - import 'package:file_selector_platform_interface/file_selector_platform_interface.dart'; import 'package:file_selector_web/src/utils.dart'; import 'package:flutter_test/flutter_test.dart'; @@ -14,15 +11,9 @@ void main() { group('acceptedTypesToString', () { test('works', () { final List acceptedTypes = [ - // TODO(stuartmorgan): https://github.com/flutter/flutter/issues/111906 - // ignore: prefer_const_constructors - XTypeGroup(label: 'images', webWildCards: ['images/*']), - // TODO(stuartmorgan): https://github.com/flutter/flutter/issues/111906 - // ignore: prefer_const_constructors - XTypeGroup(label: 'jpgs', extensions: ['jpg', 'jpeg']), - // TODO(stuartmorgan): https://github.com/flutter/flutter/issues/111906 - // ignore: prefer_const_constructors - XTypeGroup(label: 'pngs', mimeTypes: ['image/png']), + const XTypeGroup(label: 'images', webWildCards: ['images/*']), + const XTypeGroup(label: 'jpgs', extensions: ['jpg', 'jpeg']), + const XTypeGroup(label: 'pngs', mimeTypes: ['image/png']), ]; final String accepts = acceptedTypesToString(acceptedTypes); expect(accepts, 'images/*,.jpg,.jpeg,image/png'); @@ -36,12 +27,8 @@ void main() { test('works with extensions', () { final List acceptedTypes = [ - // TODO(stuartmorgan): https://github.com/flutter/flutter/issues/111906 - // ignore: prefer_const_constructors - XTypeGroup(label: 'jpgs', extensions: ['jpeg', 'jpg']), - // TODO(stuartmorgan): https://github.com/flutter/flutter/issues/111906 - // ignore: prefer_const_constructors - XTypeGroup(label: 'pngs', extensions: ['png']), + const XTypeGroup(label: 'jpgs', extensions: ['jpeg', 'jpg']), + const XTypeGroup(label: 'pngs', extensions: ['png']), ]; final String accepts = acceptedTypesToString(acceptedTypes); expect(accepts, '.jpeg,.jpg,.png'); @@ -49,13 +36,9 @@ void main() { test('works with mime types', () { final List acceptedTypes = [ - // TODO(stuartmorgan): https://github.com/flutter/flutter/issues/111906 - // ignore: prefer_const_constructors - XTypeGroup( + const XTypeGroup( label: 'jpgs', mimeTypes: ['image/jpeg', 'image/jpg']), - // TODO(stuartmorgan): https://github.com/flutter/flutter/issues/111906 - // ignore: prefer_const_constructors - XTypeGroup(label: 'pngs', mimeTypes: ['image/png']), + const XTypeGroup(label: 'pngs', mimeTypes: ['image/png']), ]; final String accepts = acceptedTypesToString(acceptedTypes); expect(accepts, 'image/jpeg,image/jpg,image/png'); @@ -63,15 +46,9 @@ void main() { test('works with web wild cards', () { final List acceptedTypes = [ - // TODO(stuartmorgan): https://github.com/flutter/flutter/issues/111906 - // ignore: prefer_const_constructors - XTypeGroup(label: 'images', webWildCards: ['image/*']), - // TODO(stuartmorgan): https://github.com/flutter/flutter/issues/111906 - // ignore: prefer_const_constructors - XTypeGroup(label: 'audios', webWildCards: ['audio/*']), - // TODO(stuartmorgan): https://github.com/flutter/flutter/issues/111906 - // ignore: prefer_const_constructors - XTypeGroup(label: 'videos', webWildCards: ['video/*']), + const XTypeGroup(label: 'images', webWildCards: ['image/*']), + const XTypeGroup(label: 'audios', webWildCards: ['audio/*']), + const XTypeGroup(label: 'videos', webWildCards: ['video/*']), ]; final String accepts = acceptedTypesToString(acceptedTypes); expect(accepts, 'image/*,audio/*,video/*'); @@ -79,9 +56,7 @@ void main() { test('throws for a type group that does not support web', () { final List acceptedTypes = [ - // TODO(stuartmorgan): https://github.com/flutter/flutter/issues/111906 - // ignore: prefer_const_constructors - XTypeGroup(label: 'text', macUTIs: ['public.text']), + const XTypeGroup(label: 'text', macUTIs: ['public.text']), ]; expect(() => acceptedTypesToString(acceptedTypes), throwsArgumentError); }); From 08f3c28965b45621d225352cf6aaec353c496860 Mon Sep 17 00:00:00 2001 From: eugerossetto Date: Wed, 5 Oct 2022 13:42:02 -0300 Subject: [PATCH 06/11] Remove ignores and add consts for file_selector_windows. Version pump for file_selector_platform_interface --- .../example/lib/open_image_page.dart | 6 +-- .../lib/open_multiple_images_page.dart | 12 +---- .../example/lib/open_text_page.dart | 6 +-- .../example/pubspec.yaml | 2 +- .../file_selector_windows/pubspec.yaml | 2 +- .../test/file_selector_windows_test.dart | 51 +++++-------------- 6 files changed, 18 insertions(+), 61 deletions(-) diff --git a/packages/file_selector/file_selector_windows/example/lib/open_image_page.dart b/packages/file_selector/file_selector_windows/example/lib/open_image_page.dart index 1925b27002df..b6ada56ebb2b 100644 --- a/packages/file_selector/file_selector_windows/example/lib/open_image_page.dart +++ b/packages/file_selector/file_selector_windows/example/lib/open_image_page.dart @@ -15,12 +15,8 @@ class OpenImagePage extends StatelessWidget { const OpenImagePage({Key? key}) : super(key: key); Future _openImageFile(BuildContext context) async { - // TODO(stuartmorgan): https://github.com/flutter/flutter/issues/111906 - // ignore: prefer_const_constructors - final XTypeGroup typeGroup = XTypeGroup( + const XTypeGroup typeGroup = XTypeGroup( label: 'images', - // TODO(stuartmorgan): https://github.com/flutter/flutter/issues/111906 - // ignore: prefer_const_literals_to_create_immutables extensions: ['jpg', 'png'], ); final XFile? file = await FileSelectorPlatform.instance diff --git a/packages/file_selector/file_selector_windows/example/lib/open_multiple_images_page.dart b/packages/file_selector/file_selector_windows/example/lib/open_multiple_images_page.dart index ee7e7d1a967d..c8e352a5b8bd 100644 --- a/packages/file_selector/file_selector_windows/example/lib/open_multiple_images_page.dart +++ b/packages/file_selector/file_selector_windows/example/lib/open_multiple_images_page.dart @@ -15,20 +15,12 @@ class OpenMultipleImagesPage extends StatelessWidget { const OpenMultipleImagesPage({Key? key}) : super(key: key); Future _openImageFile(BuildContext context) async { - // TODO(stuartmorgan): https://github.com/flutter/flutter/issues/111906 - // ignore: prefer_const_constructors - final XTypeGroup jpgsTypeGroup = XTypeGroup( + const XTypeGroup jpgsTypeGroup = XTypeGroup( label: 'JPEGs', - // TODO(stuartmorgan): https://github.com/flutter/flutter/issues/111906 - // ignore: prefer_const_literals_to_create_immutables extensions: ['jpg', 'jpeg'], ); - // TODO(stuartmorgan): https://github.com/flutter/flutter/issues/111906 - // ignore: prefer_const_constructors - final XTypeGroup pngTypeGroup = XTypeGroup( + const XTypeGroup pngTypeGroup = XTypeGroup( label: 'PNGs', - // TODO(stuartmorgan): https://github.com/flutter/flutter/issues/111906 - // ignore: prefer_const_literals_to_create_immutables extensions: ['png'], ); final List files = await FileSelectorPlatform.instance diff --git a/packages/file_selector/file_selector_windows/example/lib/open_text_page.dart b/packages/file_selector/file_selector_windows/example/lib/open_text_page.dart index d5e8d462de1d..4c88d7475049 100644 --- a/packages/file_selector/file_selector_windows/example/lib/open_text_page.dart +++ b/packages/file_selector/file_selector_windows/example/lib/open_text_page.dart @@ -12,12 +12,8 @@ class OpenTextPage extends StatelessWidget { const OpenTextPage({Key? key}) : super(key: key); Future _openTextFile(BuildContext context) async { - // TODO(stuartmorgan): https://github.com/flutter/flutter/issues/111906 - // ignore: prefer_const_constructors - final XTypeGroup typeGroup = XTypeGroup( + const XTypeGroup typeGroup = XTypeGroup( label: 'text', - // TODO(stuartmorgan): https://github.com/flutter/flutter/issues/111906 - // ignore: prefer_const_literals_to_create_immutables extensions: ['txt', 'json'], ); final XFile? file = await FileSelectorPlatform.instance diff --git a/packages/file_selector/file_selector_windows/example/pubspec.yaml b/packages/file_selector/file_selector_windows/example/pubspec.yaml index 99c251d0867f..bc886d32c896 100644 --- a/packages/file_selector/file_selector_windows/example/pubspec.yaml +++ b/packages/file_selector/file_selector_windows/example/pubspec.yaml @@ -8,7 +8,7 @@ environment: flutter: ">=2.10.0" dependencies: - file_selector_platform_interface: ^2.0.0 + file_selector_platform_interface: ^2.2.0 file_selector_windows: # When depending on this package from a real application you should use: # file_selector_windows: ^x.y.z diff --git a/packages/file_selector/file_selector_windows/pubspec.yaml b/packages/file_selector/file_selector_windows/pubspec.yaml index 7859822701e1..c0eb93906109 100644 --- a/packages/file_selector/file_selector_windows/pubspec.yaml +++ b/packages/file_selector/file_selector_windows/pubspec.yaml @@ -18,7 +18,7 @@ flutter: dependencies: cross_file: ^0.3.1 - file_selector_platform_interface: ^2.1.0 + file_selector_platform_interface: ^2.2.0 flutter: sdk: flutter diff --git a/packages/file_selector/file_selector_windows/test/file_selector_windows_test.dart b/packages/file_selector/file_selector_windows/test/file_selector_windows_test.dart index 2d8dc4b78688..f07c9b67618d 100644 --- a/packages/file_selector/file_selector_windows/test/file_selector_windows_test.dart +++ b/packages/file_selector/file_selector_windows/test/file_selector_windows_test.dart @@ -2,9 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// TODO(stuartmorgan): https://github.com/flutter/flutter/issues/111906 -// ignore_for_file: prefer_const_literals_to_create_immutables - import 'package:file_selector_platform_interface/file_selector_platform_interface.dart'; import 'package:file_selector_windows/file_selector_windows.dart'; import 'package:file_selector_windows/src/messages.g.dart'; @@ -50,18 +47,14 @@ void main() { }); test('passes the accepted type groups correctly', () async { - // TODO(stuartmorgan): https://github.com/flutter/flutter/issues/111906 - // ignore: prefer_const_constructors - final XTypeGroup group = XTypeGroup( + const XTypeGroup group = XTypeGroup( label: 'text', extensions: ['txt'], mimeTypes: ['text/plain'], macUTIs: ['public.text'], ); - // TODO(stuartmorgan): https://github.com/flutter/flutter/issues/111906 - // ignore: prefer_const_constructors - final XTypeGroup groupTwo = XTypeGroup( + const XTypeGroup groupTwo = XTypeGroup( label: 'image', extensions: ['jpg'], mimeTypes: ['image/jpg'], @@ -93,9 +86,7 @@ void main() { }); test('throws for a type group that does not support Windows', () async { - // TODO(stuartmorgan): https://github.com/flutter/flutter/issues/111906 - // ignore: prefer_const_constructors - final XTypeGroup group = XTypeGroup( + const XTypeGroup group = XTypeGroup( label: 'text', mimeTypes: ['text/plain'], ); @@ -106,9 +97,7 @@ void main() { }); test('allows a wildcard group', () async { - // TODO(stuartmorgan): https://github.com/flutter/flutter/issues/111906 - // ignore: prefer_const_constructors - final XTypeGroup group = XTypeGroup( + const XTypeGroup group = XTypeGroup( label: 'text', ); @@ -136,18 +125,14 @@ void main() { }); test('passes the accepted type groups correctly', () async { - // TODO(stuartmorgan): https://github.com/flutter/flutter/issues/111906 - // ignore: prefer_const_constructors - final XTypeGroup group = XTypeGroup( + const XTypeGroup group = XTypeGroup( label: 'text', extensions: ['txt'], mimeTypes: ['text/plain'], macUTIs: ['public.text'], ); - // TODO(stuartmorgan): https://github.com/flutter/flutter/issues/111906 - // ignore: prefer_const_constructors - final XTypeGroup groupTwo = XTypeGroup( + const XTypeGroup groupTwo = XTypeGroup( label: 'image', extensions: ['jpg'], mimeTypes: ['image/jpg'], @@ -179,9 +164,7 @@ void main() { }); test('throws for a type group that does not support Windows', () async { - // TODO(stuartmorgan): https://github.com/flutter/flutter/issues/111906 - // ignore: prefer_const_constructors - final XTypeGroup group = XTypeGroup( + const XTypeGroup group = XTypeGroup( label: 'text', mimeTypes: ['text/plain'], ); @@ -192,9 +175,7 @@ void main() { }); test('allows a wildcard group', () async { - // TODO(stuartmorgan): https://github.com/flutter/flutter/issues/111906 - // ignore: prefer_const_constructors - final XTypeGroup group = XTypeGroup( + const XTypeGroup group = XTypeGroup( label: 'text', ); @@ -250,18 +231,14 @@ void main() { }); test('passes the accepted type groups correctly', () async { - // TODO(stuartmorgan): https://github.com/flutter/flutter/issues/111906 - // ignore: prefer_const_constructors - final XTypeGroup group = XTypeGroup( + const XTypeGroup group = XTypeGroup( label: 'text', extensions: ['txt'], mimeTypes: ['text/plain'], macUTIs: ['public.text'], ); - // TODO(stuartmorgan): https://github.com/flutter/flutter/issues/111906 - // ignore: prefer_const_constructors - final XTypeGroup groupTwo = XTypeGroup( + const XTypeGroup groupTwo = XTypeGroup( label: 'image', extensions: ['jpg'], mimeTypes: ['image/jpg'], @@ -300,9 +277,7 @@ void main() { }); test('throws for a type group that does not support Windows', () async { - // TODO(stuartmorgan): https://github.com/flutter/flutter/issues/111906 - // ignore: prefer_const_constructors - final XTypeGroup group = XTypeGroup( + const XTypeGroup group = XTypeGroup( label: 'text', mimeTypes: ['text/plain'], ); @@ -313,9 +288,7 @@ void main() { }); test('allows a wildcard group', () async { - // TODO(stuartmorgan): https://github.com/flutter/flutter/issues/111906 - // ignore: prefer_const_constructors - final XTypeGroup group = XTypeGroup( + const XTypeGroup group = XTypeGroup( label: 'text', ); From 9f9f48ef8dce5fd3eb515cf5341eabbfc44591d2 Mon Sep 17 00:00:00 2001 From: eugerossetto Date: Wed, 5 Oct 2022 13:53:37 -0300 Subject: [PATCH 07/11] Add missing consts for XTypeGroup --- .../test/x_type_group_test.dart | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/file_selector/file_selector_platform_interface/test/x_type_group_test.dart b/packages/file_selector/file_selector_platform_interface/test/x_type_group_test.dart index 107cdc3a2538..c5e65d0264f5 100644 --- a/packages/file_selector/file_selector_platform_interface/test/x_type_group_test.dart +++ b/packages/file_selector/file_selector_platform_interface/test/x_type_group_test.dart @@ -9,12 +9,12 @@ void main() { group('XTypeGroup', () { test('toJSON() creates correct map', () { const String label = 'test group'; - final List extensions = ['txt', 'jpg']; - final List mimeTypes = ['text/plain']; - final List macUTIs = ['public.plain-text']; - final List webWildCards = ['image/*']; + const List extensions = ['txt', 'jpg']; + const List mimeTypes = ['text/plain']; + const List macUTIs = ['public.plain-text']; + const List webWildCards = ['image/*']; - final XTypeGroup group = XTypeGroup( + const XTypeGroup group = XTypeGroup( label: label, extensions: extensions, mimeTypes: mimeTypes, @@ -72,8 +72,8 @@ void main() { }); test('Leading dots are removed from extensions', () { - final List extensions = ['.txt', '.jpg']; - final XTypeGroup group = XTypeGroup(extensions: extensions); + const List extensions = ['.txt', '.jpg']; + const XTypeGroup group = XTypeGroup(extensions: extensions); expect(group.extensions, ['txt', 'jpg']); }); From 8b75b2aa9b0b9e7935d9120f8d9149a593f1a07b Mon Sep 17 00:00:00 2001 From: eugerossetto Date: Thu, 6 Oct 2022 10:09:48 -0300 Subject: [PATCH 08/11] Update README with const. --- packages/file_selector/file_selector/README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/file_selector/file_selector/README.md b/packages/file_selector/file_selector/README.md index d5fb2d36263e..97433584b87a 100644 --- a/packages/file_selector/file_selector/README.md +++ b/packages/file_selector/file_selector/README.md @@ -34,7 +34,7 @@ Please also take a look at our [example][example] app. #### Open a single file ``` dart -final XTypeGroup typeGroup = XTypeGroup( +const XTypeGroup typeGroup = XTypeGroup( label: 'images', extensions: ['jpg', 'png'], ); @@ -45,11 +45,11 @@ final XFile? file = #### Open multiple files at once ``` dart -final XTypeGroup jpgsTypeGroup = XTypeGroup( +const XTypeGroup jpgsTypeGroup = XTypeGroup( label: 'JPEGs', extensions: ['jpg', 'jpeg'], ); -final XTypeGroup pngTypeGroup = XTypeGroup( +const XTypeGroup pngTypeGroup = XTypeGroup( label: 'PNGs', extensions: ['png'], ); From fc2b429d70aa0eeb184cfac2bae119c0f3ab1fc8 Mon Sep 17 00:00:00 2001 From: eugerossetto Date: Thu, 6 Oct 2022 10:41:56 -0300 Subject: [PATCH 09/11] Version pump. --- packages/file_selector/file_selector/CHANGELOG.md | 3 ++- packages/file_selector/file_selector/pubspec.yaml | 2 +- packages/file_selector/file_selector_ios/CHANGELOG.md | 3 ++- packages/file_selector/file_selector_ios/pubspec.yaml | 2 +- packages/file_selector/file_selector_linux/CHANGELOG.md | 3 ++- packages/file_selector/file_selector_linux/pubspec.yaml | 2 +- packages/file_selector/file_selector_macos/CHANGELOG.md | 4 ++++ packages/file_selector/file_selector_macos/pubspec.yaml | 2 +- .../file_selector_platform_interface/CHANGELOG.md | 4 ++++ packages/file_selector/file_selector_web/CHANGELOG.md | 4 ++++ packages/file_selector/file_selector_web/pubspec.yaml | 2 +- packages/file_selector/file_selector_windows/CHANGELOG.md | 4 ++++ packages/file_selector/file_selector_windows/pubspec.yaml | 2 +- 13 files changed, 28 insertions(+), 9 deletions(-) diff --git a/packages/file_selector/file_selector/CHANGELOG.md b/packages/file_selector/file_selector/CHANGELOG.md index 1cecd5605a7e..06d01090edc0 100644 --- a/packages/file_selector/file_selector/CHANGELOG.md +++ b/packages/file_selector/file_selector/CHANGELOG.md @@ -1,5 +1,6 @@ -## NEXT +## 0.9.2+1 +* Changes XTypeGroup initialization from final to const. * Updates minimum Flutter version to 2.10. ## 0.9.2 diff --git a/packages/file_selector/file_selector/pubspec.yaml b/packages/file_selector/file_selector/pubspec.yaml index f63d89900704..cae08e47eeb1 100644 --- a/packages/file_selector/file_selector/pubspec.yaml +++ b/packages/file_selector/file_selector/pubspec.yaml @@ -3,7 +3,7 @@ description: Flutter plugin for opening and saving files, or selecting directories, using native file selection UI. repository: https://github.com/flutter/plugins/tree/main/packages/file_selector/file_selector issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+file_selector%22 -version: 0.9.2 +version: 0.9.2+1 environment: sdk: ">=2.12.0 <3.0.0" diff --git a/packages/file_selector/file_selector_ios/CHANGELOG.md b/packages/file_selector/file_selector_ios/CHANGELOG.md index 2b2d2f8c2d58..439e1d4fd4c1 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 +* Changes XTypeGroup initialization from final to const. * Updates minimum Flutter version to 2.10. ## 0.5.0+1 diff --git a/packages/file_selector/file_selector_ios/pubspec.yaml b/packages/file_selector/file_selector_ios/pubspec.yaml index 4b9e1ac74de5..3f8ecfac04ce 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" diff --git a/packages/file_selector/file_selector_linux/CHANGELOG.md b/packages/file_selector/file_selector_linux/CHANGELOG.md index d76c635cde8e..a1f57b5cc857 100644 --- a/packages/file_selector/file_selector_linux/CHANGELOG.md +++ b/packages/file_selector/file_selector_linux/CHANGELOG.md @@ -1,5 +1,6 @@ -## NEXT +## 0.9.0+1 +* Changes XTypeGroup initialization from final to const. * Updates minimum Flutter version to 2.10. ## 0.9.0 diff --git a/packages/file_selector/file_selector_linux/pubspec.yaml b/packages/file_selector/file_selector_linux/pubspec.yaml index f90e9d4c264b..a8aea37d72e2 100644 --- a/packages/file_selector/file_selector_linux/pubspec.yaml +++ b/packages/file_selector/file_selector_linux/pubspec.yaml @@ -2,7 +2,7 @@ name: file_selector_linux description: Liunx implementation of the file_selector plugin. repository: https://github.com/flutter/plugins/tree/main/packages/file_selector/file_selector_linux issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+file_selector%22 -version: 0.9.0 +version: 0.9.0+1 environment: sdk: ">=2.12.0 <3.0.0" diff --git a/packages/file_selector/file_selector_macos/CHANGELOG.md b/packages/file_selector/file_selector_macos/CHANGELOG.md index f9241da91476..af17db8ae3ef 100644 --- a/packages/file_selector/file_selector_macos/CHANGELOG.md +++ b/packages/file_selector/file_selector_macos/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.9.0+3 + +* Changes XTypeGroup initialization from final to const. + ## 0.9.0+2 * Updates imports for `prefer_relative_imports`. diff --git a/packages/file_selector/file_selector_macos/pubspec.yaml b/packages/file_selector/file_selector_macos/pubspec.yaml index 0636fd01c7f6..3fc3832d7280 100644 --- a/packages/file_selector/file_selector_macos/pubspec.yaml +++ b/packages/file_selector/file_selector_macos/pubspec.yaml @@ -2,7 +2,7 @@ name: file_selector_macos description: macOS implementation of the file_selector plugin. repository: https://github.com/flutter/plugins/tree/main/packages/file_selector/file_selector_macos issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+file_selector%22 -version: 0.9.0+2 +version: 0.9.0+3 environment: sdk: ">=2.12.0 <3.0.0" diff --git a/packages/file_selector/file_selector_platform_interface/CHANGELOG.md b/packages/file_selector/file_selector_platform_interface/CHANGELOG.md index ad1fe2cb6cef..bf53d7ebb8a2 100644 --- a/packages/file_selector/file_selector_platform_interface/CHANGELOG.md +++ b/packages/file_selector/file_selector_platform_interface/CHANGELOG.md @@ -1,3 +1,7 @@ +## NEXT + +* Changes XTypeGroup initialization from final to const. + ## 2.2.0 * Makes `XTypeGroup`'s constructor constant. diff --git a/packages/file_selector/file_selector_web/CHANGELOG.md b/packages/file_selector/file_selector_web/CHANGELOG.md index 69ca20363866..5e531bb633d2 100644 --- a/packages/file_selector/file_selector_web/CHANGELOG.md +++ b/packages/file_selector/file_selector_web/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.9.0+2 + +* Changes XTypeGroup initialization from final to const. + ## 0.9.0+1 * Updates imports for `prefer_relative_imports`. diff --git a/packages/file_selector/file_selector_web/pubspec.yaml b/packages/file_selector/file_selector_web/pubspec.yaml index cd9a2e026caa..848a41b754af 100644 --- a/packages/file_selector/file_selector_web/pubspec.yaml +++ b/packages/file_selector/file_selector_web/pubspec.yaml @@ -2,7 +2,7 @@ name: file_selector_web description: Web platform implementation of file_selector repository: https://github.com/flutter/plugins/tree/main/packages/file_selector/file_selector_web issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+file_selector%22 -version: 0.9.0+1 +version: 0.9.0+2 environment: sdk: ">=2.12.0 <3.0.0" diff --git a/packages/file_selector/file_selector_windows/CHANGELOG.md b/packages/file_selector/file_selector_windows/CHANGELOG.md index 1221bbd4d508..13e895ca46f1 100644 --- a/packages/file_selector/file_selector_windows/CHANGELOG.md +++ b/packages/file_selector/file_selector_windows/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.9.1+4 + +* Changes XTypeGroup initialization from final to const. + ## 0.9.1+3 * Updates imports for `prefer_relative_imports`. diff --git a/packages/file_selector/file_selector_windows/pubspec.yaml b/packages/file_selector/file_selector_windows/pubspec.yaml index c0eb93906109..ee0701b3fd30 100644 --- a/packages/file_selector/file_selector_windows/pubspec.yaml +++ b/packages/file_selector/file_selector_windows/pubspec.yaml @@ -2,7 +2,7 @@ name: file_selector_windows description: Windows implementation of the file_selector plugin. repository: https://github.com/flutter/plugins/tree/main/packages/file_selector/file_selector_windows issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+file_selector%22 -version: 0.9.1+3 +version: 0.9.1+4 environment: sdk: ">=2.12.0 <3.0.0" From 25b545d2b9597496d0abb1c8c1490c12bea2cc7a Mon Sep 17 00:00:00 2001 From: eugerossetto Date: Thu, 6 Oct 2022 11:22:01 -0300 Subject: [PATCH 10/11] Revert CHANGELOG change for file_selector_platform_interface. --- .../file_selector_platform_interface/CHANGELOG.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/packages/file_selector/file_selector_platform_interface/CHANGELOG.md b/packages/file_selector/file_selector_platform_interface/CHANGELOG.md index bf53d7ebb8a2..ad1fe2cb6cef 100644 --- a/packages/file_selector/file_selector_platform_interface/CHANGELOG.md +++ b/packages/file_selector/file_selector_platform_interface/CHANGELOG.md @@ -1,7 +1,3 @@ -## NEXT - -* Changes XTypeGroup initialization from final to const. - ## 2.2.0 * Makes `XTypeGroup`'s constructor constant. From e3e0f7708b278ff0e1016770b2f5896c68830981 Mon Sep 17 00:00:00 2001 From: eugerossetto Date: Thu, 6 Oct 2022 11:44:35 -0300 Subject: [PATCH 11/11] Change lists to const instead of each item. --- .../file_selector_web/test/utils_test.dart | 34 +++++++++---------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/packages/file_selector/file_selector_web/test/utils_test.dart b/packages/file_selector/file_selector_web/test/utils_test.dart index 5d0b45e56202..f9f3a41295f0 100644 --- a/packages/file_selector/file_selector_web/test/utils_test.dart +++ b/packages/file_selector/file_selector_web/test/utils_test.dart @@ -10,53 +10,53 @@ void main() { group('FileSelectorWeb utils', () { group('acceptedTypesToString', () { test('works', () { - final List acceptedTypes = [ - const XTypeGroup(label: 'images', webWildCards: ['images/*']), - const XTypeGroup(label: 'jpgs', extensions: ['jpg', 'jpeg']), - const XTypeGroup(label: 'pngs', mimeTypes: ['image/png']), + const List acceptedTypes = [ + XTypeGroup(label: 'images', webWildCards: ['images/*']), + XTypeGroup(label: 'jpgs', extensions: ['jpg', 'jpeg']), + XTypeGroup(label: 'pngs', mimeTypes: ['image/png']), ]; final String accepts = acceptedTypesToString(acceptedTypes); expect(accepts, 'images/*,.jpg,.jpeg,image/png'); }); test('works with an empty list', () { - final List acceptedTypes = []; + const List acceptedTypes = []; final String accepts = acceptedTypesToString(acceptedTypes); expect(accepts, ''); }); test('works with extensions', () { - final List acceptedTypes = [ - const XTypeGroup(label: 'jpgs', extensions: ['jpeg', 'jpg']), - const XTypeGroup(label: 'pngs', extensions: ['png']), + const List acceptedTypes = [ + XTypeGroup(label: 'jpgs', extensions: ['jpeg', 'jpg']), + XTypeGroup(label: 'pngs', extensions: ['png']), ]; final String accepts = acceptedTypesToString(acceptedTypes); expect(accepts, '.jpeg,.jpg,.png'); }); test('works with mime types', () { - final List acceptedTypes = [ - const XTypeGroup( + const List acceptedTypes = [ + XTypeGroup( label: 'jpgs', mimeTypes: ['image/jpeg', 'image/jpg']), - const XTypeGroup(label: 'pngs', mimeTypes: ['image/png']), + XTypeGroup(label: 'pngs', mimeTypes: ['image/png']), ]; final String accepts = acceptedTypesToString(acceptedTypes); expect(accepts, 'image/jpeg,image/jpg,image/png'); }); test('works with web wild cards', () { - final List acceptedTypes = [ - const XTypeGroup(label: 'images', webWildCards: ['image/*']), - const XTypeGroup(label: 'audios', webWildCards: ['audio/*']), - const XTypeGroup(label: 'videos', webWildCards: ['video/*']), + const List acceptedTypes = [ + XTypeGroup(label: 'images', webWildCards: ['image/*']), + XTypeGroup(label: 'audios', webWildCards: ['audio/*']), + XTypeGroup(label: 'videos', webWildCards: ['video/*']), ]; final String accepts = acceptedTypesToString(acceptedTypes); expect(accepts, 'image/*,audio/*,video/*'); }); test('throws for a type group that does not support web', () { - final List acceptedTypes = [ - const XTypeGroup(label: 'text', macUTIs: ['public.text']), + const List acceptedTypes = [ + XTypeGroup(label: 'text', macUTIs: ['public.text']), ]; expect(() => acceptedTypesToString(acceptedTypes), throwsArgumentError); });