bluewallet/react-native-camera
bluewallet/react-native-camera
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(ios): instance-method-conflict warning (#2817)

Browse Source
This commit is contained in:
Nick Hodapp 2020-05-05 12:00:29 -07:00 committed by GitHub
parent 5b32936f00
commit e02890c41a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ios/RCT/NSMutableDictionary+ImageMetadata.h Normal file
View File

@ -0,0 +1,13 @@
//
// NSMutableDictionary+ImageMetadata.m
// RCTCamera
//
// Created by Nick Hodapp on 5/1/20.
//
//
#import <Foundation/Foundation.h>
@interface NSMutableDictionary(ImageMetadata)
- (void)mergeMetadata:(NSDictionary *)inputMetadata;
@end

4
ios/RCT/NSMutableDictionary+ImageMetadata.m
View File

@ -9,9 +9,7 @@
#import <Foundation/Foundation.h>
#import <ImageIO/ImageIO.h>
@interface NSMutableDictionary(ImageMetadata)
- (void)mergeMetadata:(NSDictionary *)inputMetadata;
@end
#import "NSMutableDictionary+ImageMetadata.h"
@implementation NSMutableDictionary(ImageMetadata)

2
ios/RCT/RCTCameraManager.m
View File

@ -5,7 +5,7 @@
#import <React/RCTUtils.h>
#import <React/RCTLog.h>
#import <React/UIView+React.h>
#import "NSMutableDictionary+ImageMetadata.m"
#import "NSMutableDictionary+ImageMetadata.h"
#import <AssetsLibrary/ALAssetsLibrary.h>
#import <AVFoundation/AVFoundation.h>
#import <ImageIO/ImageIO.h>

2
ios/RNCamera.xcodeproj/project.pbxproj
View File

@ -59,6 +59,7 @@
71C7FFD52013C824006EB75A /* RNFileSystem.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNFileSystem.m; sourceTree = "<group>"; };
9FE592B11CA3CBF500788287 /* RCTSensorOrientationChecker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTSensorOrientationChecker.h; sourceTree = "<group>"; };
9FE592B21CA3CBF500788287 /* RCTSensorOrientationChecker.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTSensorOrientationChecker.m; sourceTree = "<group>"; };
C5627D22245D10A100B761CF /* NSMutableDictionary+ImageMetadata.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSMutableDictionary+ImageMetadata.h"; sourceTree = "<group>"; };
F8393BEA21469C0000AB1995 /* RNSensorOrientationChecker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RNSensorOrientationChecker.h; sourceTree = "<group>"; };
F8393BEB21469C0000AB1995 /* RNSensorOrientationChecker.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RNSensorOrientationChecker.m; sourceTree = "<group>"; };
/* End PBXFileReference section */
@ -98,6 +99,7 @@
9FE592B21CA3CBF500788287 /* RCTSensorOrientationChecker.m */,
0314E39C1B661A460092D183 /* CameraFocusSquare.m */,
0314E39B1B661A0C0092D183 /* CameraFocusSquare.h */,
C5627D22245D10A100B761CF /* NSMutableDictionary+ImageMetadata.h */,
454EBCF31B5082DC00AD0F86 /* NSMutableDictionary+ImageMetadata.m */,
410701471ACB732B00C6AA39 /* RCTCamera.h */,
410701481ACB732B00C6AA39 /* RCTCamera.m */,