Replace ivars with properties

RobertOdrowaz · RobertOdrowaz · commit c515c6ff66eb · 2025-03-14T09:59:59.000+01:00
diff --git a/packages/camera/camera_avfoundation/example/ios/Runner.xcodeproj/project.pbxproj b/packages/camera/camera_avfoundation/example/ios/Runner.xcodeproj/project.pbxproj
@@ -52,8 +52,8 @@
 		E11D6A8F2D81B81D0031E6C5 /* MockCaptureVideoDataOutput.swift in Sources */ = {isa = PBXBuildFile; fileRef = E11D6A8E2D81B81D0031E6C5 /* MockCaptureVideoDataOutput.swift */; };
 		E12C4FF62D68C69000515E70 /* CameraPluginDelegatingMethodTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = E12C4FF52D68C69000515E70 /* CameraPluginDelegatingMethodTests.swift */; };
 		E12C4FF82D68E85500515E70 /* MockFLTCameraPermissionManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = E12C4FF72D68E85500515E70 /* MockFLTCameraPermissionManager.swift */; };
-		E1A5F4E32D80259C0005BA64 /* FLTCamSetFlashModeTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = E1A5F4E22D80259C0005BA64 /* FLTCamSetFlashModeTests.swift */; };
 		E15139182D80980900FEE47B /* FLTCamSetDeviceOrientationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = E15139172D80980900FEE47B /* FLTCamSetDeviceOrientationTests.swift */; };
+		E1A5F4E32D80259C0005BA64 /* FLTCamSetFlashModeTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = E1A5F4E22D80259C0005BA64 /* FLTCamSetFlashModeTests.swift */; };
 		E1FFEAAD2D6C8DD700B14107 /* MockFLTCam.swift in Sources */ = {isa = PBXBuildFile; fileRef = E1FFEAAC2D6C8DD700B14107 /* MockFLTCam.swift */; };
 		E1FFEAAF2D6CDA8C00B14107 /* CameraPluginCreateCameraTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = E1FFEAAE2D6CDA8C00B14107 /* CameraPluginCreateCameraTests.swift */; };
 		E1FFEAB12D6CDE5B00B14107 /* CameraPluginInitializeCameraTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = E1FFEAB02D6CDE5B00B14107 /* CameraPluginInitializeCameraTests.swift */; };
@@ -152,8 +152,8 @@
 		E11D6A8E2D81B81D0031E6C5 /* MockCaptureVideoDataOutput.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MockCaptureVideoDataOutput.swift; sourceTree = "<group>"; };
 		E12C4FF52D68C69000515E70 /* CameraPluginDelegatingMethodTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CameraPluginDelegatingMethodTests.swift; sourceTree = "<group>"; };
 		E12C4FF72D68E85500515E70 /* MockFLTCameraPermissionManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MockFLTCameraPermissionManager.swift; sourceTree = "<group>"; };
-		E1A5F4E22D80259C0005BA64 /* FLTCamSetFlashModeTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FLTCamSetFlashModeTests.swift; sourceTree = "<group>"; };
 		E15139172D80980900FEE47B /* FLTCamSetDeviceOrientationTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FLTCamSetDeviceOrientationTests.swift; sourceTree = "<group>"; };
+		E1A5F4E22D80259C0005BA64 /* FLTCamSetFlashModeTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FLTCamSetFlashModeTests.swift; sourceTree = "<group>"; };
 		E1FFEAAC2D6C8DD700B14107 /* MockFLTCam.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MockFLTCam.swift; sourceTree = "<group>"; };
 		E1FFEAAE2D6CDA8C00B14107 /* CameraPluginCreateCameraTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CameraPluginCreateCameraTests.swift; sourceTree = "<group>"; };
 		E1FFEAB02D6CDE5B00B14107 /* CameraPluginInitializeCameraTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CameraPluginInitializeCameraTests.swift; sourceTree = "<group>"; };
diff --git a/packages/camera/camera_avfoundation/ios/camera_avfoundation/Sources/camera_avfoundation/FLTCaptureConnection.m b/packages/camera/camera_avfoundation/ios/camera_avfoundation/Sources/camera_avfoundation/FLTCaptureConnection.m
@@ -4,9 +4,11 @@
 
 #import "./include/camera_avfoundation/FLTCaptureConnection.h"
 
-@implementation FLTDefaultCaptureConnection {
-  AVCaptureConnection *_connection;
-}
+@interface FLTDefaultCaptureConnection ()
+@property(nonatomic, strong) AVCaptureConnection *connection;
+@end
+
+@implementation FLTDefaultCaptureConnection
 
 - (instancetype)initWithConnection:(AVCaptureConnection *)connection {
   self = [super init];
@@ -17,31 +19,31 @@ - (instancetype)initWithConnection:(AVCaptureConnection *)connection {
 }
 
 - (BOOL)isVideoMirroringSupported {
-  return _connection.isVideoMirroringSupported;
+  return self.connection.isVideoMirroringSupported;
 }
 
 - (BOOL)isVideoOrientationSupported {
-  return _connection.isVideoOrientationSupported;
+  return self.connection.isVideoOrientationSupported;
 }
 
 - (void)setVideoMirrored:(BOOL)videoMirrored {
-  _connection.videoMirrored = videoMirrored;
+  self.connection.videoMirrored = videoMirrored;
 }
 
 - (BOOL)isVideoMirrored {
-  return _connection.isVideoMirrored;
+  return self.connection.isVideoMirrored;
 }
 
 - (void)setVideoOrientation:(AVCaptureVideoOrientation)videoOrientation {
-  _connection.videoOrientation = videoOrientation;
+  self.connection.videoOrientation = videoOrientation;
 }
 
 - (AVCaptureVideoOrientation)videoOrientation {
-  return _connection.videoOrientation;
+  return self.connection.videoOrientation;
 }
 
 - (NSArray<AVCaptureInputPort *> *)inputPorts {
-  return _connection.inputPorts;
+  return self.connection.inputPorts;
 }
 
 @end
diff --git a/packages/camera/camera_avfoundation/ios/camera_avfoundation/Sources/camera_avfoundation/FLTCapturePhotoOutput.m b/packages/camera/camera_avfoundation/ios/camera_avfoundation/Sources/camera_avfoundation/FLTCapturePhotoOutput.m
@@ -4,9 +4,11 @@
 
 #import "./include/camera_avfoundation/FLTCapturePhotoOutput.h"
 
-@implementation FLTDefaultCapturePhotoOutput {
-  AVCapturePhotoOutput *_avOutput;
-}
+@interface FLTDefaultCapturePhotoOutput ()
+@property(nonatomic, strong) AVCapturePhotoOutput *avOutput;
+@end
+
+@implementation FLTDefaultCapturePhotoOutput
 
 - (instancetype)initWithPhotoOutput:(AVCapturePhotoOutput *)photoOutput {
   self = [super init];
@@ -16,35 +18,31 @@ - (instancetype)initWithPhotoOutput:(AVCapturePhotoOutput *)photoOutput {
   return self;
 }
 
-- (AVCapturePhotoOutput *)avOutput {
-  return _avOutput;
-}
-
 - (NSArray<AVVideoCodecType> *)availablePhotoCodecTypes {
-  return _avOutput.availablePhotoCodecTypes;
+  return self.avOutput.availablePhotoCodecTypes;
 }
 
 - (BOOL)highResolutionCaptureEnabled {
-  return _avOutput.isHighResolutionCaptureEnabled;
+  return self.avOutput.isHighResolutionCaptureEnabled;
 }
 
 - (void)setHighResolutionCaptureEnabled:(BOOL)enabled {
-  [_avOutput setHighResolutionCaptureEnabled:enabled];
+  [self.avOutput setHighResolutionCaptureEnabled:enabled];
 }
 
 - (void)capturePhotoWithSettings:(AVCapturePhotoSettings *)settings
                         delegate:(NSObject<AVCapturePhotoCaptureDelegate> *)delegate {
-  [_avOutput capturePhotoWithSettings:settings delegate:delegate];
+  [self.avOutput capturePhotoWithSettings:settings delegate:delegate];
 }
 
 - (nullable NSObject<FLTCaptureConnection> *)connectionWithMediaType:
     (nonnull AVMediaType)mediaType {
   return [[FLTDefaultCaptureConnection alloc]
-      initWithConnection:[_avOutput connectionWithMediaType:mediaType]];
+      initWithConnection:[self.avOutput connectionWithMediaType:mediaType]];
 }
 
 - (NSArray<NSNumber *> *)supportedFlashModes {
-  return _avOutput.supportedFlashModes;
+  return self.avOutput.supportedFlashModes;
 }
 
 @end
diff --git a/packages/camera/camera_avfoundation/ios/camera_avfoundation/Sources/camera_avfoundation/FLTCaptureVideoDataOutput.m b/packages/camera/camera_avfoundation/ios/camera_avfoundation/Sources/camera_avfoundation/FLTCaptureVideoDataOutput.m
@@ -4,9 +4,11 @@
 
 #import "./include/camera_avfoundation/FLTCaptureVideoDataOutput.h"
 
-@implementation FLTDefaultCaptureVideoDataOutput {
-  AVCaptureVideoDataOutput *_avOutput;
-}
+@interface FLTDefaultCaptureVideoDataOutput ()
+@property(nonatomic, strong) AVCaptureVideoDataOutput *avOutput;
+@end
+
+@implementation FLTDefaultCaptureVideoDataOutput
 
 - (instancetype)initWithCaptureVideoOutput:(AVCaptureVideoDataOutput *)videoOutput {
   self = [super init];
@@ -16,36 +18,32 @@ - (instancetype)initWithCaptureVideoOutput:(AVCaptureVideoDataOutput *)videoOutp
   return self;
 }
 
-- (AVCaptureVideoDataOutput *)avOutput {
-  return _avOutput;
-}
-
 - (BOOL)alwaysDiscardsLateVideoFrames {
-  return _avOutput.alwaysDiscardsLateVideoFrames;
+  return self.avOutput.alwaysDiscardsLateVideoFrames;
 }
 
 - (void)setAlwaysDiscardsLateVideoFrames:(BOOL)alwaysDiscardsLateVideoFrames {
-  _avOutput.alwaysDiscardsLateVideoFrames = alwaysDiscardsLateVideoFrames;
+  self.avOutput.alwaysDiscardsLateVideoFrames = alwaysDiscardsLateVideoFrames;
 }
 
 - (NSDictionary<NSString *, id> *)videoSettings {
-  return _avOutput.videoSettings;
+  return self.avOutput.videoSettings;
 }
 
 - (void)setVideoSettings:(NSDictionary<NSString *, id> *)videoSettings {
-  _avOutput.videoSettings = videoSettings;
+  self.avOutput.videoSettings = videoSettings;
 }
 
 - (nullable NSObject<FLTCaptureConnection> *)connectionWithMediaType:
     (nonnull AVMediaType)mediaType {
   return [[FLTDefaultCaptureConnection alloc]
-      initWithConnection:[_avOutput connectionWithMediaType:mediaType]];
+      initWithConnection:[self.avOutput connectionWithMediaType:mediaType]];
 }
 
 - (void)setSampleBufferDelegate:
             (nullable id<AVCaptureVideoDataOutputSampleBufferDelegate>)sampleBufferDelegate
                           queue:(nullable dispatch_queue_t)sampleBufferCallbackQueue {
-  [_avOutput setSampleBufferDelegate:sampleBufferDelegate queue:sampleBufferCallbackQueue];
+  [self.avOutput setSampleBufferDelegate:sampleBufferDelegate queue:sampleBufferCallbackQueue];
 }
 
 @end

Original file line number	Diff line number	Diff line change
`@@ -4,9 +4,11 @@`
`4`	`4`
`5`	`5`	`#import "./include/camera_avfoundation/FLTCaptureConnection.h"`
`6`	`6`
`7`		`-@implementation FLTDefaultCaptureConnection {`
`8`		`- AVCaptureConnection *_connection;`
`9`		`-}`
	`7`	`+@interface FLTDefaultCaptureConnection ()`
	`8`	`+@property(nonatomic, strong) AVCaptureConnection *connection;`
	`9`	`+@end`
	`10`	`+`
	`11`	`+@implementation FLTDefaultCaptureConnection`
`10`	`12`
`11`	`13`	`- (instancetype)initWithConnection:(AVCaptureConnection *)connection {`
`12`	`14`	`self = [super init];`
`@@ -17,31 +19,31 @@ - (instancetype)initWithConnection:(AVCaptureConnection *)connection {`
`17`	`19`	`}`
`18`	`20`
`19`	`21`	`- (BOOL)isVideoMirroringSupported {`
`20`		`- return _connection.isVideoMirroringSupported;`
	`22`	`+ return self.connection.isVideoMirroringSupported;`
`21`	`23`	`}`
`22`	`24`
`23`	`25`	`- (BOOL)isVideoOrientationSupported {`
`24`		`- return _connection.isVideoOrientationSupported;`
	`26`	`+ return self.connection.isVideoOrientationSupported;`
`25`	`27`	`}`
`26`	`28`
`27`	`29`	`- (void)setVideoMirrored:(BOOL)videoMirrored {`
`28`		`- _connection.videoMirrored = videoMirrored;`
	`30`	`+ self.connection.videoMirrored = videoMirrored;`
`29`	`31`	`}`
`30`	`32`
`31`	`33`	`- (BOOL)isVideoMirrored {`
`32`		`- return _connection.isVideoMirrored;`
	`34`	`+ return self.connection.isVideoMirrored;`
`33`	`35`	`}`
`34`	`36`
`35`	`37`	`- (void)setVideoOrientation:(AVCaptureVideoOrientation)videoOrientation {`
`36`		`- _connection.videoOrientation = videoOrientation;`
	`38`	`+ self.connection.videoOrientation = videoOrientation;`
`37`	`39`	`}`
`38`	`40`
`39`	`41`	`- (AVCaptureVideoOrientation)videoOrientation {`
`40`		`- return _connection.videoOrientation;`
	`42`	`+ return self.connection.videoOrientation;`
`41`	`43`	`}`
`42`	`44`
`43`	`45`	`- (NSArray<AVCaptureInputPort > )inputPorts {`
`44`		`- return _connection.inputPorts;`
	`46`	`+ return self.connection.inputPorts;`
`45`	`47`	`}`
`46`	`48`
`47`	`49`	`@end`