Merged branch master into vanvobr

Author: vanvo1605

CustomScreen.js

@@ -7,6 +7,10 @@ import {
 
 
 export default class CustomScreen extends Component {
+  constructor(props) {
+        super(props);
+        console.log("CustomScreen contructor ", this.props.feedId);
+    }
   render() {
     const leftButtonConfig = {
       title: 'Back',
@@ -18,6 +22,7 @@ export default class CustomScreen extends Component {
         <NavigationBar
           title={{ title: 'Custom screen', }}
           leftButton={leftButtonConfig} />
+          <Text>{this.props.name.title}</Text>
       </View>
     );
   }

IntialScreen.js

@@ -132,12 +132,21 @@ export default class InitialScreen extends Component {
     return (
       <TouchableHighlight onPress={() => {
           highlightRow(sectionID, rowID);
+          this.props.navigator.push({
+                name: 'CustomScreen', // Matches route.name
+                passProps: {
+                    name: feed
+                }
+            })
+
         }}>
+
+
+
         <View>
           <View style={styles.initview.row}>
             <Image style={styles.initview.thumb} source={{uri: feed.thumb}} />
             <View style={styles.initview.text}>
-
               <Text style={styles.initview.description}>{feed.title}</Text>
             </View>
           </View>
@@ -165,20 +174,13 @@ export default class InitialScreen extends Component {
   };
 
   render() {
-    const rightButtonConfig = {
-      title: 'Forward',
-      handler: () => this.props.navigator.push({
-        component: CustomScreen,
-      }),
-    };
 
     if(this.state.isLoading) {
       return this.renderLoadingView();
     };
 
-  
-
     return (
+
       <View>
           <ListView
              renderScrollComponent={props => <InfiniteScrollView {...props} />}

index.android.js

@@ -1,7 +1,8 @@
 import React, { Component } from 'react';
 import styles from  './style';
 import NavigationBar from 'react-native-navbar';
-import IntialScreen from './IntialScreen'
+import IntialScreen from './IntialScreen';
+import CustomScreen from './CustomScreen';
 import {
   AppRegistry,
   Text,
@@ -11,19 +12,26 @@ import {
 } from 'react-native';
 
 
-function renderScene(route, navigator) {
-  return <route.component route={route} navigator={navigator} />;
-}
+
 
 export default class AwesomeProject extends Component {
 
+  renderScene(route, navigator) {
+     if(route.name == 'IntialScreen') {
+       return <IntialScreen navigator={navigator} {...route.passProps} />
+     }
+     if(route.name == 'CustomScreen') {
+       return <CustomScreen navigator={navigator} {...route.passProps} />
+     }
+  }
+
   render() {
         const initialRoute = {
           component : IntialScreen
         }
         return (
             <View style={{ flex: 1, backgroundColor: '#ff9900', }}>
-              <Navigator initialRoute={initialRoute} renderScene={renderScene}/>
+              <Navigator initialRoute={{name:'IntialScreen'}} renderScene={this.renderScene} />
 
             </View>
         );