Merge pull request #17 from petterh/petterh/rename-index

Rename index file so as not to be android-specific

Author: petterh

.gitignore

@@ -1,11 +1,9 @@
 .npmrc
 
 # OSX
-#
 .DS_Store
 
 # Xcode
-#
 build/
 *.pbxuser
 !default.pbxuser
@@ -27,15 +25,16 @@ DerivedData
 ios/Pods/
 
 # Android/IntelliJ
-#
-build/
+.classpath
 .idea
 .gradle
+.project
+.settings/
+build/
 local.properties
 *.iml
 
 # node.js
-#
 node_modules/
 npm-debug.log
 yarn-error.log

README.md

@@ -30,7 +30,7 @@ The starting point for this sample is a slightly tweaked standard React Native p
 
 ![Android Demo App](img/AndroidScreenShot.png)
 
-The `TextInput` box appears only in the Android version. Since both platforms use the same JavaScript, I took the opportunity to demonstrate how to handle platform-specific tweaks – look for `Platform.select` in [`index.android.js`](index.android.js).
+The `TextInput` box appears only in the Android version. Since both platforms use the same JavaScript, I took the opportunity to demonstrate how to handle platform-specific tweaks – look for `Platform.select` in [`index.js`](index.js).
 
 ## Getting started
 
@@ -83,7 +83,7 @@ export default class ActivityDemoComponent extends Component {
           Welcome to React Native!
         </Text>
         <Text style={styles.instructions}>
-          To get started, edit index.android.js
+          To get started, edit index.js
         </Text>
         <!-- Menu buttons: https://facebook.github.io/react-native/docs/debugging -->
         <Text style={styles.instructions}>

android/app/build.gradle

@@ -20,10 +20,10 @@ final useDevSupport = !bundleInDebug
 
 project.ext.react = [
     // The name of the generated asset file containing your JS bundle
-    // bundleAssetName: "index.android.bundle",
+    bundleAssetName: "index.bundle",
 
     // The entry file for bundle generation
-    // entryFile: "index.android.js",
+    entryFile: "index.js",
 
     // Whether to bundle JS and assets in debug mode. Set this to false if you want to load
     // JavaScript from a bundler, true if you want to embed the bundle in the apk.

android/app/src/main/java/com/demo/activity/MainActivity.java

@@ -16,7 +16,7 @@
 import com.facebook.react.devsupport.interfaces.DevSupportManager;
 
 /**
- * The main activity, which hosts the React Native view registered in {@code index.android.js}.
+ * The main activity, which hosts the React Native view registered in {@code index.js}.
  */
 public final class MainActivity extends ReactActivity {
 

android/app/src/main/java/com/demo/activity/MainApplication.java

@@ -14,17 +14,50 @@
 import java.util.Arrays;
 import java.util.List;
 
+import javax.annotation.Nullable;
+
 /**
  * Base class for maintaining global application state -- in this case, the {@link ReactNativeHost}.
  */
 public final class MainApplication extends Application implements ReactApplication {
 
+    private static final String JS_BUNDLE_NAME = "index.bundle";
+    private static final String JS_MAIN_MODULE_NAME = "index";
+
     private final ReactNativeHost mReactNativeHost = new ReactNativeHost(this) {
         @Override
         public boolean getUseDeveloperSupport() {
             return BuildConfig.USE_DEVELOPER_SUPPORT;
         }
 
+        /**
+         * Returns the name of the main module. Determines the URL used to fetch the JS bundle
+         * from the packager server. It is only used when dev support is enabled.
+         */
+        @NonNull
+        @Override
+        protected String getJSMainModuleName() {
+            return JS_MAIN_MODULE_NAME;
+        }
+
+        /**
+         * Returns the name of the bundle in assets.
+         */
+        @NonNull
+        @Override
+        protected String getBundleAssetName() {
+            return JS_BUNDLE_NAME;
+        }
+
+        /**
+         * <p>
+         *     Returns a list of {@link ReactPackage}s used by the app.
+         * </p>
+         * <p>
+         *     This method is called by the React Native framework.
+         *     It is not normally called by the application itself.
+         * </p>
+         */
         @Override
         protected List<ReactPackage> getPackages() {
             return Arrays.asList(

index.android.js renamed to index.js

@@ -55,7 +55,7 @@ export default class ActivityDemoComponent extends Component {
         </Text>
         <Text style={styles.instructions}>
           <Text>To get started, edit </Text>
-          <Text style={styles.bold}>index.android.js</Text>
+          <Text style={styles.bold}>index.js</Text>
           <Text>.</Text>
         </Text>
         <Text style={styles.instructions}>

ios/Activity/AppDelegate.m

@@ -59,7 +59,7 @@ - (void) callJavaScript
 }
 
 - (NSURL *)sourceURLForBridge:(RCTBridge *)bridge {
-    NSURL *jsCodeLocation = [[RCTBundleURLProvider sharedSettings] jsBundleURLForBundleRoot:@"index.android"
+    NSURL *jsCodeLocation = [[RCTBundleURLProvider sharedSettings] jsBundleURLForBundleRoot:@"index"
                                                                            fallbackResource:nil];
     return jsCodeLocation;
 }