Merge branch 'master' of github.com:nyu-ossd-s19/react-native-progress-bar-android

vivfang · vivfang · commit 32b707a78451 · 2019-04-24T15:46:18.000-04:00
diff --git a/example/android/app/src/main/java/com/androidprogressbarexample/MainApplication.java b/example/android/app/src/main/java/com/androidprogressbarexample/MainApplication.java
@@ -28,7 +28,7 @@ protected List<ReactPackage> getPackages() {
 
     @Override
     protected String getJSMainModuleName() {
-      return "index";
+      return "example/index";
     }
   };
 
diff --git a/example/ios/AndroidProgressBarExample/AppDelegate.m b/example/ios/AndroidProgressBarExample/AppDelegate.m
@@ -33,7 +33,7 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
 - (NSURL *)sourceURLForBridge:(RCTBridge *)bridge
 {
 #if DEBUG
-  return [[RCTBundleURLProvider sharedSettings] jsBundleURLForBundleRoot:@"index" fallbackResource:nil];
+  return [[RCTBundleURLProvider sharedSettings] jsBundleURLForBundleRoot:@"example/index" fallbackResource:nil];
 #else
   return [[NSBundle mainBundle] URLForResource:@"main" withExtension:@"jsbundle"];
 #endif

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ protected List<ReactPackage> getPackages() {`
`28`	`28`
`29`	`29`	`@Override`
`30`	`30`	`protected String getJSMainModuleName() {`
`31`		`- return "index";`
	`31`	`+ return "example/index";`
`32`	`32`	`}`
`33`	`33`	`};`
`34`	`34`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(`
`33`	`33`	`- (NSURL )sourceURLForBridge:(RCTBridge )bridge`
`34`	`34`	`{`
`35`	`35`	`#if DEBUG`
`36`		`- return [[RCTBundleURLProvider sharedSettings] jsBundleURLForBundleRoot:@"index" fallbackResource:nil];`
	`36`	`+ return [[RCTBundleURLProvider sharedSettings] jsBundleURLForBundleRoot:@"example/index" fallbackResource:nil];`
`37`	`37`	`#else`
`38`	`38`	`return [[NSBundle mainBundle] URLForResource:@"main" withExtension:@"jsbundle"];`
`39`	`39`	`#endif`