Rename RTCWKWebview

status-im · Mar 5, 2019 · 26c75b8 · 26c75b8
1 parent 4d9a7e7
commit 26c75b8
Show file tree

Hide file tree

Showing 7 changed files with 105 additions and 106 deletions.
diff --git a/ios/RCTWKWebViewManager.h b/ios/RCTWKWebViewManager.h
diff --git a/ios/React-Native-Webview-Bridge.xcodeproj/project.pbxproj b/ios/React-Native-Webview-Bridge.xcodeproj/project.pbxproj
@@ -7,8 +7,8 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		9EF4097B1E0929E900B7C524 /* RCTWKWebView.m in Sources */ = {isa = PBXBuildFile; fileRef = 9EF4097A1E0929E900B7C524 /* RCTWKWebView.m */; };
-		9EF4097E1E092A2500B7C524 /* RCTWKWebViewManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 9EF4097D1E092A2500B7C524 /* RCTWKWebViewManager.m */; };
+		9EF4097B1E0929E900B7C524 /* StatusWKWebView.m in Sources */ = {isa = PBXBuildFile; fileRef = 9EF4097A1E0929E900B7C524 /* StatusWKWebView.m */; };
+		9EF4097E1E092A2500B7C524 /* StatusWKWebViewManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 9EF4097D1E092A2500B7C524 /* StatusWKWebViewManager.m */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXCopyFilesBuildPhase section */
@@ -26,10 +26,10 @@
 /* Begin PBXFileReference section */
 		4114DC4C1C187C3A003CD988 /* libReact-Native-Webview-Bridge.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libReact-Native-Webview-Bridge.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		4114DC5F1C187CE4003CD988 /* webviewbridge.js */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.javascript; path = webviewbridge.js; sourceTree = "<group>"; };
-		9EF409791E0929C900B7C524 /* RCTWKWebView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RCTWKWebView.h; sourceTree = SOURCE_ROOT; };
-		9EF4097A1E0929E900B7C524 /* RCTWKWebView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTWKWebView.m; sourceTree = SOURCE_ROOT; };
-		9EF4097C1E092A1400B7C524 /* RCTWKWebViewManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RCTWKWebViewManager.h; sourceTree = SOURCE_ROOT; };
-		9EF4097D1E092A2500B7C524 /* RCTWKWebViewManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTWKWebViewManager.m; sourceTree = SOURCE_ROOT; };
+		9EF409791E0929C900B7C524 /* StatusWKWebView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = StatusWKWebView.h; sourceTree = SOURCE_ROOT; };
+		9EF4097A1E0929E900B7C524 /* StatusWKWebView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = StatusWKWebView.m; sourceTree = SOURCE_ROOT; };
+		9EF4097C1E092A1400B7C524 /* StatusWKWebViewManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = StatusWKWebViewManager.h; sourceTree = SOURCE_ROOT; };
+		9EF4097D1E092A2500B7C524 /* StatusWKWebViewManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = StatusWKWebViewManager.m; sourceTree = SOURCE_ROOT; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -63,10 +63,10 @@
 		4114DC4E1C187C3A003CD988 /* React-Native-Webview-Bridge */ = {
 			isa = PBXGroup;
 			children = (
-				9EF409791E0929C900B7C524 /* RCTWKWebView.h */,
-				9EF4097A1E0929E900B7C524 /* RCTWKWebView.m */,
-				9EF4097C1E092A1400B7C524 /* RCTWKWebViewManager.h */,
-				9EF4097D1E092A2500B7C524 /* RCTWKWebViewManager.m */,
+				9EF409791E0929C900B7C524 /* StatusWKWebView.h */,
+				9EF4097A1E0929E900B7C524 /* StatusWKWebView.m */,
+				9EF4097C1E092A1400B7C524 /* StatusWKWebViewManager.h */,
+				9EF4097D1E092A2500B7C524 /* StatusWKWebViewManager.m */,
 			);
 			path = "React-Native-Webview-Bridge";
 			sourceTree = "<group>";
@@ -136,8 +136,8 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				9EF4097B1E0929E900B7C524 /* RCTWKWebView.m in Sources */,
-				9EF4097E1E092A2500B7C524 /* RCTWKWebViewManager.m in Sources */,
+				9EF4097B1E0929E900B7C524 /* StatusWKWebView.m in Sources */,
+				9EF4097E1E092A2500B7C524 /* StatusWKWebViewManager.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

diff --git a/ios/RCTWKWebView.h → ios/StatusWKWebView.h b/ios/RCTWKWebView.h → ios/StatusWKWebView.h
@@ -1,6 +1,6 @@
 #import "React/RCTView.h"
 
-@class RCTWKWebView;
+@class StatusWKWebView;
 
 /**
  * Special scheme used to pass messages to the injectedJavaScript
@@ -12,13 +12,13 @@ extern NSString *const RCTJSNavigationScheme;
 
 @protocol RCTWKWebViewDelegate <NSObject>
 
-- (BOOL)webView:(RCTWKWebView *)webView
+- (BOOL)webView:(StatusWKWebView *)webView
 shouldStartLoadForRequest:(NSMutableDictionary<NSString *, id> *)request
    withCallback:(RCTDirectEventBlock)callback;
 
 @end
 
-@interface RCTWKWebView : RCTView
+@interface StatusWKWebView : RCTView
 
 @property (nonatomic, weak) id<RCTWKWebViewDelegate> delegate;
 

diff --git a/ios/RCTWKWebView.m → ios/StatusWKWebView.m b/ios/RCTWKWebView.m → ios/StatusWKWebView.m
@@ -1,4 +1,4 @@
-#import "RCTWKWebView.h"
+#import "StatusWKWebView.h"
 
 #import <WebKit/WebKit.h>
 #import <UIKit/UIKit.h>
@@ -18,7 +18,7 @@
 
 NSString *const RCTWebViewBridgeSchema = @"wvb";
 
-@interface RCTWKWebView () <WKNavigationDelegate, RCTAutoInsetsProtocol, WKScriptMessageHandler, WKUIDelegate>
+@interface StatusWKWebView () <WKNavigationDelegate, RCTAutoInsetsProtocol, WKScriptMessageHandler, WKUIDelegate>
 
 @property (nonatomic, copy) RCTDirectEventBlock onLoadingStart;
 @property (nonatomic, copy) RCTDirectEventBlock onLoadingFinish;
@@ -30,7 +30,7 @@ @interface RCTWKWebView () <WKNavigationDelegate, RCTAutoInsetsProtocol, WKScrip
 
 @end
 
-@implementation RCTWKWebView
+@implementation StatusWKWebView
 {
     WKWebView *_webView;
     NSString *_injectedJavaScript;
@@ -40,22 +40,22 @@ - (instancetype)initWithFrame:(CGRect)frame
 {
     if ((self = [super initWithFrame:frame])) {
         super.backgroundColor = [UIColor clearColor];
-
+        
         _automaticallyAdjustContentInsets = YES;
         _contentInset = UIEdgeInsetsZero;
-
+        
         WKWebViewConfiguration* config = [[WKWebViewConfiguration alloc] init];
         WKUserContentController* userController = [[WKUserContentController alloc]init];
         [userController addScriptMessageHandler:self name:@"reactNative"];
         [userController addScriptMessageHandler:self name:@"sendRequest"];
         config.userContentController = userController;
-
+        
         WKUserScript* bridgeScript = [[WKUserScript alloc]
                                       initWithSource: [self webViewBridgeScript]
                                       injectionTime:WKUserScriptInjectionTimeAtDocumentStart
                                       forMainFrameOnly:NO];
         [config.userContentController addUserScript:bridgeScript];
-
+        
         _webView = [[WKWebView alloc] initWithFrame:self.bounds configuration:config];
         _webView.UIDelegate = self;
         _webView.navigationDelegate = self;
@@ -77,7 +77,7 @@ - (void)loadRequest:(NSURLRequest *)request
             request = mutableRequest;
         }
     }
-
+    
     [_webView loadRequest:request];
 }
 
@@ -123,14 +123,13 @@ - (void)sendIt:(NSString *)body
         NSData *data = [body dataUsingEncoding:NSUTF8StringEncoding];
         NSDictionary *responseDic = [NSJSONSerialization JSONObjectWithData:data options:NSJSONReadingMutableContainers error:nil];
         NSString *callbackId = [responseDic objectForKey:@"callbackId"];
-        NSString *host = [responseDic objectForKey:@"host"];
         NSString *payload = [responseDic objectForKey:@"payload"];
-
+        
         NSString *response = StatusgoCallRPC(payload);
         NSString *trimmedResponse = [response stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]];
-
+        
         NSString *format = @"httpCallback('%@', '%@');";
-
+        
         NSString *command = [NSString stringWithFormat: format, callbackId, trimmedResponse];
         dispatch_async( dispatch_get_main_queue(), ^{
             [_webView evaluateJavaScript:command completionHandler:nil];

diff --git a/ios/StatusWKWebViewManager.h b/ios/StatusWKWebViewManager.h
@@ -0,0 +1,5 @@
+#import "React/RCTViewManager.h"
+
+@interface StatusWKWebViewManager : RCTViewManager
+
+@end
diff --git a/ios/RCTWKWebViewManager.m → ios/StatusWKWebViewManager.m b/ios/RCTWKWebViewManager.m → ios/StatusWKWebViewManager.m
@@ -1,18 +1,18 @@
-#import "RCTWKWebViewManager.h"
+#import "StatusWKWebViewManager.h"
 
 #import "React/RCTBridge.h"
 #import "React/RCTUtils.h"
 #import "React/RCTUIManager.h"
 #import "React/UIView+React.h"
-#import "RCTWKWebView.h"
+#import "StatusWKWebView.h"
 
 #import <WebKit/WebKit.h>
 
-@interface RCTWKWebViewManager () <RCTWKWebViewDelegate>
+@interface StatusWKWebViewManager () <RCTWKWebViewDelegate>
 
 @end
 
-@implementation RCTWKWebViewManager
+@implementation StatusWKWebViewManager
 {
     NSConditionLock *_shouldStartLoadLock;
     BOOL _shouldStartLoad;
@@ -22,7 +22,7 @@ @implementation RCTWKWebViewManager
 
 - (UIView *)view
 {
-    RCTWKWebView *webView = [RCTWKWebView new];
+    StatusWKWebView *webView = [StatusWKWebView new];
     webView.delegate = self;
     return webView;
 }
@@ -45,10 +45,10 @@ - (UIView *)view
 
 RCT_EXPORT_METHOD(goBack:(nonnull NSNumber *)reactTag)
 {
-    [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, RCTWKWebView *> *viewRegistry) {
-        RCTWKWebView *view = viewRegistry[reactTag];
-        if (![view isKindOfClass:[RCTWKWebView class]]) {
-            RCTLogError(@"Invalid view returned from registry, expecting RCTWKWebView, got: %@", view);
+    [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, StatusWKWebView *> *viewRegistry) {
+        StatusWKWebView *view = viewRegistry[reactTag];
+        if (![view isKindOfClass:[StatusWKWebView class]]) {
+            RCTLogError(@"Invalid view returned from registry, expecting StatusWKWebView, got: %@", view);
         } else {
             [view goBack];
         }
@@ -57,10 +57,10 @@ - (UIView *)view
 
 RCT_EXPORT_METHOD(goForward:(nonnull NSNumber *)reactTag)
 {
-    [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, RCTWKWebView *> *viewRegistry) {
-        RCTWKWebView *view = viewRegistry[reactTag];
-        if (![view isKindOfClass:[RCTWKWebView class]]) {
-            RCTLogError(@"Invalid view returned from registry, expecting RCTWKWebView, got: %@", view);
+    [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, StatusWKWebView *> *viewRegistry) {
+        StatusWKWebView *view = viewRegistry[reactTag];
+        if (![view isKindOfClass:[StatusWKWebView class]]) {
+            RCTLogError(@"Invalid view returned from registry, expecting StatusWKWebView, got: %@", view);
         } else {
             [view goForward];
         }
@@ -69,10 +69,10 @@ - (UIView *)view
 
 RCT_EXPORT_METHOD(reload:(nonnull NSNumber *)reactTag)
 {
-    [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, RCTWKWebView *> *viewRegistry) {
-        RCTWKWebView *view = viewRegistry[reactTag];
-        if (![view isKindOfClass:[RCTWKWebView class]]) {
-            RCTLogError(@"Invalid view returned from registry, expecting RCTWKWebView, got: %@", view);
+    [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, StatusWKWebView *> *viewRegistry) {
+        StatusWKWebView *view = viewRegistry[reactTag];
+        if (![view isKindOfClass:[StatusWKWebView class]]) {
+            RCTLogError(@"Invalid view returned from registry, expecting StatusWKWebView, got: %@", view);
         } else {
             [view reload];
         }
@@ -84,10 +84,10 @@ - (UIView *)view
                   resolver:(RCTPromiseResolveBlock)resolve
                   rejecter:(RCTPromiseRejectBlock)reject)
 {
-    [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, RCTWKWebView *> *viewRegistry) {
-        RCTWKWebView *view = viewRegistry[reactTag];
-        if (![view isKindOfClass:[RCTWKWebView class]]) {
-            RCTLogError(@"Invalid view returned from registry, expecting RCTWKWebView, got: %@", view);
+    [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, StatusWKWebView *> *viewRegistry) {
+        StatusWKWebView *view = viewRegistry[reactTag];
+        if (![view isKindOfClass:[StatusWKWebView class]]) {
+            RCTLogError(@"Invalid view returned from registry, expecting StatusWKWebView, got: %@", view);
         } else {
             [view evaluateJavaScript:js completionHandler:^(id result, NSError *error) {
                 if (error) {
@@ -103,9 +103,9 @@ - (UIView *)view
 RCT_EXPORT_METHOD(sendToBridge:(nonnull NSNumber *)reactTag
                   value:(NSString*)message)
 {
-    [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, RCTWKWebView *> *viewRegistry) {
-        RCTWKWebView *view = viewRegistry[reactTag];
-        if (![view isKindOfClass:[RCTWKWebView class]]) {
+    [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, StatusWKWebView *> *viewRegistry) {
+        StatusWKWebView *view = viewRegistry[reactTag];
+        if (![view isKindOfClass:[StatusWKWebView class]]) {
             RCTLogError(@"Invalid view returned from registry, expecting RCTWebViewBridge, got: %@", view);
         } else {
             [view sendToBridge: message];
@@ -115,7 +115,7 @@ - (UIView *)view
 
 #pragma mark - Exported synchronous methods
 
-- (BOOL)webView:(__unused RCTWKWebView *)webView
+- (BOOL)webView:(__unused StatusWKWebView *)webView
 shouldStartLoadForRequest:(NSMutableDictionary<NSString *, id> *)request
    withCallback:(RCTDirectEventBlock)callback
 {