Browse Source

Rename ReactWebView to RNCWebView, remove more infinitered references

Jamon Holmgren 6 years ago
parent
commit
f9b9d3c092

+ 1
- 0
WebTest/android/app/build.gradle View File

@@ -137,6 +137,7 @@ android {
137 137
 }
138 138
 
139 139
 dependencies {
140
+    compile project(':react-native-webview')
140 141
     compile fileTree(dir: "libs", include: ["*.jar"])
141 142
     compile "com.android.support:appcompat-v7:${rootProject.ext.supportLibVersion}"
142 143
     compile "com.facebook.react:react-native:+"  // From node_modules

+ 3
- 1
WebTest/android/app/src/main/java/com/webtest/MainApplication.java View File

@@ -3,6 +3,7 @@ package com.webtest;
3 3
 import android.app.Application;
4 4
 
5 5
 import com.facebook.react.ReactApplication;
6
+import com.reactnativecommunity.webview.RNCWebViewPackage;
6 7
 import com.facebook.react.ReactNativeHost;
7 8
 import com.facebook.react.ReactPackage;
8 9
 import com.facebook.react.shell.MainReactPackage;
@@ -22,7 +23,8 @@ public class MainApplication extends Application implements ReactApplication {
22 23
     @Override
23 24
     protected List<ReactPackage> getPackages() {
24 25
       return Arrays.<ReactPackage>asList(
25
-          new MainReactPackage()
26
+          new MainReactPackage(),
27
+            new RNCWebViewPackage()
26 28
       );
27 29
     }
28 30
 

+ 2
- 0
WebTest/android/settings.gradle View File

@@ -1,3 +1,5 @@
1 1
 rootProject.name = 'WebTest'
2
+include ':react-native-webview'
3
+project(':react-native-webview').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-webview/android')
2 4
 
3 5
 include ':app'

+ 62
- 2
WebTest/ios/WebTest.xcodeproj/project.pbxproj View File

@@ -5,7 +5,6 @@
5 5
 	};
6 6
 	objectVersion = 46;
7 7
 	objects = {
8
-
9 8
 /* Begin PBXBuildFile section */
10 9
 		00C302E51ABCBA2D00DB3ED1 /* libRCTActionSheet.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302AC1ABCB8CE00DB3ED1 /* libRCTActionSheet.a */; };
11 10
 		00C302E71ABCBA2D00DB3ED1 /* libRCTGeolocation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302BA1ABCB90400DB3ED1 /* libRCTGeolocation.a */; };
@@ -38,6 +37,7 @@
38 37
 		5E9157361DD0AC6A00FF2AA8 /* libRCTAnimation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5E9157331DD0AC6500FF2AA8 /* libRCTAnimation.a */; };
39 38
 		832341BD1AAA6AB300B99B32 /* libRCTText.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 832341B51AAA6A8300B99B32 /* libRCTText.a */; };
40 39
 		ADBDB9381DFEBF1600ED6528 /* libRCTBlob.a in Frameworks */ = {isa = PBXBuildFile; fileRef = ADBDB9271DFEBF0700ED6528 /* libRCTBlob.a */; };
40
+		0DEB930C40564C6EA64B2F22 /* libRNCWebView.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 694F766453F2454298825A66 /* libRNCWebView.a */; };
41 41
 /* End PBXBuildFile section */
42 42
 
43 43
 /* Begin PBXContainerItemProxy section */
@@ -343,6 +343,8 @@
343 343
 		78C398B01ACF4ADC00677621 /* RCTLinking.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTLinking.xcodeproj; path = "../node_modules/react-native/Libraries/LinkingIOS/RCTLinking.xcodeproj"; sourceTree = "<group>"; };
344 344
 		832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTText.xcodeproj; path = "../node_modules/react-native/Libraries/Text/RCTText.xcodeproj"; sourceTree = "<group>"; };
345 345
 		ADBDB91F1DFEBF0600ED6528 /* RCTBlob.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTBlob.xcodeproj; path = "../node_modules/react-native/Libraries/Blob/RCTBlob.xcodeproj"; sourceTree = "<group>"; };
346
+		145424F98F774DD4816B6AB1 /* RNCWebView.xcodeproj */ = {isa = PBXFileReference; name = "RNCWebView.xcodeproj"; path = "../node_modules/react-native-webview/ios/RNCWebView.xcodeproj"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = wrapper.pb-project; explicitFileType = undefined; includeInIndex = 0; };
347
+		694F766453F2454298825A66 /* libRNCWebView.a */ = {isa = PBXFileReference; name = "libRNCWebView.a"; path = "libRNCWebView.a"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = archive.ar; explicitFileType = undefined; includeInIndex = 0; };
346 348
 /* End PBXFileReference section */
347 349
 
348 350
 /* Begin PBXFrameworksBuildPhase section */
@@ -371,6 +373,7 @@
371 373
 				832341BD1AAA6AB300B99B32 /* libRCTText.a in Frameworks */,
372 374
 				00C302EA1ABCBA2D00DB3ED1 /* libRCTVibration.a in Frameworks */,
373 375
 				139FDEF61B0652A700C62182 /* libRCTWebSocket.a in Frameworks */,
376
+				0DEB930C40564C6EA64B2F22 /* libRNCWebView.a in Frameworks */,
374 377
 			);
375 378
 			runOnlyForDeploymentPostprocessing = 0;
376 379
 		};
@@ -557,6 +560,7 @@
557 560
 				832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */,
558 561
 				00C302DF1ABCB9EE00DB3ED1 /* RCTVibration.xcodeproj */,
559 562
 				139FDEE61B06529A00C62182 /* RCTWebSocket.xcodeproj */,
563
+				145424F98F774DD4816B6AB1 /* RNCWebView.xcodeproj */,
560 564
 			);
561 565
 			name = Libraries;
562 566
 			sourceTree = "<group>";
@@ -685,7 +689,7 @@
685 689
 		83CBB9F71A601CBA00E9B192 /* Project object */ = {
686 690
 			isa = PBXProject;
687 691
 			attributes = {
688
-				LastUpgradeCheck = 0610;
692
+				LastUpgradeCheck = 610;
689 693
 				ORGANIZATIONNAME = Facebook;
690 694
 				TargetAttributes = {
691 695
 					00E356ED1AD99517003FC87E = {
@@ -1181,6 +1185,14 @@
1181 1185
 				);
1182 1186
 				PRODUCT_NAME = "$(TARGET_NAME)";
1183 1187
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/WebTest.app/WebTest";
1188
+				LIBRARY_SEARCH_PATHS = (
1189
+					"$(inherited)",
1190
+					"\"$(SRCROOT)/$(TARGET_NAME)\"",
1191
+				);
1192
+				HEADER_SEARCH_PATHS = (
1193
+					"$(inherited)",
1194
+					"$(SRCROOT)/../node_modules/react-native-webview/ios/**",
1195
+				);
1184 1196
 			};
1185 1197
 			name = Debug;
1186 1198
 		};
@@ -1198,6 +1210,14 @@
1198 1210
 				);
1199 1211
 				PRODUCT_NAME = "$(TARGET_NAME)";
1200 1212
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/WebTest.app/WebTest";
1213
+				LIBRARY_SEARCH_PATHS = (
1214
+					"$(inherited)",
1215
+					"\"$(SRCROOT)/$(TARGET_NAME)\"",
1216
+				);
1217
+				HEADER_SEARCH_PATHS = (
1218
+					"$(inherited)",
1219
+					"$(SRCROOT)/../node_modules/react-native-webview/ios/**",
1220
+				);
1201 1221
 			};
1202 1222
 			name = Release;
1203 1223
 		};
@@ -1216,6 +1236,10 @@
1216 1236
 				);
1217 1237
 				PRODUCT_NAME = WebTest;
1218 1238
 				VERSIONING_SYSTEM = "apple-generic";
1239
+				HEADER_SEARCH_PATHS = (
1240
+					"$(inherited)",
1241
+					"$(SRCROOT)/../node_modules/react-native-webview/ios/**",
1242
+				);
1219 1243
 			};
1220 1244
 			name = Debug;
1221 1245
 		};
@@ -1233,6 +1257,10 @@
1233 1257
 				);
1234 1258
 				PRODUCT_NAME = WebTest;
1235 1259
 				VERSIONING_SYSTEM = "apple-generic";
1260
+				HEADER_SEARCH_PATHS = (
1261
+					"$(inherited)",
1262
+					"$(SRCROOT)/../node_modules/react-native-webview/ios/**",
1263
+				);
1236 1264
 			};
1237 1265
 			name = Release;
1238 1266
 		};
@@ -1259,6 +1287,14 @@
1259 1287
 				SDKROOT = appletvos;
1260 1288
 				TARGETED_DEVICE_FAMILY = 3;
1261 1289
 				TVOS_DEPLOYMENT_TARGET = 9.2;
1290
+				LIBRARY_SEARCH_PATHS = (
1291
+					"$(inherited)",
1292
+					"\"$(SRCROOT)/$(TARGET_NAME)\"",
1293
+				);
1294
+				HEADER_SEARCH_PATHS = (
1295
+					"$(inherited)",
1296
+					"$(SRCROOT)/../node_modules/react-native-webview/ios/**",
1297
+				);
1262 1298
 			};
1263 1299
 			name = Debug;
1264 1300
 		};
@@ -1285,6 +1321,14 @@
1285 1321
 				SDKROOT = appletvos;
1286 1322
 				TARGETED_DEVICE_FAMILY = 3;
1287 1323
 				TVOS_DEPLOYMENT_TARGET = 9.2;
1324
+				LIBRARY_SEARCH_PATHS = (
1325
+					"$(inherited)",
1326
+					"\"$(SRCROOT)/$(TARGET_NAME)\"",
1327
+				);
1328
+				HEADER_SEARCH_PATHS = (
1329
+					"$(inherited)",
1330
+					"$(SRCROOT)/../node_modules/react-native-webview/ios/**",
1331
+				);
1288 1332
 			};
1289 1333
 			name = Release;
1290 1334
 		};
@@ -1310,6 +1354,14 @@
1310 1354
 				SDKROOT = appletvos;
1311 1355
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/WebTest-tvOS.app/WebTest-tvOS";
1312 1356
 				TVOS_DEPLOYMENT_TARGET = 10.1;
1357
+				LIBRARY_SEARCH_PATHS = (
1358
+					"$(inherited)",
1359
+					"\"$(SRCROOT)/$(TARGET_NAME)\"",
1360
+				);
1361
+				HEADER_SEARCH_PATHS = (
1362
+					"$(inherited)",
1363
+					"$(SRCROOT)/../node_modules/react-native-webview/ios/**",
1364
+				);
1313 1365
 			};
1314 1366
 			name = Debug;
1315 1367
 		};
@@ -1335,6 +1387,14 @@
1335 1387
 				SDKROOT = appletvos;
1336 1388
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/WebTest-tvOS.app/WebTest-tvOS";
1337 1389
 				TVOS_DEPLOYMENT_TARGET = 10.1;
1390
+				LIBRARY_SEARCH_PATHS = (
1391
+					"$(inherited)",
1392
+					"\"$(SRCROOT)/$(TARGET_NAME)\"",
1393
+				);
1394
+				HEADER_SEARCH_PATHS = (
1395
+					"$(inherited)",
1396
+					"$(SRCROOT)/../node_modules/react-native-webview/ios/**",
1397
+				);
1338 1398
 			};
1339 1399
 			name = Release;
1340 1400
 		};

+ 2
- 1
WebTest/package.json View File

@@ -8,7 +8,8 @@
8 8
   },
9 9
   "dependencies": {
10 10
     "react": "16.4.1",
11
-    "react-native": "0.56.0"
11
+    "react-native": "0.56.0",
12
+    "react-native-webview": "../"
12 13
   },
13 14
   "devDependencies": {
14 15
     "@babel/core": "^7.0.0-beta",

+ 1
- 1
android/src/main/AndroidManifest.xml View File

@@ -1,2 +1,2 @@
1
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.infinitered.webview">
1
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.reactnativecommunity.webview">
2 2
 </manifest>

android/src/main/java/com/infinitered/webview/ReactWebViewManager.java → android/src/main/java/com/reactnativecommunity/webview/RNCWebViewManager.java View File

@@ -1,4 +1,4 @@
1
-package com.infinitered.webview;
1
+package com.reactnativecommunity.webview;
2 2
 
3 3
 import android.annotation.TargetApi;
4 4
 import android.content.Context;
@@ -49,10 +49,10 @@ import com.facebook.react.uimanager.annotations.ReactProp;
49 49
 import com.facebook.react.uimanager.events.ContentSizeChangeEvent;
50 50
 import com.facebook.react.uimanager.events.Event;
51 51
 import com.facebook.react.uimanager.events.EventDispatcher;
52
-import com.infinitered.webview.events.TopLoadingErrorEvent;
53
-import com.infinitered.webview.events.TopLoadingFinishEvent;
54
-import com.infinitered.webview.events.TopLoadingStartEvent;
55
-import com.infinitered.webview.events.TopMessageEvent;
52
+import com.reactnativecommunity.webview.events.TopLoadingErrorEvent;
53
+import com.reactnativecommunity.webview.events.TopLoadingFinishEvent;
54
+import com.reactnativecommunity.webview.events.TopLoadingStartEvent;
55
+import com.reactnativecommunity.webview.events.TopMessageEvent;
56 56
 import java.io.UnsupportedEncodingException;
57 57
 import java.util.ArrayList;
58 58
 import java.util.HashMap;
@@ -83,8 +83,8 @@ import org.json.JSONObject;
83 83
  *  - canGoBack - boolean, whether there is anything on a history stack to go back
84 84
  *  - canGoForward - boolean, whether it is possible to request GO_FORWARD command
85 85
  */
86
-@ReactModule(name = ReactWebViewManager.REACT_CLASS)
87
-public class ReactWebViewManager extends SimpleViewManager<WebView> {
86
+@ReactModule(name = RNCWebViewManager.REACT_CLASS)
87
+public class RNCWebViewManager extends SimpleViewManager<WebView> {
88 88
 
89 89
   protected static final String REACT_CLASS = "RNCWebView";
90 90
 
@@ -108,7 +108,7 @@ public class ReactWebViewManager extends SimpleViewManager<WebView> {
108 108
   protected WebViewConfig mWebViewConfig;
109 109
   protected @Nullable WebView.PictureListener mPictureListener;
110 110
 
111
-  protected static class ReactWebViewClient extends WebViewClient {
111
+  protected static class RNCWebViewClient extends WebViewClient {
112 112
 
113 113
     protected boolean mLastLoadFailed = false;
114 114
     protected @Nullable ReadableArray mUrlPrefixesForDefaultIntent;
@@ -119,7 +119,7 @@ public class ReactWebViewManager extends SimpleViewManager<WebView> {
119 119
       super.onPageFinished(webView, url);
120 120
 
121 121
       if (!mLastLoadFailed) {
122
-        ReactWebView reactWebView = (ReactWebView) webView;
122
+        RNCWebView reactWebView = (RNCWebView) webView;
123 123
         reactWebView.callInjectedJavaScript();
124 124
         reactWebView.linkBridge();
125 125
         emitFinishEvent(webView, url);
@@ -242,15 +242,15 @@ public class ReactWebViewManager extends SimpleViewManager<WebView> {
242 242
    * Subclass of {@link WebView} that implements {@link LifecycleEventListener} interface in order
243 243
    * to call {@link WebView#destroy} on activity destroy event and also to clear the client
244 244
    */
245
-  protected static class ReactWebView extends WebView implements LifecycleEventListener {
245
+  protected static class RNCWebView extends WebView implements LifecycleEventListener {
246 246
     protected @Nullable String injectedJS;
247 247
     protected boolean messagingEnabled = false;
248
-    protected @Nullable ReactWebViewClient mReactWebViewClient;
248
+    protected @Nullable RNCWebViewClient mRNCWebViewClient;
249 249
 
250
-    protected class ReactWebViewBridge {
251
-      ReactWebView mContext;
250
+    protected class RNCWebViewBridge {
251
+      RNCWebView mContext;
252 252
 
253
-      ReactWebViewBridge(ReactWebView c) {
253
+      RNCWebViewBridge(RNCWebView c) {
254 254
         mContext = c;
255 255
       }
256 256
 
@@ -267,7 +267,7 @@ public class ReactWebViewManager extends SimpleViewManager<WebView> {
267 267
      * Reactive Native needed for access to ReactNative internal system functionality
268 268
      *
269 269
      */
270
-    public ReactWebView(ThemedReactContext reactContext) {
270
+    public RNCWebView(ThemedReactContext reactContext) {
271 271
       super(reactContext);
272 272
     }
273 273
 
@@ -289,19 +289,19 @@ public class ReactWebViewManager extends SimpleViewManager<WebView> {
289 289
     @Override
290 290
     public void setWebViewClient(WebViewClient client) {
291 291
       super.setWebViewClient(client);
292
-      mReactWebViewClient = (ReactWebViewClient)client;
292
+      mRNCWebViewClient = (RNCWebViewClient)client;
293 293
     }
294 294
 
295
-    public @Nullable ReactWebViewClient getReactWebViewClient() {
296
-      return mReactWebViewClient;
295
+    public @Nullable RNCWebViewClient getRNCWebViewClient() {
296
+      return mRNCWebViewClient;
297 297
     }
298 298
 
299 299
     public void setInjectedJavaScript(@Nullable String js) {
300 300
       injectedJS = js;
301 301
     }
302 302
 
303
-    protected ReactWebViewBridge createReactWebViewBridge(ReactWebView webView) {
304
-      return new ReactWebViewBridge(webView);
303
+    protected RNCWebViewBridge createRNCWebViewBridge(RNCWebView webView) {
304
+      return new RNCWebViewBridge(webView);
305 305
     }
306 306
 
307 307
     public void setMessagingEnabled(boolean enabled) {
@@ -311,7 +311,7 @@ public class ReactWebViewManager extends SimpleViewManager<WebView> {
311 311
 
312 312
       messagingEnabled = enabled;
313 313
       if (enabled) {
314
-        addJavascriptInterface(createReactWebViewBridge(this), BRIDGE_NAME);
314
+        addJavascriptInterface(createRNCWebViewBridge(this), BRIDGE_NAME);
315 315
         linkBridge();
316 316
       } else {
317 317
         removeJavascriptInterface(BRIDGE_NAME);
@@ -360,14 +360,14 @@ public class ReactWebViewManager extends SimpleViewManager<WebView> {
360 360
     }
361 361
   }
362 362
 
363
-  public ReactWebViewManager() {
363
+  public RNCWebViewManager() {
364 364
     mWebViewConfig = new WebViewConfig() {
365 365
       public void configWebView(WebView webView) {
366 366
       }
367 367
     };
368 368
   }
369 369
 
370
-  public ReactWebViewManager(WebViewConfig webViewConfig) {
370
+  public RNCWebViewManager(WebViewConfig webViewConfig) {
371 371
     mWebViewConfig = webViewConfig;
372 372
   }
373 373
 
@@ -376,14 +376,14 @@ public class ReactWebViewManager extends SimpleViewManager<WebView> {
376 376
     return REACT_CLASS;
377 377
   }
378 378
 
379
-  protected ReactWebView createReactWebViewInstance(ThemedReactContext reactContext) {
380
-    return new ReactWebView(reactContext);
379
+  protected RNCWebView createRNCWebViewInstance(ThemedReactContext reactContext) {
380
+    return new RNCWebView(reactContext);
381 381
   }
382 382
 
383 383
   @Override
384 384
   @TargetApi(Build.VERSION_CODES.LOLLIPOP)
385 385
   protected WebView createViewInstance(ThemedReactContext reactContext) {
386
-    ReactWebView webView = createReactWebViewInstance(reactContext);
386
+    RNCWebView webView = createRNCWebViewInstance(reactContext);
387 387
     webView.setWebChromeClient(new WebChromeClient() {
388 388
       @Override
389 389
       public boolean onConsoleMessage(ConsoleMessage message) {
@@ -474,12 +474,12 @@ public class ReactWebViewManager extends SimpleViewManager<WebView> {
474 474
 
475 475
   @ReactProp(name = "injectedJavaScript")
476 476
   public void setInjectedJavaScript(WebView view, @Nullable String injectedJavaScript) {
477
-    ((ReactWebView) view).setInjectedJavaScript(injectedJavaScript);
477
+    ((RNCWebView) view).setInjectedJavaScript(injectedJavaScript);
478 478
   }
479 479
 
480 480
   @ReactProp(name = "messagingEnabled")
481 481
   public void setMessagingEnabled(WebView view, boolean enabled) {
482
-    ((ReactWebView) view).setMessagingEnabled(enabled);
482
+    ((RNCWebView) view).setMessagingEnabled(enabled);
483 483
   }
484 484
 
485 485
   @ReactProp(name = "source")
@@ -568,7 +568,7 @@ public class ReactWebViewManager extends SimpleViewManager<WebView> {
568 568
   public void setUrlPrefixesForDefaultIntent(
569 569
       WebView view,
570 570
       @Nullable ReadableArray urlPrefixesForDefaultIntent) {
571
-    ReactWebViewClient client = ((ReactWebView) view).getReactWebViewClient();
571
+    RNCWebViewClient client = ((RNCWebView) view).getRNCWebViewClient();
572 572
     if (client != null && urlPrefixesForDefaultIntent != null) {
573 573
       client.setUrlPrefixesForDefaultIntent(urlPrefixesForDefaultIntent);
574 574
     }
@@ -585,7 +585,7 @@ public class ReactWebViewManager extends SimpleViewManager<WebView> {
585 585
   public void setOriginWhitelist(
586 586
     WebView view,
587 587
     @Nullable ReadableArray originWhitelist) {
588
-    ReactWebViewClient client = ((ReactWebView) view).getReactWebViewClient();
588
+    RNCWebViewClient client = ((RNCWebView) view).getRNCWebViewClient();
589 589
     if (client != null && originWhitelist != null) {
590 590
       List<Pattern> whiteList = new LinkedList<>();
591 591
       for (int i = 0 ; i < originWhitelist.size() ; i++) {
@@ -598,7 +598,7 @@ public class ReactWebViewManager extends SimpleViewManager<WebView> {
598 598
   @Override
599 599
   protected void addEventEmitters(ThemedReactContext reactContext, WebView view) {
600 600
     // Do not register default touch emitter and let WebView implementation handle touches
601
-    view.setWebViewClient(new ReactWebViewClient());
601
+    view.setWebViewClient(new RNCWebViewClient());
602 602
   }
603 603
 
604 604
   @Override
@@ -656,8 +656,8 @@ public class ReactWebViewManager extends SimpleViewManager<WebView> {
656 656
   @Override
657 657
   public void onDropViewInstance(WebView webView) {
658 658
     super.onDropViewInstance(webView);
659
-    ((ThemedReactContext) webView.getContext()).removeLifecycleEventListener((ReactWebView) webView);
660
-    ((ReactWebView) webView).cleanupCallbacksAndDestroy();
659
+    ((ThemedReactContext) webView.getContext()).removeLifecycleEventListener((RNCWebView) webView);
660
+    ((RNCWebView) webView).cleanupCallbacksAndDestroy();
661 661
   }
662 662
 
663 663
   protected WebView.PictureListener getPictureListener() {

android/src/main/java/com/infinitered/webview/ReactWebViewModule.java → android/src/main/java/com/reactnativecommunity/webview/RNCWebViewModule.java View File

@@ -1,16 +1,16 @@
1 1
 
2
-package com.infinitered.webview;
2
+package com.reactnativecommunity.webview;
3 3
 
4 4
 import com.facebook.react.bridge.ReactApplicationContext;
5 5
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
6 6
 import com.facebook.react.bridge.ReactMethod;
7 7
 import com.facebook.react.bridge.Callback;
8 8
 
9
-public class ReactWebViewModule extends ReactContextBaseJavaModule {
9
+public class RNCWebViewModule extends ReactContextBaseJavaModule {
10 10
 
11 11
   private final ReactApplicationContext reactContext;
12 12
 
13
-  public ReactWebViewModule(ReactApplicationContext reactContext) {
13
+  public RNCWebViewModule(ReactApplicationContext reactContext) {
14 14
     super(reactContext);
15 15
     this.reactContext = reactContext;
16 16
   }

android/src/main/java/com/infinitered/webview/ReactWebViewPackage.java → android/src/main/java/com/reactnativecommunity/webview/RNCWebViewPackage.java View File

@@ -1,5 +1,5 @@
1 1
 
2
-package com.infinitered.webview;
2
+package com.reactnativecommunity.webview;
3 3
 
4 4
 import java.util.Arrays;
5 5
 import java.util.Collections;
@@ -10,10 +10,10 @@ import com.facebook.react.bridge.NativeModule;
10 10
 import com.facebook.react.bridge.ReactApplicationContext;
11 11
 import com.facebook.react.uimanager.ViewManager;
12 12
 import com.facebook.react.bridge.JavaScriptModule;
13
-public class ReactWebViewPackage implements ReactPackage {
13
+public class RNCWebViewPackage implements ReactPackage {
14 14
     @Override
15 15
     public List<NativeModule> createNativeModules(ReactApplicationContext reactContext) {
16
-      return Arrays.<NativeModule>asList(new ReactWebViewModule(reactContext));
16
+      return Arrays.<NativeModule>asList(new RNCWebViewModule(reactContext));
17 17
     }
18 18
 
19 19
     // Deprecated from RN 0.47
@@ -23,7 +23,7 @@ public class ReactWebViewPackage implements ReactPackage {
23 23
 
24 24
     @Override
25 25
     public List<ViewManager> createViewManagers(ReactApplicationContext reactContext) {
26
-        ReactWebViewManager viewManager = new ReactWebViewManager();
26
+        RNCWebViewManager viewManager = new RNCWebViewManager();
27 27
         return Arrays.<ViewManager>asList(viewManager);
28 28
     }
29 29
 }

android/src/main/java/com/infinitered/webview/WebViewConfig.java → android/src/main/java/com/reactnativecommunity/webview/WebViewConfig.java View File

@@ -1,10 +1,10 @@
1
-package com.infinitered.webview;
1
+package com.reactnativecommunity.webview;
2 2
 
3 3
 import android.webkit.WebView;
4 4
 
5 5
 /**
6 6
  * Implement this interface in order to config your {@link WebView}. An instance of that
7
- * implementation will have to be given as a constructor argument to {@link ReactWebViewManager}.
7
+ * implementation will have to be given as a constructor argument to {@link RNCWebViewManager}.
8 8
  */
9 9
 public interface WebViewConfig {
10 10
 

android/src/main/java/com/infinitered/webview/events/TopLoadingErrorEvent.java → android/src/main/java/com/reactnativecommunity/webview/events/TopLoadingErrorEvent.java View File

@@ -1,4 +1,4 @@
1
-package com.infinitered.webview.events;
1
+package com.reactnativecommunity.webview.events;
2 2
 
3 3
 import com.facebook.react.bridge.WritableMap;
4 4
 import com.facebook.react.uimanager.events.Event;

android/src/main/java/com/infinitered/webview/events/TopLoadingFinishEvent.java → android/src/main/java/com/reactnativecommunity/webview/events/TopLoadingFinishEvent.java View File

@@ -1,4 +1,4 @@
1
-package com.infinitered.webview.events;
1
+package com.reactnativecommunity.webview.events;
2 2
 
3 3
 import com.facebook.react.bridge.WritableMap;
4 4
 import com.facebook.react.uimanager.events.Event;

android/src/main/java/com/infinitered/webview/events/TopLoadingStartEvent.java → android/src/main/java/com/reactnativecommunity/webview/events/TopLoadingStartEvent.java View File

@@ -1,4 +1,4 @@
1
-package com.infinitered.webview.events;
1
+package com.reactnativecommunity.webview.events;
2 2
 
3 3
 import com.facebook.react.bridge.WritableMap;
4 4
 import com.facebook.react.uimanager.events.Event;

android/src/main/java/com/infinitered/webview/events/TopMessageEvent.java → android/src/main/java/com/reactnativecommunity/webview/events/TopMessageEvent.java View File

@@ -1,4 +1,4 @@
1
-package com.infinitered.webview.events;
1
+package com.reactnativecommunity.webview.events;
2 2
 
3 3
 import com.facebook.react.bridge.WritableMap;
4 4
 import com.facebook.react.bridge.Arguments;