Skip to content

Commit d78d47e

Browse files
committed
ios: Code style enhancements
* Remove needless @synchronized blocks * Consistent braces and pointer declarations
1 parent b3161bf commit d78d47e

File tree

4 files changed

+34
-57
lines changed

4 files changed

+34
-57
lines changed

ios/RNUnity/RNUnity.h

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
@protocol RNUnityProxy <NSObject>
2121

22-
- (void)emitEvent:(const char*)name data:(const char*)data;
22+
- (void)emitEvent:(const char *)name data:(const char *)data;
2323

2424
@end
2525

@@ -29,10 +29,10 @@
2929
+ (id<RNUnityFramework>)getInstance;
3030
- (id<RNUnityAppController>)appController;
3131

32-
- (void)setExecuteHeader:(const void*)header;
33-
- (void)setDataBundleId:(const char*)bundleId;
32+
- (void)setExecuteHeader:(const void *)header;
33+
- (void)setDataBundleId:(const char *)bundleId;
3434

35-
- (void)runEmbeddedWithArgc:(int)argc argv:(char*[])argv appLaunchOpts:(NSDictionary*)appLaunchOpts;
35+
- (void)runEmbeddedWithArgc:(int)argc argv:(char *[])argv appLaunchOpts:(NSDictionary *)appLaunchOpts;
3636

3737
- (void)unloadApplication;
3838

@@ -42,7 +42,7 @@
4242

4343
- (void)pause:(bool)pause;
4444

45-
- (void)sendMessageToGOWithName:(const char*)goName functionName:(const char*)name message:(const char*)msg;
45+
- (void)sendMessageToGOWithName:(const char *)goName functionName:(const char *)name message:(const char *)msg;
4646

4747
- (void)setRNUnityProxy:(id<RNUnityProxy>)proxy;
4848

@@ -52,20 +52,20 @@
5252
@interface RNUnity : RCTEventEmitter <RCTBridgeModule>
5353

5454
@property (atomic, class) int argc;
55-
@property (atomic, class) char** argv;
55+
@property (atomic, class) char **argv;
5656

5757
@property (atomic, class) id<RNUnityFramework> ufw;
5858

5959
+ (void)initFromSwift;
6060

61-
+ (void)applicationWillResignActive:(UIApplication*)application;
62-
+ (void)applicationDidEnterBackground:(UIApplication*)application;
63-
+ (void)applicationWillEnterForeground:(UIApplication*)application;
64-
+ (void)applicationDidBecomeActive:(UIApplication*)application;
65-
+ (void)applicationWillTerminate:(UIApplication*)application;
61+
+ (void)applicationWillResignActive:(UIApplication *)application;
62+
+ (void)applicationDidEnterBackground:(UIApplication *)application;
63+
+ (void)applicationWillEnterForeground:(UIApplication *)application;
64+
+ (void)applicationDidBecomeActive:(UIApplication *)application;
65+
+ (void)applicationWillTerminate:(UIApplication *)application;
6666

67-
+ (id<RNUnityFramework>)launchWithOptions:(NSDictionary*)launchOptions;
67+
+ (id<RNUnityFramework>)launchWithOptions:(NSDictionary *)launchOptions;
6868

69-
+ (void)emitEvent:(const char*)name data:(const char*)data;
69+
+ (void)emitEvent:(const char *)name data:(const char *)data;
7070

7171
@end

ios/RNUnity/RNUnity.m

Lines changed: 16 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -18,84 +18,65 @@ @implementation RNUnity
1818
RCT_EXPORT_MODULE(RNUnity)
1919

2020
static int _RNUnity_argc;
21-
static char ** _RNUnity_argv;
21+
static char **_RNUnity_argv;
2222
static id<RNUnityFramework> _RNUnity_ufw;
2323
static RNUnity *_RNUnity_sharedInstance;
2424

2525
+ (char **)argv {
26-
@synchronized (self) {
27-
return _RNUnity_argv;
28-
}
26+
return _RNUnity_argv;
2927
}
3028

3129
+ (void)setArgv:(char **)argv {
32-
@synchronized (self) {
33-
_RNUnity_argv = argv;
34-
}
30+
_RNUnity_argv = argv;
3531
}
3632

3733
+ (int)argc {
38-
@synchronized (self) {
39-
return _RNUnity_argc;
40-
}
34+
return _RNUnity_argc;
4135
}
4236

4337
+ (void)setArgc:(int)argc {
44-
@synchronized (self) {
45-
_RNUnity_argc = argc;
46-
}
38+
_RNUnity_argc = argc;
4739
}
4840

4941
+ (id<RNUnityFramework>)ufw {
50-
@synchronized (self) {
51-
return _RNUnity_ufw;
52-
}
42+
return _RNUnity_ufw;
5343
}
5444

5545
+ (void)setUfw:(id<RNUnityFramework>)ufw {
56-
@synchronized (self) {
57-
_RNUnity_ufw = ufw;
58-
}
46+
_RNUnity_ufw = ufw;
5947
}
6048

6149
+ (void)initFromSwift {
62-
NSLog(@"RNUnity.initFromSwift()");
6350
_RNUnity_argc = *_NSGetArgc();
6451
_RNUnity_argv = *_NSGetArgv();
6552
}
6653

67-
+ (void)applicationWillResignActive:(UIApplication*)application {
68-
NSLog(@"RNUnity.applicationWillResignActive()");
54+
+ (void)applicationWillResignActive:(UIApplication *)application {
6955
[[[self ufw] appController] applicationWillResignActive: application];
7056
}
7157

72-
+ (void)applicationDidEnterBackground:(UIApplication*)application {
73-
NSLog(@"RNUnity.applicationDidEnterBackground()");
58+
+ (void)applicationDidEnterBackground:(UIApplication *)application {
7459
[[[self ufw] appController] applicationDidEnterBackground: application];
7560
}
7661

77-
+ (void)applicationWillEnterForeground:(UIApplication*)application {
78-
NSLog(@"RNUnity.applicationWillEnterForeground()");
62+
+ (void)applicationWillEnterForeground:(UIApplication *)application {
7963
[[[self ufw] appController] applicationWillEnterForeground: application];
8064
}
8165

82-
+ (void)applicationDidBecomeActive:(UIApplication*)application {
83-
NSLog(@"RNUnity.applicationDidBecomeActive()");
66+
+ (void)applicationDidBecomeActive:(UIApplication *)application {
8467
[[[self ufw] appController] applicationDidBecomeActive: application];
8568
}
8669

87-
+ (void)applicationWillTerminate:(UIApplication*)application {
88-
NSLog(@"RNUnity.applicationWillTerminate()");
70+
+ (void)applicationWillTerminate:(UIApplication *)application {
8971
[[[self ufw] appController] applicationWillTerminate: application];
9072
}
9173

92-
+ (id<RNUnityFramework>)launchWithOptions:(NSDictionary*)applaunchOptions {
93-
94-
NSString* bundlePath = nil;
74+
+ (id<RNUnityFramework>)launchWithOptions:(NSDictionary *)applaunchOptions {
75+
NSString *bundlePath = nil;
9576
bundlePath = [[NSBundle mainBundle] bundlePath];
9677
bundlePath = [bundlePath stringByAppendingString: @"/Frameworks/UnityFramework.framework"];
9778

98-
NSBundle* bundle = [NSBundle bundleWithPath: bundlePath];
79+
NSBundle *bundle = [NSBundle bundleWithPath: bundlePath];
9980
if ([bundle isLoaded] == false) [bundle load];
10081

10182
id<RNUnityFramework> framework = [bundle.principalClass getInstance];
@@ -155,13 +136,12 @@ - (dispatch_queue_t)methodQueue {
155136
RCT_EXPORT_METHOD(sendMessage:(NSString *)gameObject
156137
functionName:(NSString *)functionName
157138
message:(NSString *)message) {
158-
159139
if (_RNUnity_sharedInstance) {
160140
[[RNUnity ufw] sendMessageToGOWithName:[gameObject UTF8String] functionName:[functionName UTF8String] message:[message UTF8String]];
161141
}
162142
}
163143

164-
+ (void)emitEvent:(const char*)name data:(const char*)data {
144+
+ (void)emitEvent:(const char *)name data:(const char *)data {
165145
[_RNUnity_sharedInstance emitEvent:[NSString stringWithUTF8String:name] data:[NSString stringWithUTF8String:data]];
166146
}
167147

ios/RNUnity/UnityResponderView.m

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
#import "UnityResponderView.h"
22
#import "RNUnity.h"
33

4-
UIView* _unityView;
4+
UIView *_unityView;
55

66
@implementation UnityResponderView
77

8-
- (id)initWithFrame:(CGRect)frame
9-
{
8+
- (id)initWithFrame:(CGRect)frame {
109
self = [super initWithFrame:frame];
1110

1211
if (!_unityView) {
@@ -16,14 +15,13 @@ - (id)initWithFrame:(CGRect)frame
1615
return self;
1716
}
1817

19-
- (void)layoutSubviews
20-
{
18+
- (void)layoutSubviews {
2119
[super layoutSubviews];
2220
[_unityView removeFromSuperview];
2321
_unityView.frame = self.bounds;
2422
[self insertSubview:_unityView atIndex:0];
2523

26-
UIWindow * main = [[[UIApplication sharedApplication] delegate] window];
24+
UIWindow *main = [[[UIApplication sharedApplication] delegate] window];
2725

2826
if (main != nil) {
2927
[main makeKeyAndVisible];

ios/RNUnity/UnityResponderViewManager.m

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@ @implementation UnityResponderViewManager
66

77
RCT_EXPORT_MODULE(UnityResponderView)
88

9-
- (UIView *)view
10-
{
9+
- (UIView *)view {
1110
return [UnityResponderView new];
1211
}
1312

0 commit comments

Comments
 (0)