Merge remote-tracking branch 'upstream/main' into handle_deprecated_radio_examples

Author: alexskobozev

.ci/flutter_master.version

@@ -1 +1 @@
-7811e8982355a88cb964671bd7d711b3a04540f0
+65aca3661b8fa943f801c4b2811af9d1e8e33dbe

packages/camera/camera/test/camera_preview_test.dart

@@ -18,6 +18,7 @@ class FakeController extends ValueNotifier<CameraValue>
     name: '',
     lensDirection: CameraLensDirection.back,
     sensorOrientation: 0,
+    lensType: CameraLensType.ultraWide,
   );
 
   @override

packages/camera/camera_avfoundation/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.9.22
+
+* Adds lensType in the PlatformCameraDescription
+
 ## 0.9.21+4
 
 * Migrates `updateOrientation` and `setCaptureSessionPreset` methods to Swift.

packages/camera/camera_avfoundation/example/ios/RunnerTests/Mocks/MockCaptureDevice.swift

@@ -32,6 +32,7 @@ class MockCaptureDevice: NSObject, FLTCaptureDevice {
 
   var uniqueID = ""
   var position = AVCaptureDevice.Position.unspecified
+  var deviceType = AVCaptureDevice.DeviceType.builtInWideAngleCamera
 
   var activeFormat: FLTCaptureDeviceFormat {
     get {

packages/camera/camera_avfoundation/example/pubspec.yaml

@@ -14,7 +14,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: ../
-  camera_platform_interface: ^2.7.0
+  camera_platform_interface: ^2.10.0
   flutter:
     sdk: flutter
   path_provider: ^2.0.0

packages/camera/camera_avfoundation/ios/camera_avfoundation/Sources/camera_avfoundation/CameraPlugin.swift

@@ -145,22 +145,12 @@ extension CameraPlugin: FCPCameraApi {
       var reply: [FCPPlatformCameraDescription] = []
 
       for device in devices {
-        var lensFacing: FCPPlatformCameraLensDirection
-
-        switch device.position {
-        case .back:
-          lensFacing = .back
-        case .front:
-          lensFacing = .front
-        case .unspecified:
-          lensFacing = .external
-        @unknown default:
-          lensFacing = .external
-        }
-
+        let lensFacing = strongSelf.platformLensDirection(for: device)
+        let lensType = strongSelf.platformLensType(for: device)
         let cameraDescription = FCPPlatformCameraDescription.make(
           withName: device.uniqueID,
-          lensDirection: lensFacing
+          lensDirection: lensFacing,
+          lensType: lensType
         )
         reply.append(cameraDescription)
       }
@@ -169,6 +159,35 @@ extension CameraPlugin: FCPCameraApi {
     }
   }
 
+  private func platformLensDirection(for device: FLTCaptureDevice) -> FCPPlatformCameraLensDirection
+  {
+    switch device.position {
+    case .back:
+      return .back
+    case .front:
+      return .front
+    case .unspecified:
+      return .external
+    @unknown default:
+      return .external
+    }
+  }
+
+  private func platformLensType(for device: FLTCaptureDevice) -> FCPPlatformCameraLensType {
+    switch device.deviceType {
+    case .builtInWideAngleCamera:
+      return .wide
+    case .builtInTelephotoCamera:
+      return .telephoto
+    case .builtInUltraWideCamera:
+      return .ultraWide
+    case .builtInDualWideCamera:
+      return .wide
+    default:
+      return .unknown
+    }
+  }
+
   public func createCamera(
     withName cameraName: String,
     settings: FCPPlatformMediaSettings,

packages/camera/camera_avfoundation/ios/camera_avfoundation/Sources/camera_avfoundation_objc/FLTCaptureDevice.m

@@ -30,6 +30,10 @@ - (AVCaptureDevicePosition)position {
   return self.device.position;
 }
 
+- (AVCaptureDeviceType)deviceType {
+  return self.device.deviceType;
+}
+
 // Format/Configuration
 - (NSObject<FLTCaptureDeviceFormat> *)activeFormat {
   return [[FLTDefaultCaptureDeviceFormat alloc] initWithFormat:self.device.activeFormat];

packages/camera/camera_avfoundation/ios/camera_avfoundation/Sources/camera_avfoundation_objc/include/camera_avfoundation/FLTCaptureDevice.h

@@ -24,6 +24,9 @@ NS_ASSUME_NONNULL_BEGIN
 // Position/Orientation
 @property(nonatomic, readonly) AVCaptureDevicePosition position;
 
+// Lens type
+@property(nonatomic, readonly) AVCaptureDeviceType deviceType;
+
 // Format/Configuration
 @property(nonatomic, retain) NSObject<FLTCaptureDeviceFormat> *activeFormat;
 @property(nonatomic, readonly) NSArray<NSObject<FLTCaptureDeviceFormat> *> *formats;

packages/camera/camera_avfoundation/ios/camera_avfoundation/Sources/camera_avfoundation_objc/include/camera_avfoundation/messages.g.h

@@ -1,7 +1,7 @@
 // Copyright 2013 The Flutter Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
-// Autogenerated from Pigeon (v22.4.2), do not edit directly.
+// Autogenerated from Pigeon (v22.7.4), do not edit directly.
 // See also: https://pub.dev/packages/pigeon
 
 #import <Foundation/Foundation.h>
@@ -28,6 +28,23 @@ typedef NS_ENUM(NSUInteger, FCPPlatformCameraLensDirection) {
 - (instancetype)initWithValue:(FCPPlatformCameraLensDirection)value;
 @end
 
+typedef NS_ENUM(NSUInteger, FCPPlatformCameraLensType) {
+  /// A built-in wide-angle camera device type.
+  FCPPlatformCameraLensTypeWide = 0,
+  /// A built-in camera device type with a longer focal length than a wide-angle camera.
+  FCPPlatformCameraLensTypeTelephoto = 1,
+  /// A built-in camera device type with a shorter focal length than a wide-angle camera.
+  FCPPlatformCameraLensTypeUltraWide = 2,
+  /// Unknown camera device type.
+  FCPPlatformCameraLensTypeUnknown = 3,
+};
+
+/// Wrapper for FCPPlatformCameraLensType to allow for nullability.
+@interface FCPPlatformCameraLensTypeBox : NSObject
+@property(nonatomic, assign) FCPPlatformCameraLensType value;
+- (instancetype)initWithValue:(FCPPlatformCameraLensType)value;
+@end
+
 typedef NS_ENUM(NSUInteger, FCPPlatformDeviceOrientation) {
   FCPPlatformDeviceOrientationPortraitUp = 0,
   FCPPlatformDeviceOrientationLandscapeLeft = 1,
@@ -124,11 +141,14 @@ typedef NS_ENUM(NSUInteger, FCPPlatformResolutionPreset) {
 /// `init` unavailable to enforce nonnull fields, see the `make` class method.
 - (instancetype)init NS_UNAVAILABLE;
 + (instancetype)makeWithName:(NSString *)name
-               lensDirection:(FCPPlatformCameraLensDirection)lensDirection;
+               lensDirection:(FCPPlatformCameraLensDirection)lensDirection
+                    lensType:(FCPPlatformCameraLensType)lensType;
 /// The name of the camera device.
 @property(nonatomic, copy) NSString *name;
 /// The direction the camera is facing.
 @property(nonatomic, assign) FCPPlatformCameraLensDirection lensDirection;
+/// The type of the camera lens.
+@property(nonatomic, assign) FCPPlatformCameraLensType lensType;
 @end
 
 @interface FCPPlatformCameraState : NSObject

packages/camera/camera_avfoundation/ios/camera_avfoundation/Sources/camera_avfoundation_objc/messages.g.m

@@ -1,7 +1,7 @@
 // Copyright 2013 The Flutter Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
-// Autogenerated from Pigeon (v22.4.2), do not edit directly.
+// Autogenerated from Pigeon (v22.7.4), do not edit directly.
 // See also: https://pub.dev/packages/pigeon
 
 #import "./include/camera_avfoundation/messages.g.h"
@@ -49,6 +49,16 @@ - (instancetype)initWithValue:(FCPPlatformCameraLensDirection)value {
 }
 @end
 
+@implementation FCPPlatformCameraLensTypeBox
+- (instancetype)initWithValue:(FCPPlatformCameraLensType)value {
+  self = [super init];
+  if (self) {
+    _value = value;
+  }
+  return self;
+}
+@end
+
 @implementation FCPPlatformDeviceOrientationBox
 - (instancetype)initWithValue:(FCPPlatformDeviceOrientation)value {
   self = [super init];
@@ -152,10 +162,12 @@ + (nullable FCPPlatformSize *)nullableFromList:(NSArray<id> *)list;
 
 @implementation FCPPlatformCameraDescription
 + (instancetype)makeWithName:(NSString *)name
-               lensDirection:(FCPPlatformCameraLensDirection)lensDirection {
+               lensDirection:(FCPPlatformCameraLensDirection)lensDirection
+                    lensType:(FCPPlatformCameraLensType)lensType {
   FCPPlatformCameraDescription *pigeonResult = [[FCPPlatformCameraDescription alloc] init];
   pigeonResult.name = name;
   pigeonResult.lensDirection = lensDirection;
+  pigeonResult.lensType = lensType;
   return pigeonResult;
 }
 + (FCPPlatformCameraDescription *)fromList:(NSArray<id> *)list {
@@ -164,6 +176,8 @@ + (FCPPlatformCameraDescription *)fromList:(NSArray<id> *)list {
   FCPPlatformCameraLensDirectionBox *boxedFCPPlatformCameraLensDirection =
       GetNullableObjectAtIndex(list, 1);
   pigeonResult.lensDirection = boxedFCPPlatformCameraLensDirection.value;
+  FCPPlatformCameraLensTypeBox *boxedFCPPlatformCameraLensType = GetNullableObjectAtIndex(list, 2);
+  pigeonResult.lensType = boxedFCPPlatformCameraLensType.value;
   return pigeonResult;
 }
 + (nullable FCPPlatformCameraDescription *)nullableFromList:(NSArray<id> *)list {
@@ -173,6 +187,7 @@ + (nullable FCPPlatformCameraDescription *)nullableFromList:(NSArray<id> *)list
   return @[
     self.name ?: [NSNull null],
     [[FCPPlatformCameraLensDirectionBox alloc] initWithValue:self.lensDirection],
+    [[FCPPlatformCameraLensTypeBox alloc] initWithValue:self.lensType],
   ];
 }
 @end
@@ -315,56 +330,62 @@ - (nullable id)readValueOfType:(UInt8)type {
                                        initWithValue:[enumAsNumber integerValue]];
     }
     case 130: {
+      NSNumber *enumAsNumber = [self readValue];
+      return enumAsNumber == nil
+                 ? nil
+                 : [[FCPPlatformCameraLensTypeBox alloc] initWithValue:[enumAsNumber integerValue]];
+    }
+    case 131: {
       NSNumber *enumAsNumber = [self readValue];
       return enumAsNumber == nil ? nil
                                  : [[FCPPlatformDeviceOrientationBox alloc]
                                        initWithValue:[enumAsNumber integerValue]];
     }
-    case 131: {
+    case 132: {
       NSNumber *enumAsNumber = [self readValue];
       return enumAsNumber == nil
                  ? nil
                  : [[FCPPlatformExposureModeBox alloc] initWithValue:[enumAsNumber integerValue]];
     }
-    case 132: {
+    case 133: {
       NSNumber *enumAsNumber = [self readValue];
       return enumAsNumber == nil
                  ? nil
                  : [[FCPPlatformFlashModeBox alloc] initWithValue:[enumAsNumber integerValue]];
     }
-    case 133: {
+    case 134: {
       NSNumber *enumAsNumber = [self readValue];
       return enumAsNumber == nil
                  ? nil
                  : [[FCPPlatformFocusModeBox alloc] initWithValue:[enumAsNumber integerValue]];
     }
-    case 134: {
+    case 135: {
       NSNumber *enumAsNumber = [self readValue];
       return enumAsNumber == nil ? nil
                                  : [[FCPPlatformImageFileFormatBox alloc]
                                        initWithValue:[enumAsNumber integerValue]];
     }
-    case 135: {
+    case 136: {
       NSNumber *enumAsNumber = [self readValue];
       return enumAsNumber == nil ? nil
                                  : [[FCPPlatformImageFormatGroupBox alloc]
                                        initWithValue:[enumAsNumber integerValue]];
     }
-    case 136: {
+    case 137: {
       NSNumber *enumAsNumber = [self readValue];
       return enumAsNumber == nil ? nil
                                  : [[FCPPlatformResolutionPresetBox alloc]
                                        initWithValue:[enumAsNumber integerValue]];
     }
-    case 137:
-      return [FCPPlatformCameraDescription fromList:[self readValue]];
     case 138:
-      return [FCPPlatformCameraState fromList:[self readValue]];
+      return [FCPPlatformCameraDescription fromList:[self readValue]];
     case 139:
-      return [FCPPlatformMediaSettings fromList:[self readValue]];
+      return [FCPPlatformCameraState fromList:[self readValue]];
     case 140:
-      return [FCPPlatformPoint fromList:[self readValue]];
+      return [FCPPlatformMediaSettings fromList:[self readValue]];
     case 141:
+      return [FCPPlatformPoint fromList:[self readValue]];
+    case 142:
       return [FCPPlatformSize fromList:[self readValue]];
     default:
       return [super readValueOfType:type];
@@ -380,48 +401,52 @@ - (void)writeValue:(id)value {
     FCPPlatformCameraLensDirectionBox *box = (FCPPlatformCameraLensDirectionBox *)value;
     [self writeByte:129];
     [self writeValue:(value == nil ? [NSNull null] : [NSNumber numberWithInteger:box.value])];
+  } else if ([value isKindOfClass:[FCPPlatformCameraLensTypeBox class]]) {
+    FCPPlatformCameraLensTypeBox *box = (FCPPlatformCameraLensTypeBox *)value;
+    [self writeByte:130];
+    [self writeValue:(value == nil ? [NSNull null] : [NSNumber numberWithInteger:box.value])];
   } else if ([value isKindOfClass:[FCPPlatformDeviceOrientationBox class]]) {
     FCPPlatformDeviceOrientationBox *box = (FCPPlatformDeviceOrientationBox *)value;
-    [self writeByte:130];
+    [self writeByte:131];
     [self writeValue:(value == nil ? [NSNull null] : [NSNumber numberWithInteger:box.value])];
   } else if ([value isKindOfClass:[FCPPlatformExposureModeBox class]]) {
     FCPPlatformExposureModeBox *box = (FCPPlatformExposureModeBox *)value;
-    [self writeByte:131];
+    [self writeByte:132];
     [self writeValue:(value == nil ? [NSNull null] : [NSNumber numberWithInteger:box.value])];
   } else if ([value isKindOfClass:[FCPPlatformFlashModeBox class]]) {
     FCPPlatformFlashModeBox *box = (FCPPlatformFlashModeBox *)value;
-    [self writeByte:132];
+    [self writeByte:133];
     [self writeValue:(value == nil ? [NSNull null] : [NSNumber numberWithInteger:box.value])];
   } else if ([value isKindOfClass:[FCPPlatformFocusModeBox class]]) {
     FCPPlatformFocusModeBox *box = (FCPPlatformFocusModeBox *)value;
-    [self writeByte:133];
+    [self writeByte:134];
     [self writeValue:(value == nil ? [NSNull null] : [NSNumber numberWithInteger:box.value])];
   } else if ([value isKindOfClass:[FCPPlatformImageFileFormatBox class]]) {
     FCPPlatformImageFileFormatBox *box = (FCPPlatformImageFileFormatBox *)value;
-    [self writeByte:134];
+    [self writeByte:135];
     [self writeValue:(value == nil ? [NSNull null] : [NSNumber numberWithInteger:box.value])];
   } else if ([value isKindOfClass:[FCPPlatformImageFormatGroupBox class]]) {
     FCPPlatformImageFormatGroupBox *box = (FCPPlatformImageFormatGroupBox *)value;
-    [self writeByte:135];
+    [self writeByte:136];
     [self writeValue:(value == nil ? [NSNull null] : [NSNumber numberWithInteger:box.value])];
   } else if ([value isKindOfClass:[FCPPlatformResolutionPresetBox class]]) {
     FCPPlatformResolutionPresetBox *box = (FCPPlatformResolutionPresetBox *)value;
-    [self writeByte:136];
+    [self writeByte:137];
     [self writeValue:(value == nil ? [NSNull null] : [NSNumber numberWithInteger:box.value])];
   } else if ([value isKindOfClass:[FCPPlatformCameraDescription class]]) {
-    [self writeByte:137];
+    [self writeByte:138];
     [self writeValue:[value toList]];
   } else if ([value isKindOfClass:[FCPPlatformCameraState class]]) {
-    [self writeByte:138];
+    [self writeByte:139];
     [self writeValue:[value toList]];
   } else if ([value isKindOfClass:[FCPPlatformMediaSettings class]]) {
-    [self writeByte:139];
+    [self writeByte:140];
     [self writeValue:[value toList]];
   } else if ([value isKindOfClass:[FCPPlatformPoint class]]) {
-    [self writeByte:140];
+    [self writeByte:141];
     [self writeValue:[value toList]];
   } else if ([value isKindOfClass:[FCPPlatformSize class]]) {
-    [self writeByte:141];
+    [self writeByte:142];
     [self writeValue:[value toList]];
   } else {
     [super writeValue:value];