From fd62211651d2eb540d5eda58c1a0e11e4ac78ac5 Mon Sep 17 00:00:00 2001
From: yusufdag <yusuf@baseflow.com>
Date: Mon, 17 May 2021 12:30:12 +0200
Subject: [PATCH 01/39] Fix handler method to get preferred camera device

---
 .../image_picker/ios/Classes/FLTImagePickerPlugin.m         | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/image_picker/image_picker/ios/Classes/FLTImagePickerPlugin.m b/packages/image_picker/image_picker/ios/Classes/FLTImagePickerPlugin.m
index 2a9e70cd0081..f12716250c6e 100644
--- a/packages/image_picker/image_picker/ios/Classes/FLTImagePickerPlugin.m
+++ b/packages/image_picker/image_picker/ios/Classes/FLTImagePickerPlugin.m
@@ -158,9 +158,13 @@ - (void)handleMethodCall:(FlutterMethodCall *)call result:(FlutterResult)result
     }
 
     switch (imageSource) {
-      case SOURCE_CAMERA:
+      case SOURCE_CAMERA: {
+        NSInteger cameraDevice = [[_arguments objectForKey:@"cameraDevice"] intValue];
+        _device = (cameraDevice == 1) ? UIImagePickerControllerCameraDeviceFront
+                                      : UIImagePickerControllerCameraDeviceRear;
         [self checkCameraAuthorization];
         break;
+      }
       case SOURCE_GALLERY:
         [self checkPhotoAuthorization];
         break;

From aaa4a390d4d2a9e689ec1b7e22ceec20ab27ebd5 Mon Sep 17 00:00:00 2001
From: yusufdag <yusuf@baseflow.com>
Date: Mon, 17 May 2021 12:36:50 +0200
Subject: [PATCH 02/39] Update the version number

# Conflicts:
#	packages/image_picker/image_picker/pubspec.yaml
---
 packages/image_picker/image_picker/pubspec.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/image_picker/image_picker/pubspec.yaml b/packages/image_picker/image_picker/pubspec.yaml
index fa6f653fa003..408045d66aa4 100755
--- a/packages/image_picker/image_picker/pubspec.yaml
+++ b/packages/image_picker/image_picker/pubspec.yaml
@@ -2,7 +2,7 @@ name: image_picker
 description: Flutter plugin for selecting images from the Android and iOS image
   library, and taking new pictures with the camera.
 homepage: https://github.com/flutter/plugins/tree/master/packages/image_picker/image_picker
-version: 0.7.5+1
+version: 0.7.5+2
 
 flutter:
   plugin:

From 9c021ad13e802602b699ed470ebe9b53265bce8d Mon Sep 17 00:00:00 2001
From: yusufdag <yusuf@baseflow.com>
Date: Mon, 17 May 2021 12:37:37 +0200
Subject: [PATCH 03/39] Add description into the CHANGELOG.md file

# Conflicts:
#	packages/image_picker/image_picker/CHANGELOG.md
---
 packages/image_picker/image_picker/CHANGELOG.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/image_picker/image_picker/CHANGELOG.md b/packages/image_picker/image_picker/CHANGELOG.md
index 380fcf4cbfb3..8ef34fdfc9ca 100644
--- a/packages/image_picker/image_picker/CHANGELOG.md
+++ b/packages/image_picker/image_picker/CHANGELOG.md
@@ -1,3 +1,6 @@
+## 0.7.5+2
+* Fixes an issue where preferredCameraDevice option is not working for getVideo.
+
 ## 0.7.5+1
 
 * Fixes a rotation problem where Select Photos limited access is chosen but the image that is picked 

From 877b0d8006553e2c35dd37976258e0d2934dc92d Mon Sep 17 00:00:00 2001
From: yusufdag <yusuf@baseflow.com>
Date: Mon, 17 May 2021 14:53:14 +0200
Subject: [PATCH 04/39] Fix an issue when camera is chosen

When camera is chosen the originalAsset will be nil which leads wrong orientation settings. This can be YES all the time because limited access only available with iOS 14+ and it will be handled with PHPicker implementation.
---
 .../image_picker/ios/Classes/FLTImagePickerPlugin.m             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/image_picker/image_picker/ios/Classes/FLTImagePickerPlugin.m b/packages/image_picker/image_picker/ios/Classes/FLTImagePickerPlugin.m
index f12716250c6e..9f89173df641 100644
--- a/packages/image_picker/image_picker/ios/Classes/FLTImagePickerPlugin.m
+++ b/packages/image_picker/image_picker/ios/Classes/FLTImagePickerPlugin.m
@@ -460,7 +460,7 @@ - (void)imagePickerController:(UIImagePickerController *)picker
       image = [FLTImagePickerImageUtil scaledImage:image
                                           maxWidth:maxWidth
                                          maxHeight:maxHeight
-                               isMetadataAvailable:originalAsset != nil];
+                               isMetadataAvailable:YES];
     }
 
     if (!originalAsset) {

From 00213eb8f2da70eee2ea4fd8ecb55c4de3af603d Mon Sep 17 00:00:00 2001
From: yusufdag <yusuf@baseflow.com>
Date: Tue, 18 May 2021 09:20:00 +0200
Subject: [PATCH 05/39] Update the version number

---
 packages/image_picker/image_picker/pubspec.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/image_picker/image_picker/pubspec.yaml b/packages/image_picker/image_picker/pubspec.yaml
index 408045d66aa4..fecc40199abf 100755
--- a/packages/image_picker/image_picker/pubspec.yaml
+++ b/packages/image_picker/image_picker/pubspec.yaml
@@ -2,7 +2,7 @@ name: image_picker
 description: Flutter plugin for selecting images from the Android and iOS image
   library, and taking new pictures with the camera.
 homepage: https://github.com/flutter/plugins/tree/master/packages/image_picker/image_picker
-version: 0.7.5+2
+version: 0.7.5+3
 
 flutter:
   plugin:

From 5b7ff47bfd84073792befa6d4a7381bf506a471d Mon Sep 17 00:00:00 2001
From: yusufdag <yusuf@baseflow.com>
Date: Wed, 19 May 2021 12:10:37 +0200
Subject: [PATCH 06/39] Add helper method to get camera device

---
 .../ios/Classes/FLTImagePickerPlugin.m             | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/packages/image_picker/image_picker/ios/Classes/FLTImagePickerPlugin.m b/packages/image_picker/image_picker/ios/Classes/FLTImagePickerPlugin.m
index 3d55afd1671e..3861dd670fb0 100644
--- a/packages/image_picker/image_picker/ios/Classes/FLTImagePickerPlugin.m
+++ b/packages/image_picker/image_picker/ios/Classes/FLTImagePickerPlugin.m
@@ -67,6 +67,12 @@ - (UIViewController *)viewControllerWithWindow:(UIWindow *)window {
   return topController;
 }
 
+- (UIImagePickerControllerCameraDevice)getCameraDevice:(NSDictionary *)arguments {
+  NSInteger cameraDevice = [[arguments objectForKey:@"cameraDevice"] intValue];
+  return (cameraDevice == 1) ? UIImagePickerControllerCameraDeviceFront
+                             : UIImagePickerControllerCameraDeviceRear;
+}
+
 - (void)pickImageWithPHPicker:(bool)single API_AVAILABLE(ios(14)) {
   PHPickerConfiguration *config =
       [[PHPickerConfiguration alloc] initWithPhotoLibrary:PHPhotoLibrary.sharedPhotoLibrary];
@@ -91,9 +97,7 @@ - (void)pickImageWithUIImagePicker {
 
   switch (imageSource) {
     case SOURCE_CAMERA: {
-      NSInteger cameraDevice = [[_arguments objectForKey:@"cameraDevice"] intValue];
-      _device = (cameraDevice == 1) ? UIImagePickerControllerCameraDeviceFront
-                                    : UIImagePickerControllerCameraDeviceRear;
+      _device = [self getCameraDevice:_arguments];
       [self checkCameraAuthorization];
       break;
     }
@@ -159,9 +163,7 @@ - (void)handleMethodCall:(FlutterMethodCall *)call result:(FlutterResult)result
 
     switch (imageSource) {
       case SOURCE_CAMERA: {
-        NSInteger cameraDevice = [[_arguments objectForKey:@"cameraDevice"] intValue];
-        _device = (cameraDevice == 1) ? UIImagePickerControllerCameraDeviceFront
-                                      : UIImagePickerControllerCameraDeviceRear;
+        _device = [self getCameraDevice:_arguments];
         [self checkCameraAuthorization];
         break;
       }

From b548492b2a3f07f78b2e1ecee48883621ab166cd Mon Sep 17 00:00:00 2001
From: yusufdag <yusuf@baseflow.com>
Date: Wed, 19 May 2021 13:10:11 +0200
Subject: [PATCH 07/39] Refactor to get preferred camera device

---
 .../image_picker/ios/Classes/FLTImagePickerPlugin.m        | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/packages/image_picker/image_picker/ios/Classes/FLTImagePickerPlugin.m b/packages/image_picker/image_picker/ios/Classes/FLTImagePickerPlugin.m
index 3861dd670fb0..93bcb3991bc4 100644
--- a/packages/image_picker/image_picker/ios/Classes/FLTImagePickerPlugin.m
+++ b/packages/image_picker/image_picker/ios/Classes/FLTImagePickerPlugin.m
@@ -34,7 +34,6 @@ @interface FLTImagePickerPlugin () <UINavigationControllerDelegate,
 
 @implementation FLTImagePickerPlugin {
   UIImagePickerController *_imagePickerController;
-  UIImagePickerControllerCameraDevice _device;
 }
 
 + (void)registerWithRegistrar:(NSObject<FlutterPluginRegistrar> *)registrar {
@@ -97,7 +96,6 @@ - (void)pickImageWithUIImagePicker {
 
   switch (imageSource) {
     case SOURCE_CAMERA: {
-      _device = [self getCameraDevice:_arguments];
       [self checkCameraAuthorization];
       break;
     }
@@ -163,7 +161,6 @@ - (void)handleMethodCall:(FlutterMethodCall *)call result:(FlutterResult)result
 
     switch (imageSource) {
       case SOURCE_CAMERA: {
-        _device = [self getCameraDevice:_arguments];
         [self checkCameraAuthorization];
         break;
       }
@@ -189,9 +186,9 @@ - (void)showCamera {
   }
   // Camera is not available on simulators
   if ([UIImagePickerController isSourceTypeAvailable:UIImagePickerControllerSourceTypeCamera] &&
-      [UIImagePickerController isCameraDeviceAvailable:_device]) {
+      [UIImagePickerController isCameraDeviceAvailable:[self getCameraDevice:_arguments]]) {
     _imagePickerController.sourceType = UIImagePickerControllerSourceTypeCamera;
-    _imagePickerController.cameraDevice = _device;
+    _imagePickerController.cameraDevice = [self getCameraDevice:_arguments];
     [[self viewControllerWithWindow:nil] presentViewController:_imagePickerController
                                                       animated:YES
                                                     completion:nil];

From 9b8b882d7dff5a8583073bcad29dd6635b2d0b97 Mon Sep 17 00:00:00 2001
From: yusufdag <yusuf@baseflow.com>
Date: Wed, 19 May 2021 15:59:04 +0200
Subject: [PATCH 08/39] Fix team selection in XCTest signing

---
 .../image_picker/example/ios/Runner.xcodeproj/project.pbxproj   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/image_picker/image_picker/example/ios/Runner.xcodeproj/project.pbxproj b/packages/image_picker/image_picker/example/ios/Runner.xcodeproj/project.pbxproj
index 4ea0e7449d0a..4d43a3eed09c 100644
--- a/packages/image_picker/image_picker/example/ios/Runner.xcodeproj/project.pbxproj
+++ b/packages/image_picker/image_picker/example/ios/Runner.xcodeproj/project.pbxproj
@@ -747,7 +747,7 @@
 				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
 				CODE_SIGN_STYLE = Automatic;
-				DEVELOPMENT_TEAM = NHAKRD9N7D;
+				DEVELOPMENT_TEAM = "";
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				INFOPLIST_FILE = RunnerUITestiOS14/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 14.1;

From 23135484e594565a7bbb8f86f94dba24c1875516 Mon Sep 17 00:00:00 2001
From: yusufdag <yusuf@baseflow.com>
Date: Thu, 20 May 2021 09:58:03 +0200
Subject: [PATCH 09/39] Update the version number

---
 packages/image_picker/image_picker/pubspec.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/image_picker/image_picker/pubspec.yaml b/packages/image_picker/image_picker/pubspec.yaml
index fecc40199abf..23b93c764f3b 100755
--- a/packages/image_picker/image_picker/pubspec.yaml
+++ b/packages/image_picker/image_picker/pubspec.yaml
@@ -2,7 +2,7 @@ name: image_picker
 description: Flutter plugin for selecting images from the Android and iOS image
   library, and taking new pictures with the camera.
 homepage: https://github.com/flutter/plugins/tree/master/packages/image_picker/image_picker
-version: 0.7.5+3
+version: 0.7.5+4
 
 flutter:
   plugin:

From 00ae1ffcf208a822de745cca7ae2f666a545f1ed Mon Sep 17 00:00:00 2001
From: yusufdag <yusuf@baseflow.com>
Date: Wed, 26 May 2021 08:18:02 +0200
Subject: [PATCH 10/39] Remove unnecessary curly brackets

---
 .../image_picker/ios/Classes/FLTImagePickerPlugin.m            | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/image_picker/image_picker/ios/Classes/FLTImagePickerPlugin.m b/packages/image_picker/image_picker/ios/Classes/FLTImagePickerPlugin.m
index abfa08afac6e..e8786e8340f5 100644
--- a/packages/image_picker/image_picker/ios/Classes/FLTImagePickerPlugin.m
+++ b/packages/image_picker/image_picker/ios/Classes/FLTImagePickerPlugin.m
@@ -160,10 +160,9 @@ - (void)handleMethodCall:(FlutterMethodCall *)call result:(FlutterResult)result
     }
 
     switch (imageSource) {
-      case SOURCE_CAMERA: {
+      case SOURCE_CAMERA:
         [self checkCameraAuthorization];
         break;
-      }
       case SOURCE_GALLERY:
         [self checkPhotoAuthorization];
         break;

From 30d61c75508c3806b1fe4236f9a607b5015d0215 Mon Sep 17 00:00:00 2001
From: yusufdag <yusuf@baseflow.com>
Date: Wed, 26 May 2021 08:29:06 +0200
Subject: [PATCH 11/39] Remove unnecessary curly brackets

---
 .../image_picker/ios/Classes/FLTImagePickerPlugin.m            | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/image_picker/image_picker/ios/Classes/FLTImagePickerPlugin.m b/packages/image_picker/image_picker/ios/Classes/FLTImagePickerPlugin.m
index e8786e8340f5..44658934e2fe 100644
--- a/packages/image_picker/image_picker/ios/Classes/FLTImagePickerPlugin.m
+++ b/packages/image_picker/image_picker/ios/Classes/FLTImagePickerPlugin.m
@@ -95,10 +95,9 @@ - (void)pickImageWithUIImagePicker {
   int imageSource = [[_arguments objectForKey:@"source"] intValue];
 
   switch (imageSource) {
-    case SOURCE_CAMERA: {
+    case SOURCE_CAMERA:
       [self checkCameraAuthorization];
       break;
-    }
     case SOURCE_GALLERY:
       [self checkPhotoAuthorization];
       break;

From ceb2577b74ade7797972935b03f011df7d398329 Mon Sep 17 00:00:00 2001
From: yusufdag <yusuf@baseflow.com>
Date: Wed, 26 May 2021 08:33:36 +0200
Subject: [PATCH 12/39] Add local variable to call method only once

---
 .../image_picker/ios/Classes/FLTImagePickerPlugin.m          | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/image_picker/image_picker/ios/Classes/FLTImagePickerPlugin.m b/packages/image_picker/image_picker/ios/Classes/FLTImagePickerPlugin.m
index 44658934e2fe..5b999931b996 100644
--- a/packages/image_picker/image_picker/ios/Classes/FLTImagePickerPlugin.m
+++ b/packages/image_picker/image_picker/ios/Classes/FLTImagePickerPlugin.m
@@ -182,11 +182,12 @@ - (void)showCamera {
       return;
     }
   }
+  UIImagePickerControllerCameraDevice device = [self getCameraDevice:_arguments];
   // Camera is not available on simulators
   if ([UIImagePickerController isSourceTypeAvailable:UIImagePickerControllerSourceTypeCamera] &&
-      [UIImagePickerController isCameraDeviceAvailable:[self getCameraDevice:_arguments]]) {
+      [UIImagePickerController isCameraDeviceAvailable:device]) {
     _imagePickerController.sourceType = UIImagePickerControllerSourceTypeCamera;
-    _imagePickerController.cameraDevice = [self getCameraDevice:_arguments];
+    _imagePickerController.cameraDevice = device;
     [[self viewControllerWithWindow:nil] presentViewController:_imagePickerController
                                                       animated:YES
                                                     completion:nil];

From 4398ae6027cd0688e3a2a7331ce12959ebf79ee4 Mon Sep 17 00:00:00 2001
From: yusufdag <yusuf@baseflow.com>
Date: Thu, 27 May 2021 16:05:35 +0200
Subject: [PATCH 13/39] Add a declaration comment

---
 .../image_picker/ios/Classes/FLTImagePickerPlugin.m        | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/image_picker/image_picker/ios/Classes/FLTImagePickerPlugin.m b/packages/image_picker/image_picker/ios/Classes/FLTImagePickerPlugin.m
index 5b999931b996..66bc3dc4bb27 100644
--- a/packages/image_picker/image_picker/ios/Classes/FLTImagePickerPlugin.m
+++ b/packages/image_picker/image_picker/ios/Classes/FLTImagePickerPlugin.m
@@ -66,7 +66,12 @@ - (UIViewController *)viewControllerWithWindow:(UIWindow *)window {
   return topController;
 }
 
-- (UIImagePickerControllerCameraDevice)getCameraDevice:(NSDictionary *)arguments {
+/**
+ * Returns chosen UIImagePickerControllerCameraDevice from the arguments.
+ *
+ * Returns UIImagePickerControllerCameraDeviceRear as a default if any option is not choosen.
+ */
+- (UIImagePickerControllerCameraDevice)getCameraDeviceFromArguments:(NSDictionary *)arguments {
   NSInteger cameraDevice = [[arguments objectForKey:@"cameraDevice"] intValue];
   return (cameraDevice == 1) ? UIImagePickerControllerCameraDeviceFront
                              : UIImagePickerControllerCameraDeviceRear;

From 22b684a57493da0141ba05aac58c03db653df274 Mon Sep 17 00:00:00 2001
From: yusufdag <yusuf@baseflow.com>
Date: Thu, 27 May 2021 16:07:12 +0200
Subject: [PATCH 14/39] Fix the method call

---
 .../image_picker/ios/Classes/FLTImagePickerPlugin.m             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/image_picker/image_picker/ios/Classes/FLTImagePickerPlugin.m b/packages/image_picker/image_picker/ios/Classes/FLTImagePickerPlugin.m
index 66bc3dc4bb27..c220dfb11e99 100644
--- a/packages/image_picker/image_picker/ios/Classes/FLTImagePickerPlugin.m
+++ b/packages/image_picker/image_picker/ios/Classes/FLTImagePickerPlugin.m
@@ -187,7 +187,7 @@ - (void)showCamera {
       return;
     }
   }
-  UIImagePickerControllerCameraDevice device = [self getCameraDevice:_arguments];
+  UIImagePickerControllerCameraDevice device = [self getCameraDeviceFromArguments:_arguments];
   // Camera is not available on simulators
   if ([UIImagePickerController isSourceTypeAvailable:UIImagePickerControllerSourceTypeCamera] &&
       [UIImagePickerController isCameraDeviceAvailable:device]) {

From c93a1579972de5f54a12376811ab1dd9764eaa2d Mon Sep 17 00:00:00 2001
From: yusufdag <yusuf@baseflow.com>
Date: Thu, 27 May 2021 16:09:56 +0200
Subject: [PATCH 15/39] Revert "Fix an issue when camera is chosen"

This reverts commit 877b0d8006553e2c35dd37976258e0d2934dc92d.
---
 .../image_picker/ios/Classes/FLTImagePickerPlugin.m             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/image_picker/image_picker/ios/Classes/FLTImagePickerPlugin.m b/packages/image_picker/image_picker/ios/Classes/FLTImagePickerPlugin.m
index c220dfb11e99..dfb050b0d520 100644
--- a/packages/image_picker/image_picker/ios/Classes/FLTImagePickerPlugin.m
+++ b/packages/image_picker/image_picker/ios/Classes/FLTImagePickerPlugin.m
@@ -467,7 +467,7 @@ - (void)imagePickerController:(UIImagePickerController *)picker
       image = [FLTImagePickerImageUtil scaledImage:image
                                           maxWidth:maxWidth
                                          maxHeight:maxHeight
-                               isMetadataAvailable:YES];
+                               isMetadataAvailable:originalAsset != nil];
     }
 
     if (!originalAsset) {

From 23f4d8ab8db69de6ec0c78bbc263a18b0cfcef69 Mon Sep 17 00:00:00 2001
From: yusufdag <yusuf@baseflow.com>
Date: Thu, 3 Jun 2021 13:09:31 +0200
Subject: [PATCH 16/39] Update the comment

---
 .../image_picker/ios/Classes/FLTImagePickerPlugin.m       | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/image_picker/image_picker/ios/Classes/FLTImagePickerPlugin.m b/packages/image_picker/image_picker/ios/Classes/FLTImagePickerPlugin.m
index 78e2e4ddd5ba..c3688d233a5d 100644
--- a/packages/image_picker/image_picker/ios/Classes/FLTImagePickerPlugin.m
+++ b/packages/image_picker/image_picker/ios/Classes/FLTImagePickerPlugin.m
@@ -67,9 +67,13 @@ - (UIViewController *)viewControllerWithWindow:(UIWindow *)window {
 }
 
 /**
- * Returns chosen UIImagePickerControllerCameraDevice from the arguments.
+ * Applies UIImagePickerControllerCameraDevice on the UIImagePickerController.
  *
- * Returns UIImagePickerControllerCameraDeviceRear as a default if any option is not choosen.
+ * If the cameraDevice value that is fetched from @c arguments is 1 then returns
+ * UIImagePickerControllerCameraDeviceFront. If the cameraDevice value that is fetched
+ * from @c arguments is 0 then returns UIImagePickerControllerCameraDeviceRear.
+ *
+ * @param @arguments that should be used to get cameraDevice value.
  */
 - (UIImagePickerControllerCameraDevice)getCameraDeviceFromArguments:(NSDictionary *)arguments {
   NSInteger cameraDevice = [[arguments objectForKey:@"cameraDevice"] intValue];

From f8fa19d2b1f1e4e13f2de596f6d958943afe4404 Mon Sep 17 00:00:00 2001
From: yusufdag <yusuf@baseflow.com>
Date: Thu, 3 Jun 2021 13:15:49 +0200
Subject: [PATCH 17/39] Add OCMock to the RunnerUITests

---
 .../image_picker/ios/Tests/ImagePickerPluginTests.m   | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/packages/image_picker/image_picker/ios/Tests/ImagePickerPluginTests.m b/packages/image_picker/image_picker/ios/Tests/ImagePickerPluginTests.m
index 04ba4b98e241..53adc90960dc 100644
--- a/packages/image_picker/image_picker/ios/Tests/ImagePickerPluginTests.m
+++ b/packages/image_picker/image_picker/ios/Tests/ImagePickerPluginTests.m
@@ -6,6 +6,7 @@
 
 @import image_picker;
 @import XCTest;
+#import <OCMock/OCMock.h>
 
 @interface MockViewController : UIViewController
 @property(nonatomic, retain) UIViewController *mockPresented;
@@ -27,10 +28,20 @@ - (void)imagePickerControllerDidCancel:(UIImagePickerController *)picker;
 @end
 
 @interface ImagePickerPluginTests : XCTestCase
+@property(readonly, nonatomic) id mockDevice;
 @end
 
 @implementation ImagePickerPluginTests
 
+- (void)setUp {
+  _mockDevice = OCMClassMock([UIImagePickerController class]);
+}
+
+- (void)tearDown {
+  // Put teardown code here. This method is called after the invocation of each test method in the
+  // class.
+}
+
 #pragma mark - Test camera devices, no op on simulators
 - (void)testPluginPickImageDeviceBack {
   if (![UIImagePickerController isSourceTypeAvailable:UIImagePickerControllerSourceTypeCamera]) {

From b5710fb6b3838773a1bd598f41ee226766b3952c Mon Sep 17 00:00:00 2001
From: yusufdag <yusuf@baseflow.com>
Date: Thu, 3 Jun 2021 13:21:01 +0200
Subject: [PATCH 18/39] Refactor unit tests with OCMock implementation

It was not possible to test cameraDevice is back or front before. The unit tests were device-only and we aren't able to test this behaviour. We are able to test it with this implementation.
---
 .../ios/Tests/ImagePickerPluginTests.m        | 84 +++++++++++++------
 1 file changed, 60 insertions(+), 24 deletions(-)

diff --git a/packages/image_picker/image_picker/ios/Tests/ImagePickerPluginTests.m b/packages/image_picker/image_picker/ios/Tests/ImagePickerPluginTests.m
index 53adc90960dc..005d53970790 100644
--- a/packages/image_picker/image_picker/ios/Tests/ImagePickerPluginTests.m
+++ b/packages/image_picker/image_picker/ios/Tests/ImagePickerPluginTests.m
@@ -42,11 +42,17 @@ - (void)tearDown {
   // class.
 }
 
-#pragma mark - Test camera devices, no op on simulators
 - (void)testPluginPickImageDeviceBack {
-  if (![UIImagePickerController isSourceTypeAvailable:UIImagePickerControllerSourceTypeCamera]) {
-    return;
-  }
+  // UIImagePickerControllerSourceTypeCamera is supported
+  OCMStub(ClassMethod([_mockDevice isSourceTypeAvailable:UIImagePickerControllerSourceTypeCamera]))
+      .andReturn(true);
+
+  // UIImagePickerControllerCameraDeviceRear is supported
+  OCMStub(
+      ClassMethod([_mockDevice isCameraDeviceAvailable:UIImagePickerControllerCameraDeviceRear]))
+      .andReturn(true);
+
+  // Run test
   FLTImagePickerPlugin *plugin = [FLTImagePickerPlugin new];
   FlutterMethodCall *call =
       [FlutterMethodCall methodCallWithMethodName:@"pickImage"
@@ -54,14 +60,23 @@ - (void)testPluginPickImageDeviceBack {
   [plugin handleMethodCall:call
                     result:^(id _Nullable r){
                     }];
+
+  // Expect cameraDevice is equal to UIImagePickerControllerCameraDeviceRear
   XCTAssertEqual([plugin getImagePickerController].cameraDevice,
                  UIImagePickerControllerCameraDeviceRear);
 }
 
 - (void)testPluginPickImageDeviceFront {
-  if (![UIImagePickerController isSourceTypeAvailable:UIImagePickerControllerSourceTypeCamera]) {
-    return;
-  }
+  // UIImagePickerControllerSourceTypeCamera is supported
+  OCMStub(ClassMethod([_mockDevice isSourceTypeAvailable:UIImagePickerControllerSourceTypeCamera]))
+      .andReturn(true);
+
+  // UIImagePickerControllerCameraDeviceFront is supported
+  OCMStub(
+      ClassMethod([_mockDevice isCameraDeviceAvailable:UIImagePickerControllerCameraDeviceFront]))
+      .andReturn(true);
+
+  // Run test
   FLTImagePickerPlugin *plugin = [FLTImagePickerPlugin new];
   FlutterMethodCall *call =
       [FlutterMethodCall methodCallWithMethodName:@"pickImage"
@@ -69,14 +84,23 @@ - (void)testPluginPickImageDeviceFront {
   [plugin handleMethodCall:call
                     result:^(id _Nullable r){
                     }];
+
+  // Expect cameraDevice is equal to UIImagePickerControllerCameraDeviceFront
   XCTAssertEqual([plugin getImagePickerController].cameraDevice,
                  UIImagePickerControllerCameraDeviceFront);
 }
 
 - (void)testPluginPickVideoDeviceBack {
-  if (![UIImagePickerController isSourceTypeAvailable:UIImagePickerControllerSourceTypeCamera]) {
-    return;
-  }
+  // UIImagePickerControllerSourceTypeCamera is supported
+  OCMStub(ClassMethod([_mockDevice isSourceTypeAvailable:UIImagePickerControllerSourceTypeCamera]))
+      .andReturn(true);
+
+  // UIImagePickerControllerCameraDeviceRear is supported
+  OCMStub(
+      ClassMethod([_mockDevice isCameraDeviceAvailable:UIImagePickerControllerCameraDeviceRear]))
+      .andReturn(true);
+
+  // Run test
   FLTImagePickerPlugin *plugin = [FLTImagePickerPlugin new];
   FlutterMethodCall *call =
       [FlutterMethodCall methodCallWithMethodName:@"pickVideo"
@@ -84,41 +108,53 @@ - (void)testPluginPickVideoDeviceBack {
   [plugin handleMethodCall:call
                     result:^(id _Nullable r){
                     }];
+
+  // Expect cameraDevice is equal to UIImagePickerControllerCameraDeviceRear
   XCTAssertEqual([plugin getImagePickerController].cameraDevice,
                  UIImagePickerControllerCameraDeviceRear);
 }
 
-- (void)testPluginPickImageDeviceCancelClickMultipleTimes {
-  if ([UIImagePickerController isSourceTypeAvailable:UIImagePickerControllerSourceTypeCamera]) {
-    return;
-  }
+- (void)testPluginPickVideoDeviceFront {
+  // UIImagePickerControllerSourceTypeCamera is supported
+  OCMStub(ClassMethod([_mockDevice isSourceTypeAvailable:UIImagePickerControllerSourceTypeCamera]))
+      .andReturn(true);
+
+  // UIImagePickerControllerCameraDeviceFront is supported
+  OCMStub(
+      ClassMethod([_mockDevice isCameraDeviceAvailable:UIImagePickerControllerCameraDeviceFront]))
+      .andReturn(true);
+
+  // Run test
   FLTImagePickerPlugin *plugin = [FLTImagePickerPlugin new];
   FlutterMethodCall *call =
-      [FlutterMethodCall methodCallWithMethodName:@"pickImage"
+      [FlutterMethodCall methodCallWithMethodName:@"pickVideo"
                                         arguments:@{@"source" : @(0), @"cameraDevice" : @(1)}];
   [plugin handleMethodCall:call
                     result:^(id _Nullable r){
                     }];
-  plugin.result = ^(id result) {
 
-  };
-  [plugin imagePickerControllerDidCancel:[plugin getImagePickerController]];
-  [plugin imagePickerControllerDidCancel:[plugin getImagePickerController]];
+  // Expect cameraDevice is equal to UIImagePickerControllerCameraDeviceFront
+  XCTAssertEqual([plugin getImagePickerController].cameraDevice,
+                 UIImagePickerControllerCameraDeviceFront);
 }
 
-- (void)testPluginPickVideoDeviceFront {
-  if (![UIImagePickerController isSourceTypeAvailable:UIImagePickerControllerSourceTypeCamera]) {
+#pragma mark - Test camera devices, no op on simulators
+- (void)testPluginPickImageDeviceCancelClickMultipleTimes {
+  if ([UIImagePickerController isSourceTypeAvailable:UIImagePickerControllerSourceTypeCamera]) {
     return;
   }
   FLTImagePickerPlugin *plugin = [FLTImagePickerPlugin new];
   FlutterMethodCall *call =
-      [FlutterMethodCall methodCallWithMethodName:@"pickVideo"
+      [FlutterMethodCall methodCallWithMethodName:@"pickImage"
                                         arguments:@{@"source" : @(0), @"cameraDevice" : @(1)}];
   [plugin handleMethodCall:call
                     result:^(id _Nullable r){
                     }];
-  XCTAssertEqual([plugin getImagePickerController].cameraDevice,
-                 UIImagePickerControllerCameraDeviceFront);
+  plugin.result = ^(id result) {
+
+  };
+  [plugin imagePickerControllerDidCancel:[plugin getImagePickerController]];
+  [plugin imagePickerControllerDidCancel:[plugin getImagePickerController]];
 }
 
 #pragma mark - Test video duration

From dc7c3b63e033498c36e8ead561adb8e99afd8596 Mon Sep 17 00:00:00 2001
From: yusufdag <yusuf@baseflow.com>
Date: Thu, 3 Jun 2021 13:21:20 +0200
Subject: [PATCH 19/39] Update the podfile

---
 packages/image_picker/image_picker/example/ios/Podfile | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/image_picker/image_picker/example/ios/Podfile b/packages/image_picker/image_picker/example/ios/Podfile
index 48f7bbc93cb5..539ddc8a7299 100644
--- a/packages/image_picker/image_picker/example/ios/Podfile
+++ b/packages/image_picker/image_picker/example/ios/Podfile
@@ -31,7 +31,10 @@ target 'Runner' do
   flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__))
 
   target 'RunnerUITests' do
+    platform :ios, '9.0'
     inherit! :search_paths
+    # Pods for testing
+    pod 'OCMock', '~> 3.8.1'
   end
 end
 

From 8ef3516ef45487c7f04f47c98d4aecd9b3857bb4 Mon Sep 17 00:00:00 2001
From: yusufdag <yusuf@baseflow.com>
Date: Thu, 3 Jun 2021 13:22:13 +0200
Subject: [PATCH 20/39] Add libOCMock.a in Link Binary With Libraries

---
 .../example/ios/Runner.xcodeproj/project.pbxproj            | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/packages/image_picker/image_picker/example/ios/Runner.xcodeproj/project.pbxproj b/packages/image_picker/image_picker/example/ios/Runner.xcodeproj/project.pbxproj
index 4d43a3eed09c..866954f16b19 100644
--- a/packages/image_picker/image_picker/example/ios/Runner.xcodeproj/project.pbxproj
+++ b/packages/image_picker/image_picker/example/ios/Runner.xcodeproj/project.pbxproj
@@ -7,6 +7,7 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		12DA27EC5F2F6C104141A58B /* libPods-RunnerUITests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A908FAEEA2A9B26D903C09C5 /* libPods-RunnerUITests.a */; };
 		3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
 		5C9513011EC38BD300040975 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 5C9513001EC38BD300040975 /* GeneratedPluginRegistrant.m */; };
 		680049262280D736006DD6AB /* MetaDataUtilTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 680049252280D736006DD6AB /* MetaDataUtilTests.m */; };
@@ -90,6 +91,8 @@
 		BE7AEE6C26403C46006181AA /* RunnerUITestiOS14.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerUITestiOS14.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		BE7AEE7026403C46006181AA /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		BE7AEE7826403CC8006181AA /* ImagePickerFromLimitedGalleryUITests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ImagePickerFromLimitedGalleryUITests.m; sourceTree = "<group>"; };
+		BEFF9DE52668C8C8007BE32C /* libOCMock.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libOCMock.a; sourceTree = BUILT_PRODUCTS_DIR; };
+		BEFF9DE72668C8DA007BE32C /* libOCMock.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libOCMock.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		EC32F6993F4529982D9519F1 /* libPods-Runner.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Runner.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		F78AF3172342D9D7008449C7 /* ImagePickerTestImages.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = ImagePickerTestImages.h; path = ../../../ios/Tests/ImagePickerTestImages.h; sourceTree = "<group>"; };
 		F78AF3182342D9D7008449C7 /* ImagePickerTestImages.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = ImagePickerTestImages.m; path = ../../../ios/Tests/ImagePickerTestImages.m; sourceTree = "<group>"; };
@@ -100,6 +103,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				12DA27EC5F2F6C104141A58B /* libPods-RunnerUITests.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -228,6 +232,8 @@
 		CF3B75C9A7D2FA2A4C99F110 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				BEFF9DE72668C8DA007BE32C /* libOCMock.a */,
+				BEFF9DE52668C8C8007BE32C /* libOCMock.a */,
 				EC32F6993F4529982D9519F1 /* libPods-Runner.a */,
 				A908FAEEA2A9B26D903C09C5 /* libPods-RunnerUITests.a */,
 			);

From 3f7d0625447155d85252054a495de95f26006e65 Mon Sep 17 00:00:00 2001
From: yusufdag <yusuf@baseflow.com>
Date: Thu, 3 Jun 2021 14:53:52 +0200
Subject: [PATCH 21/39] Revert "Add libOCMock.a in Link Binary With Libraries"

This reverts commit 8ef3516ef45487c7f04f47c98d4aecd9b3857bb4.
---
 .../example/ios/Runner.xcodeproj/project.pbxproj            | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/packages/image_picker/image_picker/example/ios/Runner.xcodeproj/project.pbxproj b/packages/image_picker/image_picker/example/ios/Runner.xcodeproj/project.pbxproj
index 866954f16b19..4d43a3eed09c 100644
--- a/packages/image_picker/image_picker/example/ios/Runner.xcodeproj/project.pbxproj
+++ b/packages/image_picker/image_picker/example/ios/Runner.xcodeproj/project.pbxproj
@@ -7,7 +7,6 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		12DA27EC5F2F6C104141A58B /* libPods-RunnerUITests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A908FAEEA2A9B26D903C09C5 /* libPods-RunnerUITests.a */; };
 		3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
 		5C9513011EC38BD300040975 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 5C9513001EC38BD300040975 /* GeneratedPluginRegistrant.m */; };
 		680049262280D736006DD6AB /* MetaDataUtilTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 680049252280D736006DD6AB /* MetaDataUtilTests.m */; };
@@ -91,8 +90,6 @@
 		BE7AEE6C26403C46006181AA /* RunnerUITestiOS14.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerUITestiOS14.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		BE7AEE7026403C46006181AA /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		BE7AEE7826403CC8006181AA /* ImagePickerFromLimitedGalleryUITests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ImagePickerFromLimitedGalleryUITests.m; sourceTree = "<group>"; };
-		BEFF9DE52668C8C8007BE32C /* libOCMock.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libOCMock.a; sourceTree = BUILT_PRODUCTS_DIR; };
-		BEFF9DE72668C8DA007BE32C /* libOCMock.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libOCMock.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		EC32F6993F4529982D9519F1 /* libPods-Runner.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Runner.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		F78AF3172342D9D7008449C7 /* ImagePickerTestImages.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = ImagePickerTestImages.h; path = ../../../ios/Tests/ImagePickerTestImages.h; sourceTree = "<group>"; };
 		F78AF3182342D9D7008449C7 /* ImagePickerTestImages.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = ImagePickerTestImages.m; path = ../../../ios/Tests/ImagePickerTestImages.m; sourceTree = "<group>"; };
@@ -103,7 +100,6 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				12DA27EC5F2F6C104141A58B /* libPods-RunnerUITests.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -232,8 +228,6 @@
 		CF3B75C9A7D2FA2A4C99F110 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
-				BEFF9DE72668C8DA007BE32C /* libOCMock.a */,
-				BEFF9DE52668C8C8007BE32C /* libOCMock.a */,
 				EC32F6993F4529982D9519F1 /* libPods-Runner.a */,
 				A908FAEEA2A9B26D903C09C5 /* libPods-RunnerUITests.a */,
 			);

From 04b8e740f46e0e56740a5576d7b9384958d9f73e Mon Sep 17 00:00:00 2001
From: yusufdag <yusuf@baseflow.com>
Date: Thu, 3 Jun 2021 20:04:34 +0200
Subject: [PATCH 22/39] Update CHANGELOG file

---
 packages/image_picker/image_picker/CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/image_picker/image_picker/CHANGELOG.md b/packages/image_picker/image_picker/CHANGELOG.md
index 8d6ac733370d..a9654ac4ecbe 100644
--- a/packages/image_picker/image_picker/CHANGELOG.md
+++ b/packages/image_picker/image_picker/CHANGELOG.md
@@ -1,4 +1,5 @@
 ## 0.8.0+2
+
 * Fixes an issue where `preferredCameraDevice` option is not working for `getVideo` method.
 
 ## 0.8.0+1

From 46c1e7d5d90b1879483166065a468dd4bca5e0d8 Mon Sep 17 00:00:00 2001
From: yusufdag <yusuf@baseflow.com>
Date: Thu, 3 Jun 2021 20:06:33 +0200
Subject: [PATCH 23/39] Refactor Podfile to add OCMock under RunnerTests

---
 packages/image_picker/image_picker/example/ios/Podfile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/image_picker/image_picker/example/ios/Podfile b/packages/image_picker/image_picker/example/ios/Podfile
index 41cf8c370d36..8979c25fea5e 100644
--- a/packages/image_picker/image_picker/example/ios/Podfile
+++ b/packages/image_picker/image_picker/example/ios/Podfile
@@ -31,14 +31,14 @@ target 'Runner' do
   flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__))
 
   target 'RunnerTests' do
-    inherit! :search_paths
-  end
-  target 'RunnerUITests' do
     platform :ios, '9.0'
     inherit! :search_paths
     # Pods for testing
     pod 'OCMock', '~> 3.8.1'
   end
+  target 'RunnerUITests' do
+    inherit! :search_paths
+  end
 end
 
 post_install do |installer|

From c27a3f3bac95a122a1fc2d2cc185476a4aef234e Mon Sep 17 00:00:00 2001
From: yusufdag <yusuf@baseflow.com>
Date: Fri, 4 Jun 2021 12:31:40 +0200
Subject: [PATCH 24/39] Add AVCaptureDevice mock

---
 .../ios/RunnerTests/ImagePickerPluginTests.m  | 46 +++++++++++++------
 1 file changed, 32 insertions(+), 14 deletions(-)

diff --git a/packages/image_picker/image_picker/example/ios/RunnerTests/ImagePickerPluginTests.m b/packages/image_picker/image_picker/example/ios/RunnerTests/ImagePickerPluginTests.m
index 005d53970790..ab27948be1f9 100644
--- a/packages/image_picker/image_picker/example/ios/RunnerTests/ImagePickerPluginTests.m
+++ b/packages/image_picker/image_picker/example/ios/RunnerTests/ImagePickerPluginTests.m
@@ -28,13 +28,15 @@ - (void)imagePickerControllerDidCancel:(UIImagePickerController *)picker;
 @end
 
 @interface ImagePickerPluginTests : XCTestCase
-@property(readonly, nonatomic) id mockDevice;
+@property(readonly, nonatomic) id mockUIImagePicker;
+@property(readonly, nonatomic) id mockAVCaptureDevice;
 @end
 
 @implementation ImagePickerPluginTests
 
 - (void)setUp {
-  _mockDevice = OCMClassMock([UIImagePickerController class]);
+  _mockUIImagePicker = OCMClassMock([UIImagePickerController class]);
+  _mockAVCaptureDevice = OCMClassMock([AVCaptureDevice class]);
 }
 
 - (void)tearDown {
@@ -44,14 +46,18 @@ - (void)tearDown {
 
 - (void)testPluginPickImageDeviceBack {
   // UIImagePickerControllerSourceTypeCamera is supported
-  OCMStub(ClassMethod([_mockDevice isSourceTypeAvailable:UIImagePickerControllerSourceTypeCamera]))
+  OCMStub(ClassMethod(
+              [_mockUIImagePicker isSourceTypeAvailable:UIImagePickerControllerSourceTypeCamera]))
       .andReturn(true);
 
   // UIImagePickerControllerCameraDeviceRear is supported
-  OCMStub(
-      ClassMethod([_mockDevice isCameraDeviceAvailable:UIImagePickerControllerCameraDeviceRear]))
+  OCMStub(ClassMethod(
+              [_mockUIImagePicker isCameraDeviceAvailable:UIImagePickerControllerCameraDeviceRear]))
       .andReturn(true);
 
+  // AVAuthorizationStatusAuthorized is supported
+  OCMStub([_mockAVCaptureDevice authorizationStatusForMediaType:AVMediaTypeVideo]).andReturn(3);
+
   // Run test
   FLTImagePickerPlugin *plugin = [FLTImagePickerPlugin new];
   FlutterMethodCall *call =
@@ -68,14 +74,18 @@ - (void)testPluginPickImageDeviceBack {
 
 - (void)testPluginPickImageDeviceFront {
   // UIImagePickerControllerSourceTypeCamera is supported
-  OCMStub(ClassMethod([_mockDevice isSourceTypeAvailable:UIImagePickerControllerSourceTypeCamera]))
+  OCMStub(ClassMethod(
+              [_mockUIImagePicker isSourceTypeAvailable:UIImagePickerControllerSourceTypeCamera]))
       .andReturn(true);
 
   // UIImagePickerControllerCameraDeviceFront is supported
-  OCMStub(
-      ClassMethod([_mockDevice isCameraDeviceAvailable:UIImagePickerControllerCameraDeviceFront]))
+  OCMStub(ClassMethod([_mockUIImagePicker
+              isCameraDeviceAvailable:UIImagePickerControllerCameraDeviceFront]))
       .andReturn(true);
 
+  // AVAuthorizationStatusAuthorized is supported
+  OCMStub([_mockAVCaptureDevice authorizationStatusForMediaType:AVMediaTypeVideo]).andReturn(3);
+
   // Run test
   FLTImagePickerPlugin *plugin = [FLTImagePickerPlugin new];
   FlutterMethodCall *call =
@@ -92,14 +102,18 @@ - (void)testPluginPickImageDeviceFront {
 
 - (void)testPluginPickVideoDeviceBack {
   // UIImagePickerControllerSourceTypeCamera is supported
-  OCMStub(ClassMethod([_mockDevice isSourceTypeAvailable:UIImagePickerControllerSourceTypeCamera]))
+  OCMStub(ClassMethod(
+              [_mockUIImagePicker isSourceTypeAvailable:UIImagePickerControllerSourceTypeCamera]))
       .andReturn(true);
 
   // UIImagePickerControllerCameraDeviceRear is supported
-  OCMStub(
-      ClassMethod([_mockDevice isCameraDeviceAvailable:UIImagePickerControllerCameraDeviceRear]))
+  OCMStub(ClassMethod(
+              [_mockUIImagePicker isCameraDeviceAvailable:UIImagePickerControllerCameraDeviceRear]))
       .andReturn(true);
 
+  // AVAuthorizationStatusAuthorized is supported
+  OCMStub([_mockAVCaptureDevice authorizationStatusForMediaType:AVMediaTypeVideo]).andReturn(3);
+
   // Run test
   FLTImagePickerPlugin *plugin = [FLTImagePickerPlugin new];
   FlutterMethodCall *call =
@@ -116,14 +130,18 @@ - (void)testPluginPickVideoDeviceBack {
 
 - (void)testPluginPickVideoDeviceFront {
   // UIImagePickerControllerSourceTypeCamera is supported
-  OCMStub(ClassMethod([_mockDevice isSourceTypeAvailable:UIImagePickerControllerSourceTypeCamera]))
+  OCMStub(ClassMethod(
+              [_mockUIImagePicker isSourceTypeAvailable:UIImagePickerControllerSourceTypeCamera]))
       .andReturn(true);
 
   // UIImagePickerControllerCameraDeviceFront is supported
-  OCMStub(
-      ClassMethod([_mockDevice isCameraDeviceAvailable:UIImagePickerControllerCameraDeviceFront]))
+  OCMStub(ClassMethod([_mockUIImagePicker
+              isCameraDeviceAvailable:UIImagePickerControllerCameraDeviceFront]))
       .andReturn(true);
 
+  // AVAuthorizationStatusAuthorized is supported
+  OCMStub([_mockAVCaptureDevice authorizationStatusForMediaType:AVMediaTypeVideo]).andReturn(3);
+
   // Run test
   FLTImagePickerPlugin *plugin = [FLTImagePickerPlugin new];
   FlutterMethodCall *call =

From 27df40e2bf762fe3e09be68b8e06fb1c5755fded Mon Sep 17 00:00:00 2001
From: yusufdag <yusuf@baseflow.com>
Date: Tue, 8 Jun 2021 09:59:47 +0200
Subject: [PATCH 25/39] Update version number

---
 packages/image_picker/image_picker/pubspec.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/image_picker/image_picker/pubspec.yaml b/packages/image_picker/image_picker/pubspec.yaml
index 4ca29b4d33d1..bf42015e3193 100755
--- a/packages/image_picker/image_picker/pubspec.yaml
+++ b/packages/image_picker/image_picker/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for selecting images from the Android and iOS image
   library, and taking new pictures with the camera.
 repository: https://github.com/flutter/plugins/tree/master/packages/image_picker/image_picker
 issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+image_picker%22
-version: 0.8.0+2
+version: 0.8.0+3
 
 environment:
   sdk: ">=2.12.0 <3.0.0"

From 1c3db4c22e523c58e2114cce9c89fb416e53ee32 Mon Sep 17 00:00:00 2001
From: yusufdag <yusuf@baseflow.com>
Date: Tue, 8 Jun 2021 11:02:19 +0200
Subject: [PATCH 26/39] Update version number

---
 packages/image_picker/image_picker/pubspec.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/image_picker/image_picker/pubspec.yaml b/packages/image_picker/image_picker/pubspec.yaml
index bf42015e3193..4dc7785111a4 100755
--- a/packages/image_picker/image_picker/pubspec.yaml
+++ b/packages/image_picker/image_picker/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for selecting images from the Android and iOS image
   library, and taking new pictures with the camera.
 repository: https://github.com/flutter/plugins/tree/master/packages/image_picker/image_picker
 issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+image_picker%22
-version: 0.8.0+3
+version: 0.8.0+4
 
 environment:
   sdk: ">=2.12.0 <3.0.0"

From 290ca88af05668128bc479d31079a08f9860aea8 Mon Sep 17 00:00:00 2001
From: yusufdag <yusuf@baseflow.com>
Date: Mon, 21 Jun 2021 08:47:03 +0200
Subject: [PATCH 27/39] Remove self-explanatory comments

---
 .../example/ios/RunnerTests/ImagePickerPluginTests.m          | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/packages/image_picker/image_picker/example/ios/RunnerTests/ImagePickerPluginTests.m b/packages/image_picker/image_picker/example/ios/RunnerTests/ImagePickerPluginTests.m
index ab27948be1f9..b3f77ae48fe4 100644
--- a/packages/image_picker/image_picker/example/ios/RunnerTests/ImagePickerPluginTests.m
+++ b/packages/image_picker/image_picker/example/ios/RunnerTests/ImagePickerPluginTests.m
@@ -67,7 +67,6 @@ - (void)testPluginPickImageDeviceBack {
                     result:^(id _Nullable r){
                     }];
 
-  // Expect cameraDevice is equal to UIImagePickerControllerCameraDeviceRear
   XCTAssertEqual([plugin getImagePickerController].cameraDevice,
                  UIImagePickerControllerCameraDeviceRear);
 }
@@ -95,7 +94,6 @@ - (void)testPluginPickImageDeviceFront {
                     result:^(id _Nullable r){
                     }];
 
-  // Expect cameraDevice is equal to UIImagePickerControllerCameraDeviceFront
   XCTAssertEqual([plugin getImagePickerController].cameraDevice,
                  UIImagePickerControllerCameraDeviceFront);
 }
@@ -123,7 +121,6 @@ - (void)testPluginPickVideoDeviceBack {
                     result:^(id _Nullable r){
                     }];
 
-  // Expect cameraDevice is equal to UIImagePickerControllerCameraDeviceRear
   XCTAssertEqual([plugin getImagePickerController].cameraDevice,
                  UIImagePickerControllerCameraDeviceRear);
 }
@@ -151,7 +148,6 @@ - (void)testPluginPickVideoDeviceFront {
                     result:^(id _Nullable r){
                     }];
 
-  // Expect cameraDevice is equal to UIImagePickerControllerCameraDeviceFront
   XCTAssertEqual([plugin getImagePickerController].cameraDevice,
                  UIImagePickerControllerCameraDeviceFront);
 }

From 0ec6cc87a4f038c7489d386ba3ee6b83d707d2b5 Mon Sep 17 00:00:00 2001
From: yusufdag <yusuf@baseflow.com>
Date: Tue, 22 Jun 2021 10:35:15 +0200
Subject: [PATCH 28/39] Update the version number

---
 packages/image_picker/image_picker/pubspec.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/image_picker/image_picker/pubspec.yaml b/packages/image_picker/image_picker/pubspec.yaml
index 4dc7785111a4..4061ccab25ec 100755
--- a/packages/image_picker/image_picker/pubspec.yaml
+++ b/packages/image_picker/image_picker/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for selecting images from the Android and iOS image
   library, and taking new pictures with the camera.
 repository: https://github.com/flutter/plugins/tree/master/packages/image_picker/image_picker
 issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+image_picker%22
-version: 0.8.0+4
+version: 0.8.0+5
 
 environment:
   sdk: ">=2.12.0 <3.0.0"

From bf8bd3692b5a0c79beaa3af20987bc702d18ea3f Mon Sep 17 00:00:00 2001
From: yusufdag <yusuf@baseflow.com>
Date: Fri, 25 Jun 2021 08:55:56 +0200
Subject: [PATCH 29/39] Update the version number

---
 packages/image_picker/image_picker/pubspec.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/image_picker/image_picker/pubspec.yaml b/packages/image_picker/image_picker/pubspec.yaml
index e8fafb324e71..620d118142fb 100755
--- a/packages/image_picker/image_picker/pubspec.yaml
+++ b/packages/image_picker/image_picker/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for selecting images from the Android and iOS image
   library, and taking new pictures with the camera.
 repository: https://github.com/flutter/plugins/tree/master/packages/image_picker/image_picker
 issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+image_picker%22
-version: 0.8.1+1
+version: 0.8.1+2
 
 environment:
   sdk: ">=2.12.0 <3.0.0"

From 5a142800fb3e65874ca6b51c60fde08d622b392a Mon Sep 17 00:00:00 2001
From: yusufdag <yusuf@baseflow.com>
Date: Mon, 28 Jun 2021 07:19:57 +0200
Subject: [PATCH 30/39] Remove tearDown method

---
 .../example/ios/RunnerTests/ImagePickerPluginTests.m         | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/packages/image_picker/image_picker/example/ios/RunnerTests/ImagePickerPluginTests.m b/packages/image_picker/image_picker/example/ios/RunnerTests/ImagePickerPluginTests.m
index 1726b96f368c..b32079f0ae86 100644
--- a/packages/image_picker/image_picker/example/ios/RunnerTests/ImagePickerPluginTests.m
+++ b/packages/image_picker/image_picker/example/ios/RunnerTests/ImagePickerPluginTests.m
@@ -39,11 +39,6 @@ - (void)setUp {
   _mockAVCaptureDevice = OCMClassMock([AVCaptureDevice class]);
 }
 
-- (void)tearDown {
-  // Put teardown code here. This method is called after the invocation of each test method in the
-  // class.
-}
-
 - (void)testPluginPickImageDeviceBack {
   // UIImagePickerControllerSourceTypeCamera is supported
   OCMStub(ClassMethod(

From 6fe570f97b66c2127aa10a6f8d4f14bd19d0ba84 Mon Sep 17 00:00:00 2001
From: yusufdag <yusuf@baseflow.com>
Date: Mon, 28 Jun 2021 07:28:46 +0200
Subject: [PATCH 31/39] Convert true to YES

---
 .../ios/RunnerTests/ImagePickerPluginTests.m     | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/packages/image_picker/image_picker/example/ios/RunnerTests/ImagePickerPluginTests.m b/packages/image_picker/image_picker/example/ios/RunnerTests/ImagePickerPluginTests.m
index b32079f0ae86..8dcbd26eaa62 100644
--- a/packages/image_picker/image_picker/example/ios/RunnerTests/ImagePickerPluginTests.m
+++ b/packages/image_picker/image_picker/example/ios/RunnerTests/ImagePickerPluginTests.m
@@ -43,12 +43,12 @@ - (void)testPluginPickImageDeviceBack {
   // UIImagePickerControllerSourceTypeCamera is supported
   OCMStub(ClassMethod(
               [_mockUIImagePicker isSourceTypeAvailable:UIImagePickerControllerSourceTypeCamera]))
-      .andReturn(true);
+      .andReturn(YES);
 
   // UIImagePickerControllerCameraDeviceRear is supported
   OCMStub(ClassMethod(
               [_mockUIImagePicker isCameraDeviceAvailable:UIImagePickerControllerCameraDeviceRear]))
-      .andReturn(true);
+      .andReturn(YES);
 
   // AVAuthorizationStatusAuthorized is supported
   OCMStub([_mockAVCaptureDevice authorizationStatusForMediaType:AVMediaTypeVideo]).andReturn(3);
@@ -70,12 +70,12 @@ - (void)testPluginPickImageDeviceFront {
   // UIImagePickerControllerSourceTypeCamera is supported
   OCMStub(ClassMethod(
               [_mockUIImagePicker isSourceTypeAvailable:UIImagePickerControllerSourceTypeCamera]))
-      .andReturn(true);
+      .andReturn(YES);
 
   // UIImagePickerControllerCameraDeviceFront is supported
   OCMStub(ClassMethod([_mockUIImagePicker
               isCameraDeviceAvailable:UIImagePickerControllerCameraDeviceFront]))
-      .andReturn(true);
+      .andReturn(YES);
 
   // AVAuthorizationStatusAuthorized is supported
   OCMStub([_mockAVCaptureDevice authorizationStatusForMediaType:AVMediaTypeVideo]).andReturn(3);
@@ -97,12 +97,12 @@ - (void)testPluginPickVideoDeviceBack {
   // UIImagePickerControllerSourceTypeCamera is supported
   OCMStub(ClassMethod(
               [_mockUIImagePicker isSourceTypeAvailable:UIImagePickerControllerSourceTypeCamera]))
-      .andReturn(true);
+      .andReturn(YES);
 
   // UIImagePickerControllerCameraDeviceRear is supported
   OCMStub(ClassMethod(
               [_mockUIImagePicker isCameraDeviceAvailable:UIImagePickerControllerCameraDeviceRear]))
-      .andReturn(true);
+      .andReturn(YES);
 
   // AVAuthorizationStatusAuthorized is supported
   OCMStub([_mockAVCaptureDevice authorizationStatusForMediaType:AVMediaTypeVideo]).andReturn(3);
@@ -124,12 +124,12 @@ - (void)testPluginPickVideoDeviceFront {
   // UIImagePickerControllerSourceTypeCamera is supported
   OCMStub(ClassMethod(
               [_mockUIImagePicker isSourceTypeAvailable:UIImagePickerControllerSourceTypeCamera]))
-      .andReturn(true);
+      .andReturn(YES);
 
   // UIImagePickerControllerCameraDeviceFront is supported
   OCMStub(ClassMethod([_mockUIImagePicker
               isCameraDeviceAvailable:UIImagePickerControllerCameraDeviceFront]))
-      .andReturn(true);
+      .andReturn(YES);
 
   // AVAuthorizationStatusAuthorized is supported
   OCMStub([_mockAVCaptureDevice authorizationStatusForMediaType:AVMediaTypeVideo]).andReturn(3);

From 4927206004672b8b6bd2f6a119a38e5ec953e63c Mon Sep 17 00:00:00 2001
From: yusufdag <yusuf@baseflow.com>
Date: Mon, 28 Jun 2021 07:29:02 +0200
Subject: [PATCH 32/39] Add blank after pragma mark

---
 .../example/ios/RunnerTests/ImagePickerPluginTests.m            | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/image_picker/image_picker/example/ios/RunnerTests/ImagePickerPluginTests.m b/packages/image_picker/image_picker/example/ios/RunnerTests/ImagePickerPluginTests.m
index 8dcbd26eaa62..b3f58a384af8 100644
--- a/packages/image_picker/image_picker/example/ios/RunnerTests/ImagePickerPluginTests.m
+++ b/packages/image_picker/image_picker/example/ios/RunnerTests/ImagePickerPluginTests.m
@@ -148,6 +148,7 @@ - (void)testPluginPickVideoDeviceFront {
 }
 
 #pragma mark - Test camera devices, no op on simulators
+
 - (void)testPluginPickImageDeviceCancelClickMultipleTimes {
   if ([UIImagePickerController isSourceTypeAvailable:UIImagePickerControllerSourceTypeCamera]) {
     return;
@@ -167,6 +168,7 @@ - (void)testPluginPickImageDeviceCancelClickMultipleTimes {
 }
 
 #pragma mark - Test video duration
+
 - (void)testPickingVideoWithDuration {
   FLTImagePickerPlugin *plugin = [FLTImagePickerPlugin new];
   FlutterMethodCall *call = [FlutterMethodCall

From 84b3e6529719c2095b2e7abe9ea4b823b88c173f Mon Sep 17 00:00:00 2001
From: yusufdag <yusuf@baseflow.com>
Date: Mon, 28 Jun 2021 07:36:09 +0200
Subject: [PATCH 33/39] Refactor to return AVAuthorizationStatus constant

---
 .../example/ios/RunnerTests/ImagePickerPluginTests.m | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/packages/image_picker/image_picker/example/ios/RunnerTests/ImagePickerPluginTests.m b/packages/image_picker/image_picker/example/ios/RunnerTests/ImagePickerPluginTests.m
index b3f58a384af8..b59c7f1f964b 100644
--- a/packages/image_picker/image_picker/example/ios/RunnerTests/ImagePickerPluginTests.m
+++ b/packages/image_picker/image_picker/example/ios/RunnerTests/ImagePickerPluginTests.m
@@ -51,7 +51,8 @@ - (void)testPluginPickImageDeviceBack {
       .andReturn(YES);
 
   // AVAuthorizationStatusAuthorized is supported
-  OCMStub([_mockAVCaptureDevice authorizationStatusForMediaType:AVMediaTypeVideo]).andReturn(3);
+  OCMStub([_mockAVCaptureDevice authorizationStatusForMediaType:AVMediaTypeVideo])
+      .andReturn(AVAuthorizationStatusAuthorized);
 
   // Run test
   FLTImagePickerPlugin *plugin = [FLTImagePickerPlugin new];
@@ -78,7 +79,8 @@ - (void)testPluginPickImageDeviceFront {
       .andReturn(YES);
 
   // AVAuthorizationStatusAuthorized is supported
-  OCMStub([_mockAVCaptureDevice authorizationStatusForMediaType:AVMediaTypeVideo]).andReturn(3);
+  OCMStub([_mockAVCaptureDevice authorizationStatusForMediaType:AVMediaTypeVideo])
+      .andReturn(AVAuthorizationStatusAuthorized);
 
   // Run test
   FLTImagePickerPlugin *plugin = [FLTImagePickerPlugin new];
@@ -105,7 +107,8 @@ - (void)testPluginPickVideoDeviceBack {
       .andReturn(YES);
 
   // AVAuthorizationStatusAuthorized is supported
-  OCMStub([_mockAVCaptureDevice authorizationStatusForMediaType:AVMediaTypeVideo]).andReturn(3);
+  OCMStub([_mockAVCaptureDevice authorizationStatusForMediaType:AVMediaTypeVideo])
+      .andReturn(AVAuthorizationStatusAuthorized);
 
   // Run test
   FLTImagePickerPlugin *plugin = [FLTImagePickerPlugin new];
@@ -132,7 +135,8 @@ - (void)testPluginPickVideoDeviceFront {
       .andReturn(YES);
 
   // AVAuthorizationStatusAuthorized is supported
-  OCMStub([_mockAVCaptureDevice authorizationStatusForMediaType:AVMediaTypeVideo]).andReturn(3);
+  OCMStub([_mockAVCaptureDevice authorizationStatusForMediaType:AVMediaTypeVideo])
+      .andReturn(AVAuthorizationStatusAuthorized);
 
   // Run test
   FLTImagePickerPlugin *plugin = [FLTImagePickerPlugin new];

From 6294377b0ab84dcaf9aff1a7598c833b7645cb55 Mon Sep 17 00:00:00 2001
From: yusufdag <yusuf@baseflow.com>
Date: Mon, 28 Jun 2021 07:42:09 +0200
Subject: [PATCH 34/39] Fix the comment

---
 .../image_picker/ios/Classes/FLTImagePickerPlugin.m           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/image_picker/image_picker/ios/Classes/FLTImagePickerPlugin.m b/packages/image_picker/image_picker/ios/Classes/FLTImagePickerPlugin.m
index 193277bf234b..374d284106ee 100644
--- a/packages/image_picker/image_picker/ios/Classes/FLTImagePickerPlugin.m
+++ b/packages/image_picker/image_picker/ios/Classes/FLTImagePickerPlugin.m
@@ -72,9 +72,9 @@ - (UIViewController *)viewControllerWithWindow:(UIWindow *)window {
 /**
  * Applies UIImagePickerControllerCameraDevice on the UIImagePickerController.
  *
- * If the cameraDevice value that is fetched from @c arguments is 1 then returns
+ * If the cameraDevice value that is fetched from arguments is 1 then returns
  * UIImagePickerControllerCameraDeviceFront. If the cameraDevice value that is fetched
- * from @c arguments is 0 then returns UIImagePickerControllerCameraDeviceRear.
+ * from arguments is 0 then returns UIImagePickerControllerCameraDeviceRear.
  *
  * @param @arguments that should be used to get cameraDevice value.
  */

From 28009194433cf121e525751bea9d9945bcad2ad6 Mon Sep 17 00:00:00 2001
From: yusufdag <yusuf@baseflow.com>
Date: Wed, 30 Jun 2021 10:24:42 +0200
Subject: [PATCH 35/39] Add a comment

---
 .../example/ios/RunnerTests/ImagePickerPluginTests.m             | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/image_picker/image_picker/example/ios/RunnerTests/ImagePickerPluginTests.m b/packages/image_picker/image_picker/example/ios/RunnerTests/ImagePickerPluginTests.m
index b59c7f1f964b..cc901f084071 100644
--- a/packages/image_picker/image_picker/example/ios/RunnerTests/ImagePickerPluginTests.m
+++ b/packages/image_picker/image_picker/example/ios/RunnerTests/ImagePickerPluginTests.m
@@ -167,6 +167,7 @@ - (void)testPluginPickImageDeviceCancelClickMultipleTimes {
   plugin.result = ^(id result) {
 
   };
+  // To ensure the flow does not crash by multiple cancel call
   [plugin imagePickerControllerDidCancel:[plugin getImagePickerController]];
   [plugin imagePickerControllerDidCancel:[plugin getImagePickerController]];
 }

From 8108389be7e9e7dd1e7d8e28c462480a94431c76 Mon Sep 17 00:00:00 2001
From: yusufdag <yusuf@baseflow.com>
Date: Wed, 30 Jun 2021 10:26:40 +0200
Subject: [PATCH 36/39] Update the version number

---
 packages/image_picker/image_picker/pubspec.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/image_picker/image_picker/pubspec.yaml b/packages/image_picker/image_picker/pubspec.yaml
index 620d118142fb..bcda757b4bbf 100755
--- a/packages/image_picker/image_picker/pubspec.yaml
+++ b/packages/image_picker/image_picker/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for selecting images from the Android and iOS image
   library, and taking new pictures with the camera.
 repository: https://github.com/flutter/plugins/tree/master/packages/image_picker/image_picker
 issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+image_picker%22
-version: 0.8.1+2
+version: 0.8.1+3
 
 environment:
   sdk: ">=2.12.0 <3.0.0"

From 5d7181bef837bc064a7cc063aa5a63e5f33d8a38 Mon Sep 17 00:00:00 2001
From: yusufdag <yusuf@baseflow.com>
Date: Wed, 30 Jun 2021 21:23:19 +0200
Subject: [PATCH 37/39] Fix comments

---
 .../ios/Classes/FLTImagePickerPlugin.m           | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/packages/image_picker/image_picker/ios/Classes/FLTImagePickerPlugin.m b/packages/image_picker/image_picker/ios/Classes/FLTImagePickerPlugin.m
index 374d284106ee..ca01ab2eb758 100644
--- a/packages/image_picker/image_picker/ios/Classes/FLTImagePickerPlugin.m
+++ b/packages/image_picker/image_picker/ios/Classes/FLTImagePickerPlugin.m
@@ -76,7 +76,7 @@ - (UIViewController *)viewControllerWithWindow:(UIWindow *)window {
  * UIImagePickerControllerCameraDeviceFront. If the cameraDevice value that is fetched
  * from arguments is 0 then returns UIImagePickerControllerCameraDeviceRear.
  *
- * @param @arguments that should be used to get cameraDevice value.
+ * @param arguments that should be used to get cameraDevice value.
  */
 - (UIImagePickerControllerCameraDevice)getCameraDeviceFromArguments:(NSDictionary *)arguments {
   NSInteger cameraDevice = [[arguments objectForKey:@"cameraDevice"] intValue];
@@ -417,8 +417,8 @@ - (void)picker:(PHPickerViewController *)picker
  * The difference with initWithCapacity is that initWithCapacity still gives an empty array making
  * it impossible to add objects on an index larger than the size.
  *
- * @param @size The length of the required array
- * @return @NSMutableArray An array of a specified size
+ * @param size The length of the required array
+ * @return NSMutableArray An array of a specified size
  */
 - (NSMutableArray *)createNSMutableArrayWithSize:(NSUInteger)size {
   NSMutableArray *mutableArray = [[NSMutableArray alloc] initWithCapacity:size];
@@ -539,14 +539,14 @@ - (void)saveImageWithPickerInfo:(NSDictionary *)info
  * Applies NSMutableArray on the FLutterResult.
  *
  * NSString must be returned by FlutterResult if the single image
- * mode is active. It is checked by @c maxImagesAllowed and
- * returns the first object of the @c pathlist.
+ * mode is active. It is checked by maxImagesAllowed and
+ * returns the first object of the pathlist.
  *
  * NSMutableArray must be returned by FlutterResult if the multi-image
- * mode is active. After the @c pathlist count is checked then it returns
- * the @c pathlist.
+ * mode is active. After the pathlist count is checked then it returns
+ * the pathlist.
  *
- * @param @pathList that should be applied to FlutterResult.
+ * @param pathList that should be applied to FlutterResult.
  */
 - (void)handleSavedPathList:(NSArray *)pathList {
   if (!self.result) {

From 8634c680c966143c5f97daec2a6768552bc57512 Mon Sep 17 00:00:00 2001
From: yusufdag <yusuf@baseflow.com>
Date: Wed, 30 Jun 2021 21:27:49 +0200
Subject: [PATCH 38/39] Update version number

---
 packages/image_picker/image_picker/CHANGELOG.md | 2 --
 packages/image_picker/image_picker/pubspec.yaml | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/packages/image_picker/image_picker/CHANGELOG.md b/packages/image_picker/image_picker/CHANGELOG.md
index b293582dd490..33178dee8999 100644
--- a/packages/image_picker/image_picker/CHANGELOG.md
+++ b/packages/image_picker/image_picker/CHANGELOG.md
@@ -7,8 +7,6 @@
 
 * Fix image picker causing a crash when the cache directory is deleted.
 
-## 0.8.1+2
-
 ## 0.8.1+2
 * Update the example app to support the multi-image feature.
 
diff --git a/packages/image_picker/image_picker/pubspec.yaml b/packages/image_picker/image_picker/pubspec.yaml
index bcda757b4bbf..c9866dbcda02 100755
--- a/packages/image_picker/image_picker/pubspec.yaml
+++ b/packages/image_picker/image_picker/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for selecting images from the Android and iOS image
   library, and taking new pictures with the camera.
 repository: https://github.com/flutter/plugins/tree/master/packages/image_picker/image_picker
 issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+image_picker%22
-version: 0.8.1+3
+version: 0.8.1+4
 
 environment:
   sdk: ">=2.12.0 <3.0.0"

From 307757cede37bd98a5f5668ca60b81e3db5b0786 Mon Sep 17 00:00:00 2001
From: yusufdag <yusuf@baseflow.com>
Date: Fri, 9 Jul 2021 13:36:10 +0200
Subject: [PATCH 39/39] Update the comment

---
 .../image_picker/ios/Classes/FLTImagePickerPlugin.m             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/image_picker/image_picker/ios/Classes/FLTImagePickerPlugin.m b/packages/image_picker/image_picker/ios/Classes/FLTImagePickerPlugin.m
index ca01ab2eb758..4084ae65b5e0 100644
--- a/packages/image_picker/image_picker/ios/Classes/FLTImagePickerPlugin.m
+++ b/packages/image_picker/image_picker/ios/Classes/FLTImagePickerPlugin.m
@@ -70,7 +70,7 @@ - (UIViewController *)viewControllerWithWindow:(UIWindow *)window {
 }
 
 /**
- * Applies UIImagePickerControllerCameraDevice on the UIImagePickerController.
+ * Returns the UIImagePickerControllerCameraDevice to use given [arguments].
  *
  * If the cameraDevice value that is fetched from arguments is 1 then returns
  * UIImagePickerControllerCameraDeviceFront. If the cameraDevice value that is fetched