diff --git a/android/.gradle/6.5/executionHistory/executionHistory.bin b/android/.gradle/6.5/executionHistory/executionHistory.bin index 750d5b28..ac1f4ceb 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 ef6ea2e2..4a04591f 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 328f882a..39860eb3 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 665324e6..5ca9c6a3 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 92ea6095..d067cfda 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 4da30045..4be075a8 100644 Binary files a/android/.gradle/checksums/checksums.lock and b/android/.gradle/checksums/checksums.lock differ diff --git a/src/assets/css/Colors.js b/src/assets/css/Colors.js index 92a9e775..06e67e93 100644 --- a/src/assets/css/Colors.js +++ b/src/assets/css/Colors.js @@ -2,7 +2,7 @@ export const theme_bg_dark = "#0c0a8d"; export const theme_bg = "#0c0a8d"; export const theme_fg = "#0c0a8d"; -export const theme_light = "#"; +export const theme_light = "#c9ddf5"; export const theme_fg_two = "#202028"; export const theme_bg_three = "#FFFFFF"; export const theme_fg_three = "#FFFFFF"; diff --git a/src/views/ContactUs.js b/src/views/ContactUs.js index 8290a9c5..1f2850b4 100644 --- a/src/views/ContactUs.js +++ b/src/views/ContactUs.js @@ -2,7 +2,6 @@ import React, {Component} from 'react'; 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 back from "../assets/icons/back1.png"; import { logo_with_name, font_title, font_description } from '../config/Constants'; import { StatusBar } from '../components/GeneralComponents'; import { Button, Divider } from 'react-native-elements'; @@ -29,15 +28,7 @@ class ContactUs extends Component<Props> { <View> <View style={styles.con_style1}> <TouchableOpacity style={styles.con_style2} onPress={this.handleBackButtonClick} activeOpacity={1} > - <Image - style={{ - width: 20, - height: 20, - backgroundColor: "white", - marginVertical: 12, - }} - source={back} - /> + <Icon onPress={this.handleBackButtonClick} style={styles.con_style3} name='arrow-back' /> </TouchableOpacity> <View style={styles.con_style4} /> <Text style={styles.con_style5}>Contact Us</Text> diff --git a/src/views/Faq.js b/src/views/Faq.js index 556d328a..aa9a013f 100644 --- a/src/views/Faq.js +++ b/src/views/Faq.js @@ -1,5 +1,5 @@ import React, {Component} from 'react'; -import { StyleSheet, TouchableOpacity, Text,FlatList,Image } from 'react-native'; +import { StyleSheet, TouchableOpacity, 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'; @@ -8,7 +8,6 @@ import { Loader } from '../components/GeneralComponents'; import axios from 'axios'; import { connect } from 'react-redux'; import { fb } from '../config/firebaseConfig'; -import back from "../assets/icons/back1.png"; import { serviceActionPending, serviceActionError, serviceActionSuccess } from '../actions/FaqActions'; class Faq extends Component<Props> { @@ -51,15 +50,7 @@ class Faq extends Component<Props> { <View> <View style={styles.faq_style1}> <TouchableOpacity style={styles.faq_style2} onPress={this.handleBackButtonClick} activeOpacity={1} > - <Image - style={{ - width: 20, - height: 20, - backgroundColor: "white", - marginVertical: 12, - }} - source={back} - /> + <Icon onPress={this.handleBackButtonClick} style={styles.faq_style3} name='arrow-back' /> </TouchableOpacity> <View style={styles.faq_style4} /> <Text style={styles.faq_style5}>Faq</Text> diff --git a/src/views/Home.js b/src/views/Home.js index 9ab36123..c6b3a928 100644 --- a/src/views/Home.js +++ b/src/views/Home.js @@ -9,9 +9,8 @@ import { Image, TextInput, ImageBackground, - StatusBar } from "react-native"; -import { Loader } from "../components/GeneralComponents"; +import { StatusBar, Loader } from "../components/GeneralComponents"; import { img_url, api_url, @@ -156,15 +155,6 @@ export default class Home extends Component<Props> { render() { return ( <Container> - <StatusBar - backgroundColor = "#0c0a8d" - - barStyle = "light-content" - hidden = {false} - - translucent = {false} - networkActivityIndicatorVisible = {true} - /> <Content padder> <View style={styles.home_style1}> <ScrollView diff --git a/src/views/More.js b/src/views/More.js index bc7d83a0..bd625a66 100644 --- a/src/views/More.js +++ b/src/views/More.js @@ -71,12 +71,11 @@ export default class More extends Component<Props> { data={menus} renderItem={({ item, index }) => ( <ListItem icon onPress={() => this.navigate(item.route)}> - {/* <Left> + <Left> <Button style={styles.more_style5}> - // {/* <Icon active name={item.icon} /> */} - {/* // </Button> */} - {/* // </Left> */} - {/* // */} + <Icon active name={item.icon} /> + </Button> + </Left> <Body> <Text style={styles.more_style6}>{item.menu_name}</Text> </Body> @@ -94,9 +93,9 @@ export default class More extends Component<Props> { const styles = StyleSheet.create({ more_style1: { backgroundColor: colors.theme_bg_two }, - more_style2: { backgroundColor: colors.theme_bg_three, padding: 13 }, + more_style2: { backgroundColor: colors.theme_bg_three, padding: 10 }, more_style3: { - fontSize: 20, + fontSize: 16, color: colors.theme_fg_two, fontFamily: font_title, }, @@ -106,6 +105,5 @@ const styles = StyleSheet.create({ fontSize: 16, color: colors.theme_fg_two, fontFamily: font_description, - paddingLeft:12 }, }); diff --git a/src/views/PrivacyPolicy.js b/src/views/PrivacyPolicy.js index 0d923b47..b2d54955 100644 --- a/src/views/PrivacyPolicy.js +++ b/src/views/PrivacyPolicy.js @@ -1,8 +1,7 @@ import React, {Component} from 'react'; -import { StyleSheet, Text, View, TouchableOpacity,Image } from 'react-native'; +import { StyleSheet, Text, View, TouchableOpacity } from 'react-native'; import { Container, Header, Content, Left, Body, Right, Title, Button, Icon, Row, Card } from 'native-base'; import * as colors from '../assets/css/Colors'; -import back from "../assets/icons/back1.png"; import { Loader } from '../components/GeneralComponents'; import { api_url, privacy,font_title,font_description } from '../config/Constants'; import axios from 'axios'; @@ -44,15 +43,7 @@ class PrivacyPolicy extends Component<Props> { <View> <View style={styles.pri_style1}> <TouchableOpacity style={styles.pri_style2} onPress={this.handleBackButtonClick} activeOpacity={1} > - <Image - style={{ - width: 20, - height: 20, - backgroundColor: "white", - marginVertical: 12, - }} - source={back} - /> + <Icon onPress={this.handleBackButtonClick} style={styles.pri_style3} name='arrow-back' /> </TouchableOpacity> <View style={styles.pri_style4} /> <Text style={styles.pri_style5}>Privacy Policy</Text> diff --git a/src/views/Wallet.js b/src/views/Wallet.js index b8d54e85..dda1fe2f 100644 --- a/src/views/Wallet.js +++ b/src/views/Wallet.js @@ -1,8 +1,7 @@ import React, {Component} from 'react'; -import { StyleSheet, Text, View, FlatList, TouchableOpacity,Image } from 'react-native'; +import { StyleSheet, Text, View, FlatList, TouchableOpacity } from 'react-native'; import { Content, Container, Header, Body, Title, Left, Icon, Right, Button as Btn, Card, CardItem, List, ListItem, Thumbnail, Row} from 'native-base'; import * as colors from '../assets/css/Colors'; -import back from "../assets/icons/back1.png"; import axios from 'axios'; import { Loader } from '../components/GeneralComponents'; import { wallet_icon, api_url, get_wallet, add_wallet ,font_description,font_title , no_wallet_lottie} from '../config/Constants'; @@ -108,15 +107,7 @@ class Wallet extends Component<Props> { <View> <View style={styles.wall_style1}> <TouchableOpacity style={styles.wall_style2} onPress={this.handleBackButtonClick} activeOpacity={1} > - <Image - style={{ - width: 20, - height: 20, - backgroundColor: "white", - marginVertical: 12, - }} - source={back} - /> + <Icon onPress={this.handleBackButtonClick} style={styles.wall_style3} name='arrow-back' /> </TouchableOpacity> <View style={styles.wall_style4} /> <Text style={styles.wall_style5}>Wallet</Text>