Merge branch 'main' into main

Author: linchen00

.github/workflows/sync_release_pr.yml

@@ -13,7 +13,7 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
 
-     - name: Create Pull Request
+      - name: Create Pull Request
         uses: peter-evans/create-pull-request@4320041ed380b20e97d388d56a7fb4f9b8c20e79
         with:
           token: ${{ secrets.GITHUB_TOKEN }}

packages/camera/camera_avfoundation/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.9.22+9
+
+* Migrates `FLTSavePhotoDelegate`, `FLTWritableData`, and `FLTImageStreamHandler` classes to Swift.
+* Migrates `CameraProperties` and `QueueUtils` helpers to Swift.
+
 ## 0.9.22+8
 
 * Migrates `FLTPermissionServicing` and `FLTCameraPermissionManager` classes to Swift.

packages/camera/camera_avfoundation/example/ios/RunnerTests/CameraPermissionTests.swift

@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 import AVFoundation
+import Flutter
 import XCTest
 
 @testable import camera_avfoundation

packages/camera/camera_avfoundation/example/ios/RunnerTests/CameraPropertiesTests.swift

@@ -19,68 +19,60 @@ final class CameraPropertiesTests: XCTestCase {
   func testGetAVCaptureFlashModeForPigeonFlashMode() {
     XCTAssertEqual(
       AVCaptureDevice.FlashMode.off,
-      FCPGetAVCaptureFlashModeForPigeonFlashMode(FCPPlatformFlashMode.off))
+      getAVCaptureFlashMode(for: .off))
     XCTAssertEqual(
       AVCaptureDevice.FlashMode.auto,
-      FCPGetAVCaptureFlashModeForPigeonFlashMode(FCPPlatformFlashMode.auto))
+      getAVCaptureFlashMode(for: .auto))
     XCTAssertEqual(
       AVCaptureDevice.FlashMode.on,
-      FCPGetAVCaptureFlashModeForPigeonFlashMode(FCPPlatformFlashMode.always))
-
-    // TODO(FirentisTFW): Migrate implementation to throw Swift error in this case.
-    let exception = ExceptionCatcher.catchException {
-      _ = FCPGetAVCaptureFlashModeForPigeonFlashMode(.torch)
-    }
-    XCTAssertNotNil(exception)
+      getAVCaptureFlashMode(for: .always))
   }
 
   // MARK: - Video Format Tests
 
   func testGetPixelFormatForPigeonFormat() {
     XCTAssertEqual(
       kCVPixelFormatType_32BGRA,
-      FCPGetPixelFormatForPigeonFormat(FCPPlatformImageFormatGroup.bgra8888))
+      getPixelFormat(for: .bgra8888))
     XCTAssertEqual(
       kCVPixelFormatType_420YpCbCr8BiPlanarVideoRange,
-      FCPGetPixelFormatForPigeonFormat(FCPPlatformImageFormatGroup.yuv420))
+      getPixelFormat(for: .yuv420))
   }
 
   // MARK: - Device Orientation Tests
 
   func testGetUIDeviceOrientationForPigeonDeviceOrientation() {
     XCTAssertEqual(
       UIDeviceOrientation.portraitUpsideDown,
-      FCPGetUIDeviceOrientationForPigeonDeviceOrientation(FCPPlatformDeviceOrientation.portraitDown)
+      getUIDeviceOrientation(for: .portraitDown)
     )
     XCTAssertEqual(
       UIDeviceOrientation.landscapeLeft,
-      FCPGetUIDeviceOrientationForPigeonDeviceOrientation(
-        FCPPlatformDeviceOrientation.landscapeLeft))
+      getUIDeviceOrientation(for: .landscapeLeft))
     XCTAssertEqual(
       UIDeviceOrientation.landscapeRight,
-      FCPGetUIDeviceOrientationForPigeonDeviceOrientation(
-        FCPPlatformDeviceOrientation.landscapeRight))
+      getUIDeviceOrientation(for: .landscapeRight))
     XCTAssertEqual(
       UIDeviceOrientation.portrait,
-      FCPGetUIDeviceOrientationForPigeonDeviceOrientation(FCPPlatformDeviceOrientation.portraitUp))
+      getUIDeviceOrientation(for: .portraitUp))
   }
 
   func testGetPigeonDeviceOrientationForUIDeviceOrientation() {
     XCTAssertEqual(
       FCPPlatformDeviceOrientation.portraitDown,
-      FCPGetPigeonDeviceOrientationForOrientation(UIDeviceOrientation.portraitUpsideDown))
+      getPigeonDeviceOrientation(for: .portraitUpsideDown))
     XCTAssertEqual(
       FCPPlatformDeviceOrientation.landscapeLeft,
-      FCPGetPigeonDeviceOrientationForOrientation(UIDeviceOrientation.landscapeLeft))
+      getPigeonDeviceOrientation(for: .landscapeLeft))
     XCTAssertEqual(
       FCPPlatformDeviceOrientation.landscapeRight,
-      FCPGetPigeonDeviceOrientationForOrientation(UIDeviceOrientation.landscapeRight))
+      getPigeonDeviceOrientation(for: .landscapeRight))
     XCTAssertEqual(
       FCPPlatformDeviceOrientation.portraitUp,
-      FCPGetPigeonDeviceOrientationForOrientation(UIDeviceOrientation.portrait))
+      getPigeonDeviceOrientation(for: .portrait))
     // Test default case.
     XCTAssertEqual(
       FCPPlatformDeviceOrientation.portraitUp,
-      FCPGetPigeonDeviceOrientationForOrientation(UIDeviceOrientation.unknown))
+      getPigeonDeviceOrientation(for: .unknown))
   }
 }

packages/camera/camera_avfoundation/example/ios/RunnerTests/CameraTestUtils.swift

@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+import AVFoundation
 import XCTest
 
 @testable import camera_avfoundation

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

@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+import AVFoundation
+
 @testable import camera_avfoundation
 
 // Import Objective-C part of the implementation when SwiftPM is used.

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

@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+import AVFoundation
+
 @testable import camera_avfoundation
 
 // Import Objective-C part of the implementation when SwiftPM is used.

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

@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+import AVFoundation
+
 @testable import camera_avfoundation
 
 // Import Objective-C part of the implementation when SwiftPM is used.

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

@@ -2,6 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+import AVFoundation
+import Flutter
+
 @testable import camera_avfoundation
 
 // Import Objective-C part of the implementation when SwiftPM is used.

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

@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+import AVFoundation
+
 @testable import camera_avfoundation
 
 // Import Objective-C part of the implementation when SwiftPM is used.