Skip to content

Commit 376d106

Browse files
committed
Merge remote-tracking branch 'origin/master'
2 parents 306dca3 + e39fdd5 commit 376d106

File tree

4 files changed

+13
-13
lines changed

4 files changed

+13
-13
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ You can create splash screens in the following folders:
183183
* `drawable-xxhdpi`
184184
* `drawable-xxxhdpi`
185185

186-
Add a color called `primary_dark` in `app/src/main/res/values/color.xml`
186+
Add a color called `primary_dark` in `app/src/main/res/values/colors.xml`
187187

188188
```
189189
<?xml version="1.0" encoding="utf-8"?>

ios/SplashScreen.h renamed to ios/RNSplashScreen.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*/
99
#import <React/RCTBridgeModule.h>
1010

11-
@interface SplashScreen : NSObject<RCTBridgeModule>
11+
@interface RNSplashScreen : NSObject<RCTBridgeModule>
1212
+ (void)show;
1313
+ (void)hide;
1414
@end

ios/SplashScreen.m renamed to ios/RNSplashScreen.m

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,17 @@
77
88
*/
99

10-
#import "SplashScreen.h"
10+
#import "RNSplashScreen.h"
1111
#import <React/RCTBridge.h>
1212

1313
static bool waiting = true;
1414
static bool addedJsLoadErrorObserver = false;
1515

16-
@implementation SplashScreen
16+
@implementation RNSplashScreen
1717
- (dispatch_queue_t)methodQueue{
1818
return dispatch_get_main_queue();
1919
}
20-
RCT_EXPORT_MODULE()
20+
RCT_EXPORT_MODULE(SplashScreen)
2121

2222
+ (void)show {
2323
if (!addedJsLoadErrorObserver) {
@@ -41,11 +41,11 @@ + (void)hide {
4141
+ (void) jsLoadError:(NSNotification*)notification
4242
{
4343
// If there was an error loading javascript, hide the splash screen so it can be shown. Otherwise the splash screen will remain forever, which is a hassle to debug.
44-
[SplashScreen hide];
44+
[RNSplashScreen hide];
4545
}
4646

4747
RCT_EXPORT_METHOD(hide) {
48-
[SplashScreen hide];
48+
[RNSplashScreen hide];
4949
}
5050

5151
@end

ios/SplashScreen.xcodeproj/project.pbxproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10-
3D7682841D8E76D10014119E /* SplashScreen.m in Sources */ = {isa = PBXBuildFile; fileRef = 3D7682831D8E76D10014119E /* SplashScreen.m */; };
10+
3D7682841D8E76D10014119E /* RNSplashScreen.m in Sources */ = {isa = PBXBuildFile; fileRef = 3D7682831D8E76D10014119E /* RNSplashScreen.m */; };
1111
/* End PBXBuildFile section */
1212

1313
/* Begin PBXCopyFilesBuildPhase section */
@@ -24,8 +24,8 @@
2424

2525
/* Begin PBXFileReference section */
2626
3D7682761D8E76B80014119E /* libSplashScreen.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libSplashScreen.a; sourceTree = BUILT_PRODUCTS_DIR; };
27-
3D7682821D8E76D10014119E /* SplashScreen.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SplashScreen.h; sourceTree = "<group>"; };
28-
3D7682831D8E76D10014119E /* SplashScreen.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SplashScreen.m; sourceTree = "<group>"; };
27+
3D7682821D8E76D10014119E /* RNSplashScreen.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RNSplashScreen.h; sourceTree = "<group>"; };
28+
3D7682831D8E76D10014119E /* RNSplashScreen.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RNSplashScreen.m; sourceTree = "<group>"; };
2929
/* End PBXFileReference section */
3030

3131
/* Begin PBXFrameworksBuildPhase section */
@@ -42,8 +42,8 @@
4242
3D76826D1D8E76B80014119E = {
4343
isa = PBXGroup;
4444
children = (
45-
3D7682821D8E76D10014119E /* SplashScreen.h */,
46-
3D7682831D8E76D10014119E /* SplashScreen.m */,
45+
3D7682821D8E76D10014119E /* RNSplashScreen.h */,
46+
3D7682831D8E76D10014119E /* RNSplashScreen.m */,
4747
3D7682771D8E76B80014119E /* Products */,
4848
);
4949
sourceTree = "<group>";
@@ -113,7 +113,7 @@
113113
isa = PBXSourcesBuildPhase;
114114
buildActionMask = 2147483647;
115115
files = (
116-
3D7682841D8E76D10014119E /* SplashScreen.m in Sources */,
116+
3D7682841D8E76D10014119E /* RNSplashScreen.m in Sources */,
117117
);
118118
runOnlyForDeploymentPostprocessing = 0;
119119
};

0 commit comments

Comments
 (0)