update design

view/ItemShopingCart.js

@@ -76,7 +76,7 @@ class ItemShoping extends React.Component {
                     </View>
 
                 </Modal>
-                <View style={{ flex: 1, flexDirection: 'row', height: 100 }}>
+                <View style={{ flex: 1, flexDirection: 'row', height: 100, marginVertical:5 }}>
                     <View style={{ flex: 1, height: 100 }}>
                         <TouchableOpacity onPress={() => this.props.navigation.navigate('Menu Detail', { nameMenu: item.name, desc: item.description, image: item.image })}>
                             <Image source={{ uri: item.image }} style={{ height: 100, width: 100, borderRadius: 10, }}></Image>

view/MenuConfirmation.js

@@ -218,7 +218,7 @@ class MenuConfirmation extends React.Component {
                 {/* <View style={{ margin: 10, padding: 20, borderBottomWidth: 1 }}>
                     <Text style={{ fontSize: 12, fontFamily: 'Gotham-Light', textAlign: 'center' }}>{moment().utcOffset('+07:00').format('DD MMMM YYYY HH:mm:ss')}</Text>
                 </View> */}
-                <View style={{ flex: 1, flexDirection: 'row', borderBottomWidth: 1, borderColor:'#838383', margin: 10, paddingBottom: 30, padding: 10 }}>
+                <View style={{ flex: 1, flexDirection: 'row', borderBottomWidth: 1, borderColor:'#838383', margin: 10, paddingBottom: 20, padding: 10 }}>
                     <View style={{ flex: 0.1, justifyContent: 'center' }}>
                         <FontAwesome name="map-marker" size={24} color="red" />
                     </View>

view/OrderHistory.js

@@ -65,7 +65,7 @@ class OrderHistory extends React.Component {
         return (
             <View style={styles.container}>
                 <View style={styles.header}>
-                    <Text style={{ color: 'white', textAlign: 'center', fontSize: 18, fontFamily: 'Gotham-Black' }}>ORDER HISTORY</Text>
+                    <Text style={{ color: 'white', textAlign: 'center', fontSize: 20, fontFamily: 'Gotham-Black' }}>ORDER HISTORY</Text>
                 </View>
                 <ScrollView style={styles.body}>
                     {this.state.indicator == true ? (<ActivityIndicator style={{ justifyContent: "center" }} size="large" color="#c9af6d" />) :
@@ -73,20 +73,20 @@ class OrderHistory extends React.Component {
                             this.state.order_list.map((item, key) => (
                                 <TouchableOpacity key={key} onPress={() => this.props.navigation.navigate('Order Detail', { idTrans: item.id })}>
                                     <View style={{ marginTop: 5 }} key={key}>
-                                        <View style={{ flex: 2, height: 120, margin: 5, borderRadius: 5, borderWidth: 1, flexDirection: 'row' }}>
-                                            <View style={{ justifyContent: 'center', margin: 10 }}>
+                                        <View style={{ flex: 2, height: 120, margin: 5, borderRadius: 5, borderWidth: 1, borderColor:'#838383', flexDirection: 'row' }}>
+                                            <View style={{ flex:1.1, justifyContent: 'center', margin: 10}}>
                                                 <Text style={{ fontFamily: 'Gotham-Black', color: 'grey', fontSize: 12, margin: 2 }}>{item.outlet}</Text>
                                                 <Text style={{ fontFamily: 'Gotham-Light', color: 'grey', fontSize: 12, margin: 2 }}>{moment(item.trans_time).format("DD MMMM YYYY, hh:mm A")}</Text>
-                                                <Text style={{ fontFamily: 'Gotham-Black', color: '#c9af6d', fontSize: 12, margin: 2 }}>{item.trans_type_display}</Text>
+                                                <Text style={{ fontFamily: 'Gotham-Black', color: '#CFB368', fontSize: 12, margin: 2 }}>{item.trans_type_display}</Text>
                                                 <TouchableOpacity onPress={() => this.props.navigation.navigate('Order Detail', { idTrans: item.id })}>
-                                                    <View style={{ height: 40, borderRadius: 10, backgroundColor: '#CFB368', justifyContent: 'center' }}>
-                                                        <Text style={{ fontFamily: 'Gotham-Black', color: 'white', fontSize: 12, textAlign: 'center', margin: 15 }}>Lihat Detail Pemesanan</Text>
+                                                    <View style={{ height: 40, borderRadius: 10, backgroundColor: '#CFB368', justifyContent: 'center', marginTop:10 }}>
+                                                        <Text style={{ fontFamily: 'Gotham-Black', color: 'white', fontSize: 12, textAlign: 'center',paddingHorizontal:5}}>Lihat Detail Pemesanan</Text>
                                                     </View>
                                                 </TouchableOpacity>
                                             </View>
-                                            <View style={{ justifyContent: 'center', marginVertical: 5, marginLeft: 20, borderLeftWidth: 1, borderColor: 'grey' }}>
-                                                <View style={{ margin: 30 }}>
-                                                    <Text style={{ fontFamily: 'Gotham-Black', color: '#c9af6d', fontSize: 12, margin: 2 }}>{item.trans_status_display}</Text>
+                                            <View style={{ flex:0.9, justifyContent: 'center', alignItems:'center', margin: 10, marginLeft: 15, borderLeftWidth: 1, borderColor: '#838383' }}>
+                                                <View>
+                                                    <Text style={{ fontFamily: 'Gotham-Black', color: '#CFB368', fontSize: 12 }}>{item.trans_status_display}</Text>
                                                 </View>
                                             </View>
                                         </View>