From 02276bfbebbc4dbeba0fd4288e8abbdb5fa9ce95 Mon Sep 17 00:00:00 2001
From: horizon0514 <huangsy@huangsydeMacBook-Air.local>
Date: Sun, 13 Dec 2015 16:21:17 +0800
Subject: [PATCH] fix viewPager

---
 MainScreen.js                                 | 18 +++------
 Slider.js                                     | 38 ++++++++++++++++---
 .../xcschemes/RNZhihuDaily.xcscheme           | 11 ++++--
 3 files changed, 45 insertions(+), 22 deletions(-)

diff --git a/MainScreen.js b/MainScreen.js
index c65e82a..bd63f8d 100644
--- a/MainScreen.js
+++ b/MainScreen.js
@@ -157,7 +157,7 @@ class MainScreen extends Component {
     var spinner = <ActivityIndicatorIOS style={styles.centering} hidden='false' size='large'/>;
     var slider = this.state.sliderDataSource? 
                   (<View style={styles.sliderContainer}>
-                    <Slider style={styles.slider} dataSource={this.state.sliderDataSource}/>
+                    <Slider dataSource={this.state.sliderDataSource}/>
                     </View>)
                   :(<View></View>);  
     if(!this.state.loaded){
@@ -169,7 +169,7 @@ class MainScreen extends Component {
           <View style={styles.container}>
               <View style={styles.header}></View>
               {slider}
-              <ListView style={styles.listview}
+              <ListView
                 dataSource={this.state.dataSource}
                 renderSectionHeader={this.renderSectionHeader.bind(this)}
                 renderFooter={this.renderFooter.bind(this)}
@@ -236,17 +236,11 @@ var styles = StyleSheet.create({
 
   },
   sliderContainer:{
-    height: 700,
-    flex: 1,
-    //flexDirection: 'column',
-
-  },
-  slider:{
-    height: 700,
+    height: 200,
+    
   },
-  listview:{
-    marginTop: -150,
-  }
+  
+  
 });
 
 module.exports = MainScreen;
\ No newline at end of file
diff --git a/Slider.js b/Slider.js
index 8063a96..708d833 100644
--- a/Slider.js
+++ b/Slider.js
@@ -37,18 +37,23 @@ class Slider extends Component{
 	_renderPage(data,pageId){
 		console.log(data);
 		return (
-      		<Image
-        		source={{uri: data.image}}
-        		style={styles.page} />
+			<View style={styles.container}>
+	      		<Image
+	        		source={{uri: data.image}}
+	        		style={styles.page}>
+	        	<View style={styles.titleContainer}>	
+	        		<Text style={styles.title}>{data.title}</Text>	
+	        	</View>
+	        	
+	        	</Image>
+	        </View>		
     		);
 	}
 
 	render(){
-		console.log('render slider');
-		console.log(this.props);
 		return (
 			<ViewPager
-		        style={{flex:1,height: 200}}
+		        style={this.props.style}
 		        dataSource={this.state.dataSource}
 		        renderPage={this._renderPage}
 		        isLoop={true}
@@ -58,11 +63,32 @@ class Slider extends Component{
 }
 
 var styles = StyleSheet.create({
+	container: {
+		
+	},
 	page: {
 		height: 200,
 		width: deviceWidth,
+		
 
 	},
+	titleContainer: {
+		flex: 1,
+		padding: 20,
+		
+		
+	},
+  
+	title: {
+	    color: '#ffffff',
+	    fontSize: 20,
+	    fontWeight : 'bold',
+	    position: 'absolute',
+	    bottom: 20,
+	    
+	    //backgroundColor: 'transparent',
+	  }
+  
 	
 });
 
diff --git a/ios/RNZhihuDaily.xcodeproj/xcshareddata/xcschemes/RNZhihuDaily.xcscheme b/ios/RNZhihuDaily.xcodeproj/xcshareddata/xcschemes/RNZhihuDaily.xcscheme
index 5e32375..2802215 100644
--- a/ios/RNZhihuDaily.xcodeproj/xcshareddata/xcschemes/RNZhihuDaily.xcscheme
+++ b/ios/RNZhihuDaily.xcodeproj/xcshareddata/xcschemes/RNZhihuDaily.xcscheme
@@ -37,10 +37,10 @@
       </BuildActionEntries>
    </BuildAction>
    <TestAction
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      buildConfiguration = "Debug">
+      shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
             skipped = "NO">
@@ -62,15 +62,18 @@
             ReferencedContainer = "container:RNZhihuDaily.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
    </TestAction>
    <LaunchAction
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Debug"
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
       allowLocationSimulation = "YES">
       <BuildableProductRunnable
          runnableDebuggingMode = "0">
@@ -86,10 +89,10 @@
       </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
+      buildConfiguration = "Release"
       shouldUseLaunchSchemeArgsEnv = "YES"
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Release"
       debugDocumentVersioning = "YES">
       <BuildableProductRunnable
          runnableDebuggingMode = "0">