Applied PR feedback.

Author: azchohfi

packages/image_picker/image_picker_windows/README.md

@@ -13,24 +13,4 @@ The argument `maxDuration` is not supported on Windows.
 ### Import the package
 
 This package is not yet [endorsed](https://flutter.dev/docs/development/packages-and-plugins/developing-packages#endorsed-federated-plugin), which means you need to add 
-not only the `image_picker`, as well as the `image_picker_windows`.
-
-### Use the plugin
-
-You should be able to use `package:image_picker` _almost_ as normal, since this package is not fully featured yet.
-
-If you want to use the path directly, your code would need look like this:
-
-```dart
-...
-Image.file(File(pickedFile.path));
-...
-```
-
-Or, using bytes:
-
-```dart
-...
-Image.memory(await pickedFile.readAsBytes())
-...
-```
+not only the `image_picker`, as well as the `image_picker_windows`.

packages/image_picker/image_picker_windows/example/lib/main.dart

@@ -10,7 +10,6 @@ import 'dart:io';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:image_picker_platform_interface/image_picker_platform_interface.dart';
-import 'package:image_picker_windows/image_picker_windows.dart';
 import 'package:video_player/video_player.dart';
 
 void main() {
@@ -50,7 +49,7 @@ class _MyHomePageState extends State<MyHomePage> {
   VideoPlayerController? _toBeDisposed;
   String? _retrieveDataError;
 
-  final ImagePickerPlatform _picker = ImagePickerWindows();
+  final ImagePickerPlatform _picker = ImagePickerPlatform.instance;
   final TextEditingController maxWidthController = TextEditingController();
   final TextEditingController maxHeightController = TextEditingController();
   final TextEditingController qualityController = TextEditingController();

packages/image_picker/image_picker_windows/example/windows/runner/flutter_window.cpp

@@ -1,3 +1,7 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
 #include "flutter_window.h"
 
 #include <optional>

packages/image_picker/image_picker_windows/example/windows/runner/flutter_window.h

@@ -1,3 +1,7 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
 #ifndef RUNNER_FLUTTER_WINDOW_H_
 #define RUNNER_FLUTTER_WINDOW_H_
 

packages/image_picker/image_picker_windows/example/windows/runner/main.cpp

@@ -1,3 +1,7 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
 #include <flutter/dart_project.h>
 #include <flutter/flutter_view_controller.h>
 #include <windows.h>

packages/image_picker/image_picker_windows/example/windows/runner/utils.cpp

@@ -1,3 +1,7 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
 #include "utils.h"
 
 #include <flutter_windows.h>

packages/image_picker/image_picker_windows/example/windows/runner/utils.h

@@ -1,3 +1,7 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
 #ifndef RUNNER_UTILS_H_
 #define RUNNER_UTILS_H_
 

packages/image_picker/image_picker_windows/example/windows/runner/win32_window.cpp

@@ -1,3 +1,7 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
 #include "win32_window.h"
 
 #include <flutter_windows.h>

packages/image_picker/image_picker_windows/example/windows/runner/win32_window.h

@@ -1,3 +1,7 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
 #ifndef RUNNER_WIN32_WINDOW_H_
 #define RUNNER_WIN32_WINDOW_H_
 

packages/image_picker/image_picker_windows/lib/image_picker_windows.dart

@@ -5,43 +5,48 @@
 import 'dart:async';
 
 import 'package:file_selector_platform_interface/file_selector_platform_interface.dart';
+import 'package:file_selector_windows/file_selector_windows.dart';
 import 'package:image_picker_platform_interface/image_picker_platform_interface.dart';
 
+const List<String> _imageFormats = <String>[
+  'jpg',
+  'jpeg',
+  'png',
+  'bmp',
+  'webp',
+  'gif',
+  'tif',
+  'tiff',
+  'apng'
+];
+const List<String> _videoFormats = <String>[
+  'mov',
+  'wmv',
+  'mkv',
+  'mp4',
+  'webm',
+  'avi',
+  'mpeg',
+  'mpg'
+];
+
 /// The Windows implementation of [ImagePickerPlatform].
 ///
-/// This class implements the `package:image_picker` functionality for Windows.
+/// This class implements the `package:image_picker` functionality for
+/// Windows.
 class ImagePickerWindows extends ImagePickerPlatform {
   /// Constructs a ImagePickerWindows.
   ImagePickerWindows();
 
-  final List<String> _imageFormats = <String>[
-    'jpg',
-    'jpeg',
-    'png',
-    'bmp',
-    'webp',
-    'gif',
-    'tif',
-    'tiff',
-    'apng'
-  ];
-  final List<String> _videoFormats = <String>[
-    'mov',
-    'wmv',
-    'mkv',
-    'mp4',
-    'webm',
-    'avi',
-    'mpeg',
-    'mpg'
-  ];
-
   /// Registers this class as the default instance of [ImagePickerPlatform].
   static void registerWith() {
     ImagePickerPlatform.instance = ImagePickerWindows();
+    FileSelectorWindows.registerWith();
   }
 
-  // Note that the `maxWidth`, `maxHeight` and `imageQuality` arguments are not supported on the Windows. If any of these arguments is supplied, it'll be silently ignored by the Windows version of the plugin.
+  // Note that the `maxWidth`, `maxHeight` and `imageQuality` arguments are
+  // not supported on the Windows. If any of these arguments is supplied,
+  // it'll be silently ignored by the Windows version of the plugin.
   @override
   Future<PickedFile?> pickImage({
     required ImageSource source,
@@ -62,7 +67,10 @@ class ImagePickerWindows extends ImagePickerPlatform {
     return null;
   }
 
-  // Note that the `source`, `preferredCameraDevice`, and `maxDuration` arguments are not supported on Windows. If any of these arguments is supplied, it'll be silently ignored by the Windows version of the plugin.
+  // Note that the `source`, `preferredCameraDevice`, and `maxDuration`
+  // arguments are not supported on Windows. If any of these arguments is
+  // supplied, it'll be silently ignored by the Windows version of the
+  // plugin.
   @override
   Future<PickedFile?> pickVideo({
     required ImageSource source,
@@ -79,7 +87,10 @@ class ImagePickerWindows extends ImagePickerPlatform {
     return null;
   }
 
-  // Note that the `source`, `maxWidth`, `maxHeight`, `imageQuality`, and `preferredCameraDevice` arguments are not supported on Windows. If any of these arguments is supplied, it'll be silently ignored by the Windows version of the plugin.
+  // Note that the `source`, `maxWidth`, `maxHeight`, `imageQuality`, and 
+  // `preferredCameraDevice` arguments are not supported on Windows. If 
+  // any of these arguments is supplied, it'll be silently ignored by the 
+  // Windows version of the plugin.
   @override
   Future<XFile?> getImage({
     required ImageSource source,
@@ -95,7 +106,10 @@ class ImagePickerWindows extends ImagePickerPlatform {
     return file;
   }
 
-  // Note that the `source`, `preferredCameraDevice`, and `maxDuration` arguments are not supported on Windows. If any of these arguments is supplied, it'll be silently ignored by the Windows version of the plugin.
+  // Note that the `source`, `preferredCameraDevice`, and `maxDuration`
+  // arguments are not supported on Windows. If any of these arguments
+  // is supplied, it'll be silently ignored by the Windows version of
+  // the plugin.
   @override
   Future<XFile?> getVideo({
     required ImageSource source,
@@ -109,7 +123,9 @@ class ImagePickerWindows extends ImagePickerPlatform {
     return file;
   }
 
-  // Note that the `maxWidth`, `maxHeight`, and `imageQuality` arguments are not supported on Windows. If any of these arguments is supplied, it'll be silently ignored by the Windows version of the plugin.
+  // Note that the `maxWidth`, `maxHeight`, and `imageQuality` arguments are
+  // not supported on Windows. If any of these arguments is supplied, it'll 
+  // be silently ignored by the Windows version of the plugin.
   @override
   Future<List<XFile>> getMultiImage({
     double? maxWidth,