diff --git a/docs/DevelopmentSetupAndroid.md b/docs/DevelopmentSetupAndroid.md index 9eee76088..0d7265c9d 100644 --- a/docs/DevelopmentSetupAndroid.md +++ b/docs/DevelopmentSetupAndroid.md @@ -72,7 +72,8 @@ Genymotion is much easier to set up than stock Google emulators. However, it's o * Intel x86 Atom System Image (for Android 5.1.1 - API 22) * Intel x86 Emulator Accelerator (HAXM installer) 2. Click "Install Packages". -3. [Configure hardware acceleration (HAXM)](http://developer.android.com/tools/devices/emulator.html#vm-mac), otherwise the emulator is going to be slow. +3. [Configure hardware acceleration (HAXM)](http://developer.android.com/tools/devices/emulator.html#vm-mac), otherwise the emulator is going to be slow (or may not run at all). + * On a mac this is typically requires opening: `/usr/local/opt/android-sdk/extras/intel/Hardware_Accelerated_Execution_Manager/IntelHAXM_.dmg` and installing the package within. 4. Create an Android Virtual Device (AVD): 1. Run `android avd` and click on **Create...** ![Create AVD dialog](img/CreateAVD.png) diff --git a/docs/Tutorial.md b/docs/Tutorial.md index 1e0be8a20..ec5a4d72b 100644 --- a/docs/Tutorial.md +++ b/docs/Tutorial.md @@ -29,13 +29,21 @@ After installing these dependencies there are two simple commands to get a React This command fetches the React Native source code and dependencies and then creates a new Xcode project in `AwesomeProject/iOS/AwesomeProject.xcodeproj` and a gradle project in `AwesomeProject/android/app`. -## Development +## Overview -For iOS, you can now open this new project (`AwesomeProject/ios/AwesomeProject.xcodeproj`) in Xcode and simply build and run it with `⌘+R`. Doing so will also start a Node server which enables live code reloading. With this you can see your changes by pressing `⌘+R` in the simulator rather than recompiling in Xcode. +In this tutorial we'll be building a simple version of the Movies app that fetches 25 movies that are in theaters and displays them in a ListView. -For Android, run `react-native run-android` from `AwesomeProject` to install the generated app on your emulator or device, and start the Node server which enables live code reloading. To see your changes you have to open the rage-shake-menu (either shake the device or press the menu button on devices, press F2 or Page Up for emulator, ⌘+M for Genymotion), and then press `Reload JS`. +### Starting the app on iOS -For this tutorial we'll be building a simple version of the Movies app that fetches 25 movies that are in theaters and displays them in a ListView. +Open this new project (`AwesomeProject/ios/AwesomeProject.xcodeproj`) in Xcode and simply build and run it with `⌘+R`. Doing so will also start a Node server which enables live code reloading. With this you can see your changes by pressing `⌘+R` in the simulator rather than recompiling in Xcode. + +### Starting the app on Android + +In your terminal navigate into the `AwesomeProject` and run: + + react-native run-android + +This will install the generated app on your emulator or device, as well as start the Node server which enables live code reloading. To see your changes you have to open the rage-shake-menu (either shake the device or press the menu button on devices, press F2 or Page Up for emulator, ⌘+M for Genymotion), and then press `Reload JS`. ### Hello World