fix example

Author: Pavlo Aksonov

example/.buckconfig

@@ -16,7 +16,7 @@ var {
 	TextInput
 } = ReactNative;
 
-var Controllers = require('react-native-controllers');
+var Controllers = require('react-native-ios-controllers');
 const {NavigationToolBarIOS} = Controllers;
 var {height, width} = Dimensions.get('window');
 

example/.flowconfig

@@ -14,7 +14,7 @@ var {
   NativeAppEventEmitter
 } = ReactNative;
 
-var Controllers = require('react-native-controllers');
+var Controllers = require('react-native-ios-controllers');
 
 var FavoritesScreen = React.createClass({
 
@@ -45,9 +45,7 @@ var FavoritesScreen = React.createClass({
               </TouchableOpacity>
             }
 
-            <TouchableOpacity onPress={ ()=>    Controllers.CubeBarControllerIOS("main").switchTo({
-              tabIndex: 0
-            }) }>
+            <TouchableOpacity onPress={ this.onButtonClick.bind(this, 'plain') }>
               <Text style={styles.button}>Push Plain Screen</Text>
             </TouchableOpacity>
 

example/.gitignore

@@ -11,7 +11,7 @@ var {
   Dimensions
 } = ReactNative;
 
-var Controllers = require('react-native-controllers');
+var Controllers = require('react-native-ios-controllers');
 var {
   Modal,
 } = Controllers;

example/.watchmanconfig

@@ -10,7 +10,7 @@ var {
   TouchableOpacity
 } = ReactNative;
 
-var Controllers = require('react-native-controllers');
+var Controllers = require('react-native-ios-controllers');
 var {
   Modal,
   ControllerRegistry

example/ExtraScreen.js

@@ -13,7 +13,7 @@ var {
 
 require('./LightBox');
 
-var Controllers = require('react-native-controllers');
+var Controllers = require('react-native-ios-controllers');
 var {
   Modal,
   ControllerRegistry,

example/FavoritesScreen.js

@@ -13,7 +13,7 @@ var {
 require('./LightBox');
 require('./Notification');
 
-var Controllers = require('react-native-controllers');
+var Controllers = require('react-native-ios-controllers');
 var {
     Modal,
     ControllerRegistry,
@@ -106,10 +106,7 @@ var MovieListScreen = React.createClass({
                     There's a right and a left side menu in this example. Control the side menu animation using the options below:
                 </Text>
 
-                <TouchableOpacity onPress={ ()=>    Controllers.CubeBarControllerIOS("main").switchTo({
-                  tabIndex: 1
-                })}>
-                  
+                <TouchableOpacity onPress={ this.onButtonClick.bind(this, Constants.MMDRAWER_DOOR) } >
                     <Text style={styles.button}>Door</Text>
                 </TouchableOpacity>
 

example/LightBox.js

@@ -12,7 +12,7 @@ var {
   Dimensions
 } = ReactNative;
 
-var Controllers = require('react-native-controllers');
+var Controllers = require('react-native-ios-controllers');
 var {
   Notification,
 } = Controllers;

example/ModalScreen.js

@@ -10,7 +10,7 @@ var {
   TouchableOpacity
 } = ReactNative;
 
-var Controllers = require('react-native-controllers');
+var Controllers = require('react-native-ios-controllers');
 var {
   Modal
 } = Controllers;

example/MoreDrawerOptionsScreen.js

@@ -10,7 +10,7 @@ var {
   TouchableOpacity
 } = ReactNative;
 
-var Controllers = require('react-native-controllers');
+var Controllers = require('react-native-ios-controllers');
 
 var PushedScreen = React.createClass({
 

example/MovieListScreen.js

@@ -11,7 +11,7 @@ var {
   TouchableOpacity
 } = ReactNative;
 
-var Controllers = require('react-native-controllers');
+var Controllers = require('react-native-ios-controllers');
 var { Modal } = Controllers;
 
 var badgeCounter = 1;

example/Notification.js

@@ -9,7 +9,7 @@ var {
   View
 } = ReactNative;
 
-var Controllers = require('react-native-controllers');
+var Controllers = require('react-native-ios-controllers');
 var {
   Modal,
   ControllerRegistry

example/PushedModalScreen.js

@@ -1,15 +1,14 @@
 'use strict';
 
-var Controllers = require('react-native-controllers');
+var Controllers = require('react-native-ios-controllers');
 
 var React = Controllers.hijackReact();
 var {
   ControllerRegistry,
   TabBarControllerIOS,
   NavigationControllerIOS,
   ViewControllerIOS,
-  DrawerControllerIOS,
-  CubeBarControllerIOS,
+  DrawerControllerIOS
 } = React;
 
 // require all top level react components you refer to in the layout
@@ -32,31 +31,31 @@ var MoviesApp = Controllers.createClass({
                            type="MMDrawer"
                            animationType="slide"
                            style={{contentOverlayColor:'#162D3D55'}}>
-        <CubeBarControllerIOS id="main">
-          <CubeBarControllerIOS.Item title="Movies" icon={require('./img/home.png')} selectedIcon={require('./img/home_selected.png')}>
+        <TabBarControllerIOS id="main">
+          <TabBarControllerIOS.Item title="Movies" icon={require('./img/home.png')} selectedIcon={require('./img/home_selected.png')}>
             <NavigationControllerIOS
               title="Red Title"
               component="MovieListScreen"
               id="movies_nav"
               style={{navBarTextColor: '#ff0000', drawUnderNavBar: false, drawUnderTabBar: true}}
             />
-          </CubeBarControllerIOS.Item>
-          <CubeBarControllerIOS.Item title="Favorites" icon={require('./img/star.png')} selectedIcon={require('./img/star_selected.png')}>
+          </TabBarControllerIOS.Item>
+          <TabBarControllerIOS.Item title="Favorites" icon={require('./img/star.png')} selectedIcon={require('./img/star_selected.png')}>
             <NavigationControllerIOS
               title="Favorites"
               component="FavoritesScreen"
               id="favorites_nav"
               passProps={{hidePop: true}}
               style={{drawUnderNavBar: true, navBarTranslucent: true}}
             />
-          </CubeBarControllerIOS.Item>
-          <CubeBarControllerIOS.Item title="Search" icon={require('./img/discover.png')} selectedIcon={require('./img/discover_selected.png')}>
+          </TabBarControllerIOS.Item>
+          <TabBarControllerIOS.Item title="Search" icon={require('./img/discover.png')} selectedIcon={require('./img/discover_selected.png')}>
             <ViewControllerIOS
               component="SearchScreen"
               style={{ drawUnderTabBar: true }}
             />
-          </CubeBarControllerIOS.Item>
-        </CubeBarControllerIOS>
+          </TabBarControllerIOS.Item>
+        </TabBarControllerIOS>
       </DrawerControllerIOS>
     );
   }

example/PushedScreen.js

@@ -22,7 +22,7 @@
 		13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; };
 		146834051AC3E58100842450 /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 146834041AC3E56700842450 /* libReact.a */; };
 		832341BD1AAA6AB300B99B32 /* libRCTText.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 832341B51AAA6A8300B99B32 /* libRCTText.a */; };
-		CC8006F21C7FBB6B00A9E411 /* libReactNativeControllers.a in Frameworks */ = {isa = PBXBuildFile; fileRef = CC8006F11C7FBB3E00A9E411 /* libReactNativeControllers.a */; };
+		874DDD941D7D75B00047A28E /* libReactNativeControllers.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 874DDD931D7D75880047A28E /* libReactNativeControllers.a */; };
 		D82DBFAB1C886D4200E0E3BC /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 146834041AC3E56700842450 /* libReact.a */; };
 /* End PBXBuildFile section */
 
@@ -104,9 +104,9 @@
 			remoteGlobalIDString = 58B5119B1A9E6C1200147676;
 			remoteInfo = RCTText;
 		};
-		CC8006F01C7FBB3E00A9E411 /* PBXContainerItemProxy */ = {
+		874DDD921D7D75880047A28E /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
-			containerPortal = CC8006E21C7FBB3E00A9E411 /* ReactNativeControllers.xcodeproj */;
+			containerPortal = 874DDD8E1D7D75880047A28E /* ReactNativeControllers.xcodeproj */;
 			proxyType = 2;
 			remoteGlobalIDString = D8AFADBD1BEE6F3F00A4592D;
 			remoteInfo = ReactNativeControllers;
@@ -135,7 +135,7 @@
 		146833FF1AC3E56700842450 /* React.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = React.xcodeproj; path = "../node_modules/react-native/React/React.xcodeproj"; sourceTree = "<group>"; };
 		78C398B01ACF4ADC00677621 /* RCTLinking.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTLinking.xcodeproj; path = "../node_modules/react-native/Libraries/LinkingIOS/RCTLinking.xcodeproj"; sourceTree = "<group>"; };
 		832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTText.xcodeproj; path = "../node_modules/react-native/Libraries/Text/RCTText.xcodeproj"; sourceTree = "<group>"; };
-		CC8006E21C7FBB3E00A9E411 /* ReactNativeControllers.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = ReactNativeControllers.xcodeproj; path = "../node_modules/react-native-controllers/ios/ReactNativeControllers.xcodeproj"; sourceTree = "<group>"; };
+		874DDD8E1D7D75880047A28E /* ReactNativeControllers.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = ReactNativeControllers.xcodeproj; path = "../node_modules/react-native-ios-controllers/ios/ReactNativeControllers.xcodeproj"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -151,7 +151,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				CC8006F21C7FBB6B00A9E411 /* libReactNativeControllers.a in Frameworks */,
+				874DDD941D7D75B00047A28E /* libReactNativeControllers.a in Frameworks */,
 				146834051AC3E58100842450 /* libReact.a in Frameworks */,
 				00C302E51ABCBA2D00DB3ED1 /* libRCTActionSheet.a in Frameworks */,
 				00C302E71ABCBA2D00DB3ED1 /* libRCTGeolocation.a in Frameworks */,
@@ -274,7 +274,7 @@
 		832341AE1AAA6A7D00B99B32 /* Libraries */ = {
 			isa = PBXGroup;
 			children = (
-				CC8006E21C7FBB3E00A9E411 /* ReactNativeControllers.xcodeproj */,
+				874DDD8E1D7D75880047A28E /* ReactNativeControllers.xcodeproj */,
 				146833FF1AC3E56700842450 /* React.xcodeproj */,
 				00C302A71ABCB8CE00DB3ED1 /* RCTActionSheet.xcodeproj */,
 				00C302B51ABCB90400DB3ED1 /* RCTGeolocation.xcodeproj */,
@@ -318,10 +318,10 @@
 			name = Products;
 			sourceTree = "<group>";
 		};
-		CC8006E31C7FBB3E00A9E411 /* Products */ = {
+		874DDD8F1D7D75880047A28E /* Products */ = {
 			isa = PBXGroup;
 			children = (
-				CC8006F11C7FBB3E00A9E411 /* libReactNativeControllers.a */,
+				874DDD931D7D75880047A28E /* libReactNativeControllers.a */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -433,8 +433,8 @@
 					ProjectRef = 146833FF1AC3E56700842450 /* React.xcodeproj */;
 				},
 				{
-					ProductGroup = CC8006E31C7FBB3E00A9E411 /* Products */;
-					ProjectRef = CC8006E21C7FBB3E00A9E411 /* ReactNativeControllers.xcodeproj */;
+					ProductGroup = 874DDD8F1D7D75880047A28E /* Products */;
+					ProjectRef = 874DDD8E1D7D75880047A28E /* ReactNativeControllers.xcodeproj */;
 				},
 			);
 			projectRoot = "";
@@ -516,11 +516,11 @@
 			remoteRef = 832341B41AAA6A8300B99B32 /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
-		CC8006F11C7FBB3E00A9E411 /* libReactNativeControllers.a */ = {
+		874DDD931D7D75880047A28E /* libReactNativeControllers.a */ = {
 			isa = PBXReferenceProxy;
 			fileType = archive.ar;
 			path = libReactNativeControllers.a;
-			remoteRef = CC8006F01C7FBB3E00A9E411 /* PBXContainerItemProxy */;
+			remoteRef = 874DDD921D7D75880047A28E /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
 /* End PBXReferenceProxy section */
@@ -648,7 +648,7 @@
 					"$(inherited)",
 					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
 					"$(SRCROOT)/../node_modules/react-native/React/**",
-					"$(SRCROOT)/../node_modules/react-native-controllers/ios/**",
+					"$(SRCROOT)/../node_modules/react-native-ios-controllers/ios/**",
 				);
 				INFOPLIST_FILE = ControllersExample/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
@@ -669,7 +669,7 @@
 					"$(inherited)",
 					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
 					"$(SRCROOT)/../node_modules/react-native/React/**",
-					"$(SRCROOT)/../node_modules/react-native-controllers/ios/**",
+					"$(SRCROOT)/../node_modules/react-native-ios-controllers/ios/**",
 				);
 				INFOPLIST_FILE = ControllersExample/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;

example/README.md

@@ -8,6 +8,6 @@
   "dependencies": {
     "react-native": "0.31.0",
     "react": "15.2.1",
-    "react-native-controllers": "file:../"
+    "react-native-ios-controllers": "file:../"
   }
 }

example/SearchScreen.js

@@ -7,7 +7,7 @@
     "type": "git",
     "url": "git+https://github.com/aksonov/react-native-controllers.git"
   },
-  "version": "2.1.2.0",
+  "version": "2.1.2",
   "description": "React Native iOS Controllers (fork of react-native-controllers)",
   "nativePackage": true,
   "bugs": {
@@ -18,8 +18,8 @@
   "author": "Tal Kol <[email protected]>",
   "license": "MIT",
   "peerDependencies": {
-    "react-native": ">=0.25.1",
-    "react": ">=0.14.5"
+    "react-native": "0.31.0",
+    "react": "15.2.1"
   },
   "directories": {
     "example": "example"