Make ReactExample look decent on Android as well

Mission (mostly) Accomplished!
This commit is contained in:
Scott Kyle 2016-01-19 15:10:06 -08:00
parent b3530a43ff
commit afade2530c
5 changed files with 74 additions and 38 deletions

View File

@ -6,16 +6,17 @@
const React = require('react-native'); const React = require('react-native');
const { Navigator, StyleSheet } = React; const { Navigator, Platform, StyleSheet } = React;
const { NavBarHeight, TotalNavHeight } = Navigator.NavigationBar.Styles.General;
const NAVBAR_HEIGHT = Navigator.NavigationBar.Styles.General.TotalNavHeight; const iOS = (Platform.OS == 'ios');
module.exports = StyleSheet.create({ module.exports = StyleSheet.create({
container: { container: {
flex: 1, flex: 1,
justifyContent: 'center', justifyContent: 'center',
alignItems: 'stretch', alignItems: 'stretch',
backgroundColor: '#ffffff', backgroundColor: '#fff',
}, },
navigator: { navigator: {
flex: 1, flex: 1,
@ -23,11 +24,17 @@ module.exports = StyleSheet.create({
navBar: { navBar: {
backgroundColor: '#f0727d', backgroundColor: '#f0727d',
}, },
navBarView: {
alignItems: 'center',
flexDirection: 'row',
height: NavBarHeight,
},
navBarLeftArrow: { navBarLeftArrow: {
fontSize: 36, color: '#fff',
fontSize: 40,
fontWeight: '200', fontWeight: '200',
lineHeight: 26,
letterSpacing: 2, letterSpacing: 2,
marginTop: -6,
}, },
navBarLeftButton: { navBarLeftButton: {
paddingLeft: 8, paddingLeft: 8,
@ -36,21 +43,21 @@ module.exports = StyleSheet.create({
paddingRight: 8, paddingRight: 8,
}, },
navBarText: { navBarText: {
color: '#ffffff', color: '#fff',
fontSize: 18, fontSize: 18,
marginVertical: 10,
}, },
navBarTitle: { navBarTitleText: {
fontWeight: '500', fontWeight: '500',
}, },
navScene: { navScene: {
top: NAVBAR_HEIGHT, top: TotalNavHeight,
}, },
listItem: { listItem: {
borderColor: '#c8c7cc', borderColor: '#c8c7cc',
borderBottomWidth: 0.5, borderBottomWidth: 0.5,
alignItems: 'stretch', alignItems: 'stretch',
alignSelf: 'stretch', alignSelf: 'stretch',
justifyContent: 'center',
flexDirection: 'row', flexDirection: 'row',
flex: 1, flex: 1,
height: 44, height: 44,
@ -64,20 +71,26 @@ module.exports = StyleSheet.create({
listItemCheckbox: { listItemCheckbox: {
borderColor: '#ccc', borderColor: '#ccc',
borderWidth: 1, borderWidth: 1,
textAlign: 'center',
width: 16, width: 16,
height: 16, height: 16,
lineHeight: 14, },
listItemCheckboxText: {
width: 14,
height: 14,
fontSize: iOS ? 14 : 10,
textAlign: 'center',
}, },
listItemCount: { listItemCount: {
borderColor: '#ccc', borderColor: '#ccc',
borderWidth: 1, borderWidth: 1,
borderRadius: 8, borderRadius: 8,
textAlign: 'center',
fontSize: 12,
width: 24, width: 24,
height: 18, height: 18,
lineHeight: 16, },
listItemCountText: {
backgroundColor: 'transparent',
fontSize: iOS ? 12 : 11,
textAlign: 'center',
}, },
listItemInput: { listItemInput: {
fontFamily: 'System', fontFamily: 'System',
@ -86,16 +99,17 @@ module.exports = StyleSheet.create({
flex: 1, flex: 1,
}, },
listItemText: { listItemText: {
alignSelf: 'center',
fontFamily: 'System', fontFamily: 'System',
fontSize: 15, fontSize: 15,
flexDirection: 'column', flexDirection: 'column',
flex: 1, flex: 1,
lineHeight: 30,
}, },
listItemTextSpecial: { listItemTextSpecial: {
fontStyle: 'italic', fontStyle: 'italic',
}, },
listItemDelete: { listItemDelete: {
backgroundColor: 'transparent',
paddingLeft: 12, paddingLeft: 12,
paddingRight: 12, paddingRight: 12,
flexDirection: 'column', flexDirection: 'column',

View File

@ -12,8 +12,10 @@ const styles = require('./styles');
const { const {
Navigator, Navigator,
StatusBarIOS,
Text, Text,
TouchableOpacity, TouchableOpacity,
View,
} = React; } = React;
class TodoApp extends React.Component { class TodoApp extends React.Component {
@ -43,6 +45,12 @@ class TodoApp extends React.Component {
return refs.listItemView || refs.listView; return refs.listItemView || refs.listView;
} }
componentWillMount() {
if (StatusBarIOS) {
StatusBarIOS.setStyle('light-content');
}
}
render() { render() {
let extraItems = [ let extraItems = [
{name: 'Complete', items: realm.objects('Todo', 'done = true')}, {name: 'Complete', items: realm.objects('Todo', 'done = true')},
@ -155,13 +163,13 @@ const RouteMapper = {
let prevRoute = navState.routeStack[index - 1]; let prevRoute = navState.routeStack[index - 1];
return ( return (
<TouchableOpacity <TouchableOpacity onPress={() => navigator.pop()}>
onPress={() => navigator.pop()} <View style={[styles.navBarView, styles.navBarLeftButton]}>
style={styles.navBarLeftButton}>
<Text style={styles.navBarText}>
<Text style={styles.navBarLeftArrow}></Text> <Text style={styles.navBarLeftArrow}></Text>
<Text style={styles.navBarText}>
{prevRoute.backButtonTitle || prevRoute.title || 'Back'} {prevRoute.backButtonTitle || prevRoute.title || 'Back'}
</Text> </Text>
</View>
</TouchableOpacity> </TouchableOpacity>
); );
}, },
@ -172,21 +180,23 @@ const RouteMapper = {
} }
return ( return (
<TouchableOpacity <TouchableOpacity onPress={route.onRightButtonPress}>
onPress={route.onRightButtonPress} <View style={[styles.navBarView, styles.navBarRightButton]}>
style={styles.navBarRightButton}>
<Text style={styles.navBarText}> <Text style={styles.navBarText}>
{route.rightButtonTitle} {route.rightButtonTitle}
</Text> </Text>
</View>
</TouchableOpacity> </TouchableOpacity>
); );
}, },
Title(route) { Title(route) {
return ( return (
<Text style={[styles.navBarText, styles.navBarTitle]}> <View style={styles.navBarView}>
<Text style={[styles.navBarText, styles.navBarTitleText]}>
{route.title} {route.title}
</Text> </Text>
</View>
); );
}, },
}; };

View File

@ -38,10 +38,12 @@ class TodoItem extends TodoListItem {
return ( return (
<TouchableWithoutFeedback onPress={this._onPressCheckbox}> <TouchableWithoutFeedback onPress={this._onPressCheckbox}>
<View style={styles.listItemLeftSide}> <View style={styles.listItemLeftSide}>
<Text style={styles.listItemCheckbox}> <View style={styles.listItemCheckbox}>
<Text style={styles.listItemCheckboxText}>
{this.done ? '✓' : ''} {this.done ? '✓' : ''}
</Text> </Text>
</View> </View>
</View>
</TouchableWithoutFeedback> </TouchableWithoutFeedback>
); );
} }

View File

@ -8,7 +8,15 @@ const React = require('react-native');
const realm = require('./realm'); const realm = require('./realm');
const styles = require('./styles'); const styles = require('./styles');
const { Text, TextInput, TouchableWithoutFeedback, View } = React; const {
Platform,
Text,
TextInput,
TouchableWithoutFeedback,
View,
} = React;
const iOS = (Platform.OS == 'ios');
class TodoListItem extends React.Component { class TodoListItem extends React.Component {
constructor(props) { constructor(props) {
@ -90,7 +98,7 @@ class TodoListItem extends React.Component {
return ( return (
<TouchableWithoutFeedback onPress={this.props.onPressDelete}> <TouchableWithoutFeedback onPress={this.props.onPressDelete}>
<View style={styles.listItemDelete}> <View style={styles.listItemDelete}>
<Text>𐄂</Text> <Text>{iOS ? '𐄂' : '×'}</Text>
</View> </View>
</TouchableWithoutFeedback> </TouchableWithoutFeedback>
); );

View File

@ -142,10 +142,12 @@ class TodoListExtraItem extends TodoListItem {
renderLeftSide() { renderLeftSide() {
return ( return (
<View style={styles.listItemLeftSide}> <View style={styles.listItemLeftSide}>
<Text style={styles.listItemCount}> <View style={styles.listItemCount}>
<Text style={styles.listItemCountText}>
{this.props.item.items.length} {this.props.item.items.length}
</Text> </Text>
</View> </View>
</View>
); );
} }