more changes to make app live

rsperberg · Nov 21, 2015 · 5b18f89 · 5b18f89
1 parent 91a0c8f
commit 5b18f89
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/WeatherProject/WeatherProject.js b/WeatherProject/WeatherProject.js
@@ -43,6 +43,13 @@ var WeatherProject = React.createClass({
 
   },
   render() {
+  	var content = null;
+  	if (this.state.forecast !== null) {
+  		content = <Forecast
+  					main={this.state.forecast.main}
+  					description={this.state.forecast.description}
+  					temp={this.state.forecast.temp} />;
+  	}
     return (
     <View style={styles.container}>
 		<Image source={require('image!flowers')}
@@ -60,17 +67,16 @@ var WeatherProject = React.createClass({
 					     	onSubmitEditing={this._handleTextChange} />
 					</View>
 				</View>
-			    <Forecast
-			    	main={this.state.forecast.main}
-			    	description={this.state.forecast.description}
-			    	temp={this.state.forecast.temp} />
+			    {content}
 			</View>
 		</Image>
 	</View>
     );
   }
 });
 
+var baseFontSize = 16;
+
 var styles = StyleSheet.create({
   container: {
     flex: 1,

diff --git a/WeatherProject/ios/WeatherProject.xcodeproj/project.pbxproj b/WeatherProject/ios/WeatherProject.xcodeproj/project.pbxproj
@@ -625,6 +625,7 @@
 					"$(SRCROOT)/../node_modules/react-native/React/**",
 				);
 				INFOPLIST_FILE = WeatherProject/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_BUNDLE_IDENTIFIER = org.reactjs.native.example.WeatherProjector;
@@ -645,6 +646,7 @@
 					"$(SRCROOT)/../node_modules/react-native/React/**",
 				);
 				INFOPLIST_FILE = WeatherProject/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_BUNDLE_IDENTIFIER = org.reactjs.native.example.WeatherProjector;