8.2

android/app/build/intermediates/incremental/packageRelease/tmp/release/dex-renamer-state.txt

@@ -1,4 +1,4 @@
-#Sat Jan 08 03:01:34 IST 2022
+#Sat Jan 08 15:18:35 IST 2022
 base.0=D\:\\downlooad\\desihealth_customer (1)\\android\\app\\build\\intermediates\\dex\\release\\mergeDexRelease\\out\\classes.dex
 path.1=classes2.dex
 renamed.1=classes2.dex

android/app/build/reports/lint-results-release-fatal.html

@@ -176,7 +176,7 @@ document.getElementById(id).style.display = 'none';
       <span class="mdl-layout-title">Lint Report: No errors or warnings</span>
       <div class="mdl-layout-spacer"></div>
       <nav class="mdl-navigation mdl-layout--large-screen-only">
-Check performed at Sat Jan 08 03:01:11 IST 2022      </nav>
+Check performed at Sat Jan 08 15:18:27 IST 2022      </nav>
     </div>
   </header>
   <div class="mdl-layout__drawer">

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 = "#c9ddf5";
+export const theme_light = "#";
 export const theme_fg_two = "#202028";
 export const theme_bg_three = "#FFFFFF";
 export const theme_fg_three = "#FFFFFF";

src/views/AddressEnter.js

@@ -61,16 +61,14 @@ class AddressEnter extends Component<Props> {
     super(props);
     this.handleBackButtonClick = this.handleBackButtonClick.bind(this);
     this.state = {
-      customer_name: "",
-      phone_number: "",
-      email: "",
-      password: "",
-      blood_group: "",
+      address: "",
+ 
+     
       validation: true,
       blood_group_list: [],
       fcm_token: global.fcm_token,
       country: "",
-      region: "",
+      // region: "",
       latitude: "",
       longitude: "",
       coords: "",
@@ -125,40 +123,41 @@ class AddressEnter extends Component<Props> {
 
 
   handleUserNavigation = async () => {
-    Geolocation.getCurrentPosition((info) => {
-      this.setState({
-        latitude: info.coords.latitude,
-        longitude: info.coords.longitude,
-        coords: info.coords,
-      });
-
-      console.log(info);
+   try{
+    await Geolocation.getCurrentPosition((info) => {
+    this.setState({
+      latitude: info.coords.latitude,
+      longitude: info.coords.longitude,
+      coords: info.coords,
     });
 
+    console.log(info);
+  })}
+  catch(error){alert(error)} 
+
   }
 
 
 
   register = async () => {
     this.handleUserNavigation();
-    // Keyboard.dismiss();
+    Keyboard.dismiss();
     // await this.checkValidate();
     // if (this.state.validation)
     //   this.props.serviceActionPending();
-    let countries = Country.getAllCountries();
-    console.log(countries[0].name);
+    // let countries = Country.getAllCountries();
+    // console.log(countries[0].name);
     await axios
       .post(
         `${api_url1}/clients/address/add`,
 
         {
-          addressLine1: this.state.customer_name,
-          addressLine2: '',
+          addressLine1: this.state.address,
           pincode: this.state.pincode,
           city: this.state.city,
           state: this.state.State,
           country: this.state.country,
-          latitude: this.state.latitude,
+          latitude:this.state.latitude,
           longitude: this.state.longitude,
         },
         { headers: { Authorization: `Bearer ${global.fcm_token}` } }
@@ -214,21 +213,23 @@ class AddressEnter extends Component<Props> {
     }
   };
 
-  checkValidate() {
-    if (
-      this.state.email == "" ||
-      this.state.phone_number == "" ||
-      this.state.password == "" ||
-      // this.state.blood_group == "" ||
-      this.state.customer_name == ""
+  checkValidate=()=> {
+    if(
+        this.state.address == "" ||
+      this.state.pincode == "" ||
+      this.state.city == "" ||
+      this.state.country == "" ||
+      this.state.State == "" ||
+      this.state.latitude == "" ||
+      this.state.longitude==""
     ) {
-      this.state.validation = false;
-      this.showSnackbar("Please fill all the fields.");
-      return true;
+      // this.state.validation = false;
+      alert("Please fill all the fields.");
+      // return true;
     } else {
-      this.state.validation = true;
-      return true;
-    }
+      // this.state.validation = true;
+      // return true;
+      this.register();    }
   }
 
   select_blood_group = (value) => {
@@ -309,7 +310,7 @@ class AddressEnter extends Component<Props> {
                   <Image style={{ width: 22, height: 22 }} source={person} />
                 }
                 onChangeText={(TextInputValue) =>
-                  this.setState({ customer_name: TextInputValue })
+                  this.setState({ address: TextInputValue })
                 }
               />
             </View>
@@ -335,7 +336,7 @@ class AddressEnter extends Component<Props> {
                 //     }
                 keyboardType="phone-pad"
                 onChangeText={(TextInputValue) =>
-                  this.setState({ phone_number: TextInputValue })
+                  this.setState({ pincode: TextInputValue })
                 }
               />
             </View>
@@ -363,7 +364,7 @@ class AddressEnter extends Component<Props> {
                 //     }
                 keyboardType="email-address"
                 onChangeText={(TextInputValue) =>
-                  this.setState({ email: TextInputValue })
+                  this.setState({ city: TextInputValue })
                 }
               />
             </View>
@@ -392,7 +393,7 @@ class AddressEnter extends Component<Props> {
                 // }
                 // secureTextEntry={true}
                 onChangeText={(TextInputValue) =>
-                  this.setState({ password: TextInputValue })
+                  this.setState({ State: TextInputValue })
                 }
               />
             </View>
@@ -417,7 +418,9 @@ class AddressEnter extends Component<Props> {
                 }
               />
             </View>
-        
+        <Text>
+          {/* {this.state.country} */}
+        </Text>
             <Text
             style={styles.reg_style13}
             >
@@ -444,7 +447,7 @@ class AddressEnter extends Component<Props> {
             </View> */}
             <View style={styles.reg_style30} />
             <View style={styles.reg_style31}>
-              <Button block style={styles.reg_style32} onPress={this.register}>
+              <Button block style={styles.reg_style32} onPress={this.checkValidate}>
                 <Text style={styles.reg_style33}>SUBMIT</Text>
               </Button>
             </View>

src/views/ContactUs.js

@@ -2,6 +2,7 @@ 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';
@@ -28,7 +29,15 @@ class ContactUs extends Component<Props> {
         <View>
           <View style={styles.con_style1}>
             <TouchableOpacity style={styles.con_style2} onPress={this.handleBackButtonClick} activeOpacity={1} >
-            <Icon onPress={this.handleBackButtonClick} style={styles.con_style3} name='arrow-back' />
+            <Image
+                style={{
+                  width: 20,
+                  height: 20,
+                  backgroundColor: "white",
+                  marginVertical: 12,
+                }}
+                source={back}
+              />
             </TouchableOpacity>
             <View style={styles.con_style4} />
             <Text style={styles.con_style5}>Contact Us</Text>

src/views/Faq.js

@@ -1,5 +1,5 @@
 import React, {Component} from 'react';
-import { StyleSheet, TouchableOpacity, Text,FlatList } from 'react-native';
+import { StyleSheet, TouchableOpacity, Text,FlatList,Image } 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,6 +8,7 @@ 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> {
@@ -50,7 +51,15 @@ class Faq extends Component<Props> {
         <View>
           <View style={styles.faq_style1}>
             <TouchableOpacity style={styles.faq_style2} onPress={this.handleBackButtonClick} activeOpacity={1} >
-            <Icon onPress={this.handleBackButtonClick} style={styles.faq_style3} name='arrow-back' />
+            <Image
+                style={{
+                  width: 20,
+                  height: 20,
+                  backgroundColor: "white",
+                  marginVertical: 12,
+                }}
+                source={back}
+              />
             </TouchableOpacity>
             <View style={styles.faq_style4} />
             <Text style={styles.faq_style5}>Faq</Text>

src/views/Home.js

@@ -9,8 +9,9 @@ import {
   Image,
   TextInput,
   ImageBackground,
+  StatusBar
 } from "react-native";
-import { StatusBar, Loader } from "../components/GeneralComponents";
+import { Loader } from "../components/GeneralComponents";
 import {
   img_url,
   api_url,
@@ -155,6 +156,10 @@ export default class Home extends Component<Props> {
   render() {
     return (
       <Container>
+          <StatusBar   
+     backgroundColor = "#a4a9b7"  
+     barStyle = "dark-content"   
+  />  
         <Content padder>
           <View style={styles.home_style1}>
             <ScrollView

src/views/PrivacyPolicy.js

@@ -1,7 +1,8 @@
 import React, {Component} from 'react';
-import { StyleSheet, Text, View, TouchableOpacity } from 'react-native';
+import { StyleSheet, Text, View, TouchableOpacity,Image } 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';
@@ -43,7 +44,15 @@ class PrivacyPolicy extends Component<Props> {
         <View>
           <View style={styles.pri_style1}>
             <TouchableOpacity style={styles.pri_style2} onPress={this.handleBackButtonClick} activeOpacity={1} >
-            <Icon onPress={this.handleBackButtonClick} style={styles.pri_style3} name='arrow-back' />
+            <Image
+                style={{
+                  width: 20,
+                  height: 20,
+                  backgroundColor: "white",
+                  marginVertical: 12,
+                }}
+                source={back}
+              />
             </TouchableOpacity>
             <View style={styles.pri_style4} />
             <Text style={styles.pri_style5}>Privacy Policy</Text>

src/views/Wallet.js

@@ -1,7 +1,8 @@
 import React, {Component} from 'react';
-import { StyleSheet, Text, View, FlatList, TouchableOpacity } from 'react-native';
+import { StyleSheet, Text, View, FlatList, TouchableOpacity,Image } 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';
@@ -107,7 +108,15 @@ class Wallet extends Component<Props> {
         <View>
           <View style={styles.wall_style1}>
             <TouchableOpacity style={styles.wall_style2} onPress={this.handleBackButtonClick} activeOpacity={1} >
-            <Icon onPress={this.handleBackButtonClick} style={styles.wall_style3} name='arrow-back' />
+            <Image
+                style={{
+                  width: 20,
+                  height: 20,
+                  backgroundColor: "white",
+                  marginVertical: 12,
+                }}
+                source={back}
+              />
             </TouchableOpacity>
             <View style={styles.wall_style4} />
             <Text style={styles.wall_style5}>Wallet</Text>