Refactor PHPickerViewController to use property

packages/image_picker/image_picker/ios/Classes/FLTImagePickerPlugin.h

@@ -5,12 +5,10 @@
 #import <Flutter/Flutter.h>
 #import <PhotosUI/PhotosUI.h>
 
-API_AVAILABLE(ios(14))
 @interface FLTImagePickerPlugin : NSObject <FlutterPlugin>
 
 // For testing only.
 - (UIImagePickerController *)getImagePickerController;
 - (UIViewController *)viewControllerWithWindow:(UIWindow *)window;
-- (PHPickerViewController *)getPickerViewController;
 
 @end

packages/image_picker/image_picker/ios/Classes/FLTImagePickerPlugin.m

@@ -21,6 +21,8 @@ @interface FLTImagePickerPlugin () <UINavigationControllerDelegate,
 
 @property(copy, nonatomic) FlutterResult result;
 
+@property(readonly) PHPickerViewController *_pickerViewController;
+
 @end
 
 static const int SOURCE_CAMERA = 0;
@@ -29,7 +31,6 @@ @interface FLTImagePickerPlugin () <UINavigationControllerDelegate,
 @implementation FLTImagePickerPlugin {
   NSDictionary *_arguments;
   UIImagePickerController *_imagePickerController;
-  PHPickerViewController *_pickerViewController;
   UIImagePickerControllerCameraDevice _device;
   BOOL _phPickerFlag;
 }
@@ -46,10 +47,6 @@ - (UIImagePickerController *)getImagePickerController {
   return _imagePickerController;
 }
 
-- (PHPickerViewController *)getPickerViewController {
-  return _pickerViewController;
-}
-
 - (UIViewController *)viewControllerWithWindow:(UIWindow *)window {
   UIWindow *windowToUse = window;
   if (windowToUse == nil) {
@@ -68,7 +65,7 @@ - (UIViewController *)viewControllerWithWindow:(UIWindow *)window {
   return topController;
 }
 
-- (void)pickImageWithPHPicker:(bool)single {
+- (void)pickImageWithPHPicker:(bool)single API_AVAILABLE(ios(14)) {
   PHPhotoLibrary *photoLibrary =
       PHPhotoLibrary.sharedPhotoLibrary;  // This step is required to fetch PHAsset
   PHPickerConfiguration *config = [[PHPickerConfiguration alloc] initWithPhotoLibrary:photoLibrary];
@@ -77,8 +74,8 @@ - (void)pickImageWithPHPicker:(bool)single {
   }
   config.filter = [PHPickerFilter imagesFilter];
 
-  _pickerViewController = [[PHPickerViewController alloc] initWithConfiguration:config];
-  _pickerViewController.delegate = self;
+  __pickerViewController = [[PHPickerViewController alloc] initWithConfiguration:config];
+  __pickerViewController.delegate = self;
 
   [self checkPhotoAuthorization];
 }
@@ -308,7 +305,7 @@ - (void)errorNoPhotoAccess:(PHAuthorizationStatus)status {
 - (void)showPhotoLibrary {
   // No need to check if SourceType is available. It always is.
   if (_phPickerFlag) {
-    [[self viewControllerWithWindow:nil] presentViewController:_pickerViewController
+    [[self viewControllerWithWindow:nil] presentViewController:__pickerViewController
                                                       animated:YES
                                                     completion:nil];
   } else {
@@ -322,7 +319,7 @@ - (void)showPhotoLibrary {
 // Limited access to the photo library
 - (void)showLimitedPhotoLibrary {
   [[PHPhotoLibrary sharedPhotoLibrary]
-      presentLimitedLibraryPickerFromViewController:_pickerViewController];
+      presentLimitedLibraryPickerFromViewController:__pickerViewController];
 }
 
 - (void)picker:(PHPickerViewController *)picker