Skip to content
This repository was archived by the owner on Feb 22, 2023. It is now read-only.

[Camera] Return all possible cameras on iOS #5636

Merged
fluttergithubbot merged 14 commits into from
May 23, 2022
Merged

[Camera] Return all possible cameras on iOS #5636

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
53af077
return all the possible cameras
martingeorgiu May 5, 2022
80abba9
version update
martingeorgiu May 5, 2022
efb576c
fix formatting
martingeorgiu May 5, 2022
6ba4bd8
add available cameras test
martingeorgiu May 6, 2022
1a6417e
fix format
martingeorgiu May 6, 2022
1ca4657
remove unnecessary NSArray conversion
martingeorgiu May 9, 2022
630f489
remove AVCaptureDeviceMock
martingeorgiu May 9, 2022
6a270ad
fix typo
martingeorgiu May 10, 2022
f851e6f
fix changelog formatting
martingeorgiu May 10, 2022
da3bad7
Merge branch 'main' into feat/returnMultipleCamerasIos
martingeorgiu May 13, 2022
a315103
Merge branch 'main' into feat/returnMultipleCamerasIos
martingeorgiu May 16, 2022
d2a096e
add initial camera device enums right to mutable array
martingeorgiu May 16, 2022
df37438
fix formatting
martingeorgiu May 16, 2022
ac861fd
Merge branch 'main' into feat/returnMultipleCamerasIos
martingeorgiu May 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix formatting
  • Loading branch information
@martingeorgiu
martingeorgiu committed May 16, 2022
commit df37438a8cee2a3284173ca9d0cb116d318a480e
8 changes: 6 additions & 2 deletions packages/camera/camera/example/ios/RunnerTests/AvailableCamerasTest.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,9 @@ - (void)testAvailableCamerasShouldReturnAllCamerasOnMultiCameraIPhone {
OCMStub([telephotoCamera uniqueID]).andReturn(@"3");
OCMStub([telephotoCamera position]).andReturn(AVCaptureDevicePositionBack);

NSMutableArray *requiredTypes = [@[AVCaptureDeviceTypeBuiltInWideAngleCamera, AVCaptureDeviceTypeBuiltInTelephotoCamera] mutableCopy];
NSMutableArray *requiredTypes =
[@[ AVCaptureDeviceTypeBuiltInWideAngleCamera, AVCaptureDeviceTypeBuiltInTelephotoCamera ]
mutableCopy];
if (@available(iOS 13.0, *)) {
[requiredTypes addObject:AVCaptureDeviceTypeBuiltInUltraWideCamera];
}
Expand Down Expand Up @@ -85,7 +87,9 @@ - (void)testAvailableCamerasShouldReturnOneCameraOnSingleCameraIPhone {
OCMStub([frontFacingCamera uniqueID]).andReturn(@"1");
OCMStub([frontFacingCamera position]).andReturn(AVCaptureDevicePositionFront);

NSMutableArray *requiredTypes = [@[AVCaptureDeviceTypeBuiltInWideAngleCamera, AVCaptureDeviceTypeBuiltInTelephotoCamera] mutableCopy];
NSMutableArray *requiredTypes =
[@[ AVCaptureDeviceTypeBuiltInWideAngleCamera, AVCaptureDeviceTypeBuiltInTelephotoCamera ]
mutableCopy];
if (@available(iOS 13.0, *)) {
[requiredTypes addObject:AVCaptureDeviceTypeBuiltInUltraWideCamera];
}
Expand Down
4 changes: 3 additions & 1 deletion packages/camera/camera/ios/Classes/CameraPlugin.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,9 @@ - (void)handleMethodCallAsync:(FlutterMethodCall *)call
result:(FLTThreadSafeFlutterResult *)result {
if ([@"availableCameras" isEqualToString:call.method]) {
if (@available(iOS 10.0, *)) {
NSMutableArray *discoveryDevices = [@[ AVCaptureDeviceTypeBuiltInWideAngleCamera, AVCaptureDeviceTypeBuiltInTelephotoCamera ] mutableCopy];
NSMutableArray *discoveryDevices =
[@[ AVCaptureDeviceTypeBuiltInWideAngleCamera, AVCaptureDeviceTypeBuiltInTelephotoCamera ]
mutableCopy];
if (@available(iOS 13.0, *)) {
[discoveryDevices addObject:AVCaptureDeviceTypeBuiltInUltraWideCamera];
}
Expand Down