diff --git a/android/.gradle/6.5/executionHistory/executionHistory.bin b/android/.gradle/6.5/executionHistory/executionHistory.bin index ac1f4ceb..a051ad96 100644 Binary files a/android/.gradle/6.5/executionHistory/executionHistory.bin and b/android/.gradle/6.5/executionHistory/executionHistory.bin differ diff --git a/android/.gradle/6.5/executionHistory/executionHistory.lock b/android/.gradle/6.5/executionHistory/executionHistory.lock index 4a04591f..b11da03f 100644 Binary files a/android/.gradle/6.5/executionHistory/executionHistory.lock and b/android/.gradle/6.5/executionHistory/executionHistory.lock differ diff --git a/android/.gradle/6.5/fileHashes/fileHashes.bin b/android/.gradle/6.5/fileHashes/fileHashes.bin index 39860eb3..e3e86b1b 100644 Binary files a/android/.gradle/6.5/fileHashes/fileHashes.bin and b/android/.gradle/6.5/fileHashes/fileHashes.bin differ diff --git a/android/.gradle/6.5/fileHashes/fileHashes.lock b/android/.gradle/6.5/fileHashes/fileHashes.lock index 5ca9c6a3..0f4d6d5f 100644 Binary files a/android/.gradle/6.5/fileHashes/fileHashes.lock and b/android/.gradle/6.5/fileHashes/fileHashes.lock differ diff --git a/android/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/android/.gradle/buildOutputCleanup/buildOutputCleanup.lock index d067cfda..11883546 100644 Binary files a/android/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/android/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/android/.gradle/checksums/checksums.lock b/android/.gradle/checksums/checksums.lock index 4be075a8..a0df6320 100644 Binary files a/android/.gradle/checksums/checksums.lock and b/android/.gradle/checksums/checksums.lock differ diff --git a/src/assets/icons/wallet.png b/src/assets/icons/wallet.png new file mode 100644 index 00000000..0cff3cea Binary files /dev/null and b/src/assets/icons/wallet.png differ diff --git a/src/views/ContactUs.js b/src/views/ContactUs.js index 1f2850b4..e797d4ec 100644 --- a/src/views/ContactUs.js +++ b/src/views/ContactUs.js @@ -3,9 +3,11 @@ import { StyleSheet, Text, Image, View, TouchableOpacity } from 'react-native'; import { Content, Container, Header, Body, Title, Left, Row, Icon, Right, Button as Btn, Card } from 'native-base'; import * as colors from '../assets/css/Colors'; import { logo_with_name, font_title, font_description } from '../config/Constants'; +import back from "../assets/icons/back1.png"; import { StatusBar } from '../components/GeneralComponents'; import { Button, Divider } from 'react-native-elements'; import { app_name } from '../config/Constants'; +import wallet from '../assets/icons/wallet.png' class ContactUs extends Component { @@ -28,7 +30,17 @@ class ContactUs extends Component { - + + Contact Us diff --git a/src/views/Faq.js b/src/views/Faq.js index aa9a013f..7523e294 100644 --- a/src/views/Faq.js +++ b/src/views/Faq.js @@ -1,8 +1,10 @@ import React, {Component} from 'react'; -import { StyleSheet, TouchableOpacity, Text,FlatList } from 'react-native'; +import { StyleSheet, TouchableOpacity,Image, Text,FlatList } from 'react-native'; import { Container, Header, Content, List, ListItem, Left, Body, Right, Title, Button, Icon, Row,Col,Card, CardItem, Footer, View } from 'native-base'; import { api_url, faq, font_title, font_description } from '../config/Constants'; import Accordian from '../config/Accordian'; + +import back from "../assets/icons/back1.png"; import * as colors from '../assets/css/Colors'; import { Loader } from '../components/GeneralComponents'; import axios from 'axios'; @@ -50,7 +52,16 @@ class Faq extends Component { - + Faq diff --git a/src/views/Home.js b/src/views/Home.js index c6b3a928..89a64e68 100644 --- a/src/views/Home.js +++ b/src/views/Home.js @@ -155,6 +155,13 @@ export default class Home extends Component { render() { return ( + - ); } -} +} const styles = StyleSheet.create({ - my_style1:{alignSelf:'center',height:200,width:'100%'}, - my_style2:{marginTop:-45}, - my_style3:{alignSelf:'center',height:90,width:90,borderRadius:45}, - my_style4:{backgroundColor:colors.theme_fg_three,width:"100%",padding:10}, - my_style5:{fontSize:14, color:colors.theme_fg,fontFamily:font_title}, - my_style6:{margin:5}, - my_style7:{padding:5}, - my_style8:{height:"100%",width:"10%",alignSelf:'center'}, - my_style9:{color:colors.theme_fg}, - my_style10:{height:"100%",width:"35%",justifyContent:'center',marginLeft:5}, - my_style11:{fontSize:12, color:'#C4C3C3',fontFamily:font_description}, - my_style12:{margin:2}, - my_style13:{height:"100%",width:"5%",alignSelf:'center'}, - my_style14:{margin:5}, - my_style15:{height:"100%",width:"10%",alignSelf:'center'}, - my_style16:{color:colors.theme_fg}, - my_style17:{height:"100%",width:"90%",justifyContent:'center',marginLeft:5}, - my_style18:{fontSize:12, color:'#C4C3C3',fontFamily:font_description}, - my_style19:{margin:5}, - my_style20:{height:"100%",width:"10%",alignSelf:'center'}, - my_style21:{color:colors.theme_fg}, - my_style22:{height:"100%",width:"90%",justifyContent:'center',marginLeft:5}, - my_style23:{fontSize:12, color:'#C4C3C3',fontFamily:font_description}, - my_style24:{margin:2}, - my_style25:{backgroundColor:colors.theme_fg_three,width:"100%",padding:10}, - my_style26:{fontSize:14, color:colors.theme_fg,fontFamily:font_title}, - my_style27:{margin:5}, - my_style28:{fontSize:12,paddingRight:20, color:'#C4C3C3',fontFamily:font_description}, - my_style29:{margin:2}, - my_style30:{backgroundColor:colors.theme_fg_three,width:"100%",padding:10}, - my_style31:{fontSize:14, color:colors.theme_fg,fontFamily:font_title}, - my_style32:{margin:5}, - my_style33:{padding:5}, - my_style34:{height:"100%",width:"10%",alignSelf:'center'}, - my_style35:{color:colors.theme_fg}, - my_style36:{height:"100%",width:"45%",alignSelf:'center',marginLeft:5}, - my_style37:{fontSize:12, color:'#C4C3C3',fontFamily:font_title}, - my_style38:{margin:2}, - my_style39:{fontSize:14, color:colors.theme_fg_five,fontFamily:font_description}, - my_style40:{margin:5}, - my_style41:{height:"100%",width:"10%",alignSelf:'center'}, - my_style42:{color:colors.theme_fg}, - my_style43:{height:"100%",width:"35%",alignSelf:'center',marginLeft:5}, - my_style44:{fontSize:12, color:'#C4C3C3',fontFamily:font_title}, - my_style45:{margin:2}, - my_style46:{height:"100%",width:"70%",alignSelf:'center'}, - my_style47:{fontSize:14, color:colors.theme_fg_five,fontFamily:font_description}, - my_style48:{margin:10}, - my_style49:{height:"100%",width:"10%",alignSelf:'center'}, - my_style50:{color:colors.theme_fg}, - my_style51:{height:"100%",width:"35%",alignSelf:'center',marginLeft:5}, - my_style52:{fontSize:12, color:'#C4C3C3',fontFamily:font_title}, - my_style53:{margin:2}, - my_style54:{fontSize:14, color:colors.theme_fg_five,fontFamily:font_description}, - my_style55:{margin:2}, - my_style56:{height:"100%",width:"5%",alignSelf:'center'}, - my_style57:{margin:5}, - my_style58:{margin:5}, - my_style59:{margin:2}, - my_style60:{backgroundColor:colors.theme_fg_three,width:"100%",padding:10}, - my_style61:{fontSize:14, color:colors.theme_fg,fontFamily:font_title}, - my_style62:{margin:5}, - my_style63:{padding:5}, - my_style64:{alignItems:'center', justifyContent:'center'}, - my_style65:{color:colors.theme_fg}, - my_style66:{fontSize:12, color:colors.theme_fg_two,fontFamily:font_title}, - my_style67:{alignItems:'center', justifyContent:'center'}, - my_style68:{color:colors.theme_fg}, - my_style69:{fontSize:12, color:colors.theme_fg_two,fontFamily:font_title}, + my_style1: { alignSelf: "center", height: 250, width: "100%" }, + my_style2: { marginTop: -45 }, + my_style3: { alignSelf: "center", height: 90, width: 90, borderRadius: 45 }, + my_style4: { + backgroundColor: colors.theme_fg_three, + width: "100%", + padding: 10, + }, + my_style5: { fontSize: 14, color: colors.theme_fg, fontFamily: font_title }, + my_style6: { margin: 5 }, + my_style7: { padding: 5 }, + my_style8: { height: "100%", width: "10%", alignSelf: "center" }, + my_style9: { color: colors.theme_fg }, + my_style10: { + height: "100%", + width: "35%", + justifyContent: "center", + marginLeft: 5, + }, + my_style11: { fontSize: 12, color: "#C4C3C3", fontFamily: font_description }, + my_style12: { margin: 2 }, + my_style13: { height: "100%", width: "5%", alignSelf: "center" }, + my_style14: { margin: 5 }, + my_style15: { height: "100%", width: "10%", alignSelf: "center" }, + my_style16: { color: colors.theme_fg }, + my_style17: { + height: "100%", + width: "90%", + justifyContent: "center", + marginLeft: 5, + }, + my_style18: { fontSize: 12, color: "#C4C3C3", fontFamily: font_description }, + my_style19: { margin: 5 }, + my_style20: { height: "100%", width: "10%", alignSelf: "center" }, + my_style21: { color: colors.theme_fg }, + my_style22: { + height: "100%", + width: "90%", + justifyContent: "center", + marginLeft: 5, + }, + my_style23: { fontSize: 12, color: "#C4C3C3", fontFamily: font_description }, + my_style24: { margin: 2 }, + my_style25: { + backgroundColor: colors.theme_fg_three, + width: "100%", + padding: 10, + }, + my_style26: { fontSize: 14, color: colors.theme_fg, fontFamily: font_title }, + my_style27: { margin: 5 }, + my_style28: { + fontSize: 12, + paddingRight: 20, + color: "#C4C3C3", + fontFamily: font_description, + }, + my_style29: { margin: 2 }, + my_style30: { + backgroundColor: colors.theme_fg_three, + width: "100%", + padding: 10, + }, + my_style31: { fontSize: 14, color: colors.theme_fg, fontFamily: font_title }, + my_style32: { margin: 5 }, + my_style33: { padding: 5 }, + my_style34: { height: "100%", width: "10%", alignSelf: "center" }, + my_style35: { color: colors.theme_fg }, + my_style36: { + height: "100%", + width: "45%", + alignSelf: "center", + marginLeft: 5, + }, + my_style37: { fontSize: 12, color: "#C4C3C3", fontFamily: font_title }, + my_style38: { margin: 2 }, + my_style39: { + fontSize: 14, + color: colors.theme_fg_five, + fontFamily: font_description, + }, + my_style40: { margin: 5 }, + my_style41: { height: "100%", width: "10%", alignSelf: "center" }, + my_style42: { color: colors.theme_fg }, + my_style43: { + height: "100%", + width: "35%", + alignSelf: "center", + marginLeft: 5, + }, + my_style44: { fontSize: 12, color: "#C4C3C3", fontFamily: font_title }, + my_style45: { margin: 2 }, + my_style46: { height: "100%", width: "70%", alignSelf: "center" }, + my_style47: { + fontSize: 14, + color: colors.theme_fg_five, + fontFamily: font_description, + }, + my_style48: { margin: 10 }, + my_style49: { height: "100%", width: "10%", alignSelf: "center" }, + my_style50: { color: colors.theme_fg }, + my_style51: { + height: "100%", + width: "35%", + alignSelf: "center", + marginLeft: 5, + }, + my_style52: { fontSize: 12, color: "#C4C3C3", fontFamily: font_title }, + my_style53: { margin: 2 }, + my_style54: { + fontSize: 14, + color: colors.theme_fg_five, + fontFamily: font_description, + }, + my_style55: { margin: 2 }, + my_style56: { height: "100%", width: "5%", alignSelf: "center" }, + my_style57: { margin: 5 }, + my_style58: { margin: 5 }, + my_style59: { margin: 2 }, + my_style60: { + backgroundColor: colors.theme_fg_three, + width: "100%", + padding: 10, + }, + my_style61: { fontSize: 14, color: colors.theme_fg, fontFamily: font_title }, + my_style62: { margin: 5 }, + my_style63: { padding: 5 }, + my_style64: { alignItems: "center", justifyContent: "center" }, + my_style65: { color: colors.theme_fg }, + my_style66: { + fontSize: 12, + color: colors.theme_fg_two, + fontFamily: font_title, + }, + my_style67: { alignItems: "center", justifyContent: "center" }, + my_style68: { color: colors.theme_fg }, + my_style69: { + fontSize: 12, + color: colors.theme_fg_two, + fontFamily: font_title, + }, title: { - fontSize: 18, - color:'#1065cd', - marginTop:10, - marginRight:30, - fontFamily:font_title - }, - header: { - marginRight:10, - marginTop:10, - alignSelf: 'center' - }, -imagethree:{ - alignSelf:'center', - height:40, - width:40, - borderRadius:100, -}, + fontSize: 18, + color: "#1065cd", + marginTop: 10, + marginRight: 30, + fontFamily: font_title, + }, + header: { + marginRight: 10, + marginTop: 10, + alignSelf: "center", + }, + imagethree: { + alignSelf: "center", + height: 40, + width: 40, + borderRadius: 100, + }, }); diff --git a/src/views/MyOrders.js b/src/views/MyOrders.js index bb1f95a2..4a3e5c47 100644 --- a/src/views/MyOrders.js +++ b/src/views/MyOrders.js @@ -249,12 +249,52 @@ getOrders =async()=>{ {item.title} - {this.get_status( + + {item.status=='Pending' && + + + Pending + + + } + + + +{item.status=='Accepted' && + + + Pending + + + } + + +{item.status=='Rejected' && + + + Pending + + + } + {/* + + Pending + + */} + {/* {this.get_status( item.status, item.status, item.status, item.status - )} + )} */} diff --git a/src/views/OrderDetails.js b/src/views/OrderDetails.js index b8b6a282..d3503d9f 100644 --- a/src/views/OrderDetails.js +++ b/src/views/OrderDetails.js @@ -23,6 +23,8 @@ import ProgressCircle from "react-native-progress-circle"; import { Divider } from "react-native-elements"; import Moment from "moment"; import axios from "axios"; + +import wallet1 from "../assets/icons/back1.png"; import { tablet, cancelation_reasons, @@ -172,10 +174,15 @@ export default class OrderDetails extends Component { onPress={this.handleBackButtonClick} activeOpacity={1} > - diff --git a/src/views/PrivacyPolicy.js b/src/views/PrivacyPolicy.js index b2d54955..42d7e833 100644 --- a/src/views/PrivacyPolicy.js +++ b/src/views/PrivacyPolicy.js @@ -1,5 +1,6 @@ import React, {Component} from 'react'; -import { StyleSheet, Text, View, TouchableOpacity } from 'react-native'; +import { StyleSheet, Text, View, TouchableOpacity,Image } from 'react-native'; +import back from "../assets/icons/back1.png"; import { Container, Header, Content, Left, Body, Right, Title, Button, Icon, Row, Card } from 'native-base'; import * as colors from '../assets/css/Colors'; import { Loader } from '../components/GeneralComponents'; @@ -43,7 +44,17 @@ class PrivacyPolicy extends Component { - + + Privacy Policy diff --git a/src/views/Profile.js b/src/views/Profile.js index 1811283b..3320cbe2 100644 --- a/src/views/Profile.js +++ b/src/views/Profile.js @@ -606,7 +606,7 @@ post=async()=>{ } /> - + {/* { this.setState({ password: TextInputValue }) } /> - + */} Blood Group { @@ -107,7 +109,16 @@ class Wallet extends Component { - + Wallet @@ -118,7 +129,17 @@ class Wallet extends Component { - + +