- [react-packager] Switch from Q to Bluebird as promises library | Pilwon Huh

- [Touchable] Change default `activeOpacity` to 0.2 to match iOS | James Ide
- [ReactNative] Normalize name for examples | Christopher Chedeau
- [ReactNative] Added support for 3 digit hex colors | Arthur Lee
- [react-packager] Fix EISDIR error | Amjad Masad
- make renderError and renderLoading props optional for WebView | Don Yu

Examples/UIExplorer/ListViewPagingExample.js

@@ -11,7 +11,6 @@
  * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  *
- * @providesModule ListViewPagingExample
  * @flow
  */
 'use strict';

Examples/UIExplorer/UIExplorer.xcodeproj/project.pbxproj.rej

@@ -1,72 +0,0 @@
-diff a/Libraries/FBReactKit/js/react-native-github/Examples/UIExplorer/UIExplorer.xcodeproj/project.pbxproj b/Libraries/FBReactKit/js/react-native-github/Examples/UIExplorer/UIExplorer.xcodeproj/project.pbxproj	(rejected hunks)
-@@ -19,6 +19,7 @@
- 		13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; };
- 		13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; };
- 		147CED4C1AB3532B00DA3E4C /* libRCTActionSheet.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 147CED4B1AB34F8C00DA3E4C /* libRCTActionSheet.a */; };
-+		D85B829E1AB6D5D7003F4FE2 /* libRCTVibration.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D85B829C1AB6D5CE003F4FE2 /* libRCTVibration.a */; };
- /* End PBXBuildFile section */
- 
- /* Begin PBXContainerItemProxy section */
-@@ -78,6 +79,13 @@
- 			remoteGlobalIDString = 134814201AA4EA6300B7C361;
- 			remoteInfo = RCTActionSheet;
- 		};
-+		D85B829B1AB6D5CE003F4FE2 /* PBXContainerItemProxy */ = {
-+			isa = PBXContainerItemProxy;
-+			containerPortal = D85B82911AB6D5CE003F4FE2 /* RCTVibration.xcodeproj */;
-+			proxyType = 2;
-+			remoteGlobalIDString = 832C81801AAF6DEF007FA2F7;
-+			remoteInfo = RCTVibration;
-+		};
- /* End PBXContainerItemProxy section */
- 
- /* Begin PBXFileReference section */
-@@ -98,6 +106,7 @@
- 		13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
- 		13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
- 		14E0EEC81AB118F7000DECC3 /* RCTActionSheet.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTActionSheet.xcodeproj; path = ../../Libraries/ActionSheetIOS/RCTActionSheet.xcodeproj; sourceTree = "<group>"; };
-+		D85B82911AB6D5CE003F4FE2 /* RCTVibration.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTVibration.xcodeproj; path = ../../Libraries/Vibration/RCTVibration.xcodeproj; sourceTree = "<group>"; };
- /* End PBXFileReference section */
- 
- /* Begin PBXFrameworksBuildPhase section */
-@@ -112,6 +121,7 @@
- 			isa = PBXFrameworksBuildPhase;
- 			buildActionMask = 2147483647;
- 			files = (
-+				D85B829E1AB6D5D7003F4FE2 /* libRCTVibration.a in Frameworks */,
- 				147CED4C1AB3532B00DA3E4C /* libRCTActionSheet.a in Frameworks */,
- 				134454601AAFCABD003F0779 /* libRCTAdSupport.a in Frameworks */,
- 				134A8A2A1AACED7A00945AAE /* libRCTGeolocation.a in Frameworks */,
-@@ -145,6 +155,7 @@
- 		1316A21D1AA397F400C0188E /* Libraries */ = {
- 			isa = PBXGroup;
- 			children = (
-+				D85B82911AB6D5CE003F4FE2 /* RCTVibration.xcodeproj */,
- 				14E0EEC81AB118F7000DECC3 /* RCTActionSheet.xcodeproj */,
- 				13417FFA1AA91531003F314A /* ReactKit.xcodeproj */,
- 				134454551AAFCAAE003F0779 /* RCTAdSupport.xcodeproj */,
-@@ -334,6 +353,10 @@
- 					ProjectRef = 13417FEA1AA914B8003F314A /* RCTText.xcodeproj */;
- 				},
- 				{
-+					ProductGroup = D85B82921AB6D5CE003F4FE2 /* Products */;
-+					ProjectRef = D85B82911AB6D5CE003F4FE2 /* RCTVibration.xcodeproj */;
-+				},
-+				{
- 					ProductGroup = 13417FFB1AA91531003F314A /* Products */;
- 					ProjectRef = 13417FFA1AA91531003F314A /* ReactKit.xcodeproj */;
- 				},
-@@ -396,6 +419,13 @@
- 			remoteRef = 147CED4A1AB34F8C00DA3E4C /* PBXContainerItemProxy */;
- 			sourceTree = BUILT_PRODUCTS_DIR;
- 		};
-+		D85B829C1AB6D5CE003F4FE2 /* libRCTVibration.a */ = {
-+			isa = PBXReferenceProxy;
-+			fileType = archive.ar;
-+			path = libRCTVibration.a;
-+			remoteRef = D85B829B1AB6D5CE003F4FE2 /* PBXContainerItemProxy */;
-+			sourceTree = BUILT_PRODUCTS_DIR;
-+		};
- /* End PBXReferenceProxy section */
- 
- /* Begin PBXResourcesBuildPhase section */

Examples/UIExplorer/UIExplorerList.js

@@ -33,19 +33,19 @@ var { TestModule } = React.addons;
 var createExamplePage = require('./createExamplePage');
 
 var COMPONENTS = [
-  require('./ActivityIndicatorExample'),
-  require('./DatePickerExample'),
+  require('./ActivityIndicatorIOSExample'),
+  require('./DatePickerIOSExample'),
   require('./ImageExample'),
+  require('./ListViewExample'),
   require('./ListViewPagingExample'),
-  require('./ListViewSimpleExample'),
   require('./MapViewExample'),
   require('./NavigatorIOSExample'),
   NavigatorExample,
-  require('./PickerExample'),
+  require('./PickerIOSExample'),
   require('./ScrollViewExample'),
   require('./SliderIOSExample'),
-  require('./SwitchExample'),
-  require('./TabBarExample'),
+  require('./SwitchIOSExample'),
+  require('./TabBarIOSExample'),
   require('./TextExample.ios'),
   require('./TextInputExample'),
   require('./TouchableExample'),

Examples/UIExplorer/WebViewExample.js

@@ -18,7 +18,6 @@
 var React = require('react-native');
 var StyleSheet = require('StyleSheet');
 var {
-  ActivityIndicatorIOS,
   StyleSheet,
   Text,
   TextInput,
@@ -95,8 +94,6 @@ var WebViewExample = React.createClass({
           automaticallyAdjustContentInsets={false}
           style={styles.webView}
           url={this.state.url}
-          renderError={this.renderError}
-          renderLoading={this.renderLoading}
           onNavigationStateChange={this.onNavigationStateChange}
           startInLoadingState={true}
         />
@@ -129,33 +126,6 @@ var WebViewExample = React.createClass({
     });
   },
 
-  renderError: function(errorDomain, errorCode, errorDesc) {
-    return (
-      <View style={styles.errorContainer}>
-        <Text style={styles.errorTextTitle}>
-          Error loading page
-        </Text>
-        <Text style={styles.errorText}>
-          {'Domain: ' + errorDomain}
-        </Text>
-        <Text style={styles.errorText}>
-          {'Error Code: ' + errorCode}
-        </Text>
-        <Text style={styles.errorText}>
-          {'Description: ' + errorDesc}
-        </Text>
-      </View>
-    );
-  },
-
-  renderLoading: function() {
-    return (
-      <View style={styles.loadingView}>
-        <ActivityIndicatorIOS />
-      </View>
-    );
-  },
-
   onSubmitEditing: function(event) {
     this.pressGoButton();
   },
@@ -230,28 +200,6 @@ var styles = StyleSheet.create({
     borderRadius: 3,
     alignSelf: 'stretch',
   },
-  loadingView: {
-    backgroundColor: BGWASH,
-    flex: 1,
-    justifyContent: 'center',
-    alignItems: 'center',
-  },
-  errorContainer: {
-    flex: 1,
-    justifyContent: 'center',
-    alignItems: 'center',
-    backgroundColor: BGWASH,
-  },
-  errorTextTitle: {
-    fontSize: 15,
-    fontWeight: '500',
-    marginBottom: 10,
-  },
-  errorText: {
-    fontSize: 14,
-    textAlign: 'center',
-    marginBottom: 2,
-  },
   statusBar: {
     flexDirection: 'row',
     alignItems: 'center',