From 8ee848b6259c0f4da25a172ce91b6324d9eaa0f0 Mon Sep 17 00:00:00 2001 From: Suyash Srivastava <55198615+Spirit2v@users.noreply.github.com> Date: Sat, 8 Jan 2022 18:24:30 +0530 Subject: [PATCH] 8 --- App.js | 4 + .../6.5/executionHistory/executionHistory.bin | Bin 121362734 -> 121362734 bytes .../executionHistory/executionHistory.lock | Bin 17 -> 17 bytes android/.gradle/6.5/fileHashes/fileHashes.bin | Bin 30250113 -> 30250113 bytes .../.gradle/6.5/fileHashes/fileHashes.lock | Bin 17 -> 17 bytes .../buildOutputCleanup.lock | Bin 17 -> 17 bytes android/.gradle/checksums/checksums.lock | Bin 17 -> 17 bytes src/views/AddressEnter.js | 3 +- src/views/AddressList.js | 2 +- src/views/AddressMap.js | 98 +++++++++++++----- src/views/Home.js | 9 +- src/views/More.js | 14 +-- 12 files changed, 92 insertions(+), 38 deletions(-) diff --git a/App.js b/App.js index ff673fb9..f39decfe 100644 --- a/App.js +++ b/App.js @@ -75,6 +75,7 @@ import Success from './src/views/Success' // import WallletAdd from './src/views/WalletAdd' import WalletAdd from "./src/views/WalletAdd"; import AddressEnter from "./src/views/AddressEnter"; +import AddressMap from "./src/views/AddressMap"; const Stack = createStackNavigator(); const Tab = createBottomTabNavigator(); @@ -248,6 +249,9 @@ function App() { + sAMFgvMM1O_N?rkQOYj; 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 LKF(jVv?F71|R?c literal 17 VcmZQR7W_cH|H-PY3}6s;6#zcI1|a|d diff --git a/android/.gradle/6.5/fileHashes/fileHashes.bin b/android/.gradle/6.5/fileHashes/fileHashes.bin index 038b28c2f6fd534eca1a28caade030bcc2fb2058..f9f316546a8eb0342b703a4c00ffa4ade773ae09 100644 GIT binary patch delta 1403 zcmWl}b$kd27{}qyYr2`79;UmyyJMK1?(QC6{n`vOF(x--Q)Aku^SaNK>u~A%+#SC^ zo+lzHEpNmND=;z(N>Gwgl%@=2 zDMv8nsX#?Ss6=I|P?c&_rv^2tMQ!R(mwMEv0S#$HW17&EW;CY-Eont-+R&DEw5J0d z=|pF`(3NgZ)V=yyoGs7^H%1q&D)r_HE(C$-n@f(NAphRoz1(LcQx;3 z-rc;1c~A3R=Dp4PnD;gBXWrjD)O>*XK=VO%Im}X01CrxXV#DVK1jRo~4YQ(Ak6)br zICZeaJPk;W4vEbOZ66dH8N4_!Dj{)*y=bT!riQB#YNQHRqts|MMvYbD)Oa;PO;nTA zWHm)iRnydTHABr*v(#)gN6l69)O@u-EmVutVzopqRm;?JwL(Rxm1>njtyXK)TD4BC zR~ytu6N?NB?_F11_5sXc11idXy8esw?{REN}Im7o&U z5tXEls$(iyrKscTggU8CsnaS|ol$31nmVV>s|)I)x}+|vE9$CBR~hP>x~^`ho9dRj Vt?sD1>Ylo<9$0!p;zN7%-n!nJ#pt8{O$aPkPatKJ=v@{Rw3N0~tgZgBik5hB2HGjARs}8N*n{F`fxbWD=8^ z!c?X)of*tz7PFbdT;?&K1uSF{iwS25OIgNpB8X%KD}hz4W({ju$9gv4Y-AHrY-S5v z*~WHuu#;$Zv70^YWgq*AA(jIipn0HqA@joKMa+wu7c(zz z9%LSDUc$Vjc`5VK<{{=~%*&dWGcRvm!Mvh*CG*PWRm`iJS2M3}UcN>Z*Jbgyrp?7^Va5V%-fo`GjDI+!Mvk+C-ctcUCg_h zcQfy9-ow17c`x(c=6%fjn)fsBZystsz&VwG4e)`+!Y zomek62p1d0CJ`kzi!EZS*e14%9b%`*cp4YKOY9bV#9pya>=!X2RvZuq#UXK691%xF zoQN04M1nXjPKc8tQJfN|#Tju{oD)gnytp8e#YJ&RTozZvRgogDiR&U&q=_5irnn_; Yi#y`3xF_z52jZc4WT|oSkL}6R7p%x~-2eap diff --git a/android/.gradle/6.5/fileHashes/fileHashes.lock b/android/.gradle/6.5/fileHashes/fileHashes.lock index 9a1555e9e26915811860badaf8740f01a107fbb7..adb7b888a83b80a0e6b6219e3aa2ce583cfad117 100644 GIT binary patch literal 17 WcmZRU+jq2>efr-u3?RT^T?7C%q6HKH literal 17 WcmZRU+jq2>efr-u3?RT^9RmP0j0FAw diff --git a/android/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/android/.gradle/buildOutputCleanup/buildOutputCleanup.lock index 89057129cab8e7c455697ccdb6505df7e4e70926..2c57d081b303b56fe9bca9830835e9b4b6330da5 100644 GIT binary patch literal 17 WcmZSn;QfnZn|#|R1`uF6;t2pdF9n?d literal 17 WcmZSn;QfnZn|#|R1`uF6;tl{iEd`qZ diff --git a/android/.gradle/checksums/checksums.lock b/android/.gradle/checksums/checksums.lock index 07fc5b669be25668efae9908dd86329db421d002..6e398aa29ddae6734f974c4b61165b69e56b77ae 100644 GIT binary patch literal 17 VcmZS9+yCZ$^wT>A3}C?R0RTWD1#18R literal 17 VcmZS9+yCZ$^wT>A3}C?R0sufA1!n*N diff --git a/src/views/AddressEnter.js b/src/views/AddressEnter.js index 58ba345b..8cfe3fad 100644 --- a/src/views/AddressEnter.js +++ b/src/views/AddressEnter.js @@ -38,6 +38,7 @@ import { get_blood_list, api_url1, } from "../config/Constants"; + import { StatusBar, Loader } from "../components/GeneralComponents"; import * as colors from "../assets/css/Colors"; import axios from "axios"; @@ -285,7 +286,7 @@ class AddressEnter extends Component { /> - Enter Your location + Enter Your Address diff --git a/src/views/AddressList.js b/src/views/AddressList.js index 885d34b9..9613aaf4 100644 --- a/src/views/AddressList.js +++ b/src/views/AddressList.js @@ -145,7 +145,7 @@ class AddressList extends Component { fastInterval: 5000, }) .then((data) => { - this.props.navigation.navigate("AddressEnter", { id: 0 }); + this.props.navigation.navigate("AddressMap"); }) .catch((err) => { alert("Please enable your location"); diff --git a/src/views/AddressMap.js b/src/views/AddressMap.js index 34924c9a..51dd6e3b 100644 --- a/src/views/AddressMap.js +++ b/src/views/AddressMap.js @@ -3,8 +3,20 @@ import { Text, View, StyleSheet } from "react-native"; // import Geocoder from "react-native-geocoder"; import MapView from "react-native-maps"; import Geolocation from "@react-native-community/geolocation"; -import opencage from "opencage-api-client"; +// import opencage from "opencage-api-client"; import { Marker } from "react-native-maps"; +import { + api_url1, + address_list, + address_delete, + img_url, + last_active_address, + font_title, + font_description, + no_address_lottie, +} from "../config/Constants"; +import * as colors from "../assets/css/Colors"; +import { Button } from "react-native-elements"; // import { address } from "../config/Constants"; export default class AddressMap extends Component { @@ -21,7 +33,7 @@ export default class AddressMap extends Component { this.handleUserNavigation(); - this.getData(); + // this.getData(); // this.onRegionChange(); // this.getAddress(this.state.latitude,this.state.longitude); } @@ -35,36 +47,36 @@ export default class AddressMap extends Component { getAddress = async(ny) => { - await Geocoder.fallbackToGoogle('AIzaSyB_mBINSZ5m6dVyK6ANTLoEhkZq1nH9dG8'); - try { - let res = await Geocoder.geocodePosition(ny); - let addr = res[0].formattedAddress; - alert(addr); - this.setState({ - address: addr, - }); - } catch (err) { - alert(err); - } + // await Geocoder.fallbackToGoogle('AIzaSyB_mBINSZ5m6dVyK6ANTLoEhkZq1nH9dG8'); + // try { + // let res = await Geocoder.geocodePosition(ny); + // let addr = res[0].formattedAddress; + // alert(addr); + // this.setState({ + // address: addr, + // }); + // } catch (err) { + // alert(err); + // } }; - newOne=()=>{ - const ny={lat:this.state.latitude,lng:this.state.latitude} - this.getAddress(ny); - } + // newOne=()=>{ + // const ny={lat:this.state.latitude,lng:this.state.latitude} + // this.getAddress(ny); + // } -getData=()=>{ - Geocoder.setApiKey('AIzaSyB_mBINSZ5m6dVyK6ANTLoEhkZq1nH9dG8'); - Geocoder.getFromLatLng(41.89,12.49).then( +// getData=()=>{ +// Geocoder.setApiKey('AIzaSyB_mBINSZ5m6dVyK6ANTLoEhkZq1nH9dG8'); +// Geocoder.getFromLatLng(41.89,12.49).then( - json=>{ - var address_component=json.results[0].address_component[0] - alert(address_component.long_name) - } - ) +// json=>{ +// var address_component=json.results[0].address_component[0] +// alert(address_component.long_name) +// } +// ) -} +// } // reverseGeocode = () => { // const key = "320646a99ec348baa3beb82943516ae6"; @@ -126,8 +138,8 @@ getData=()=>{ initialRegion={{ latitude: this.state.latitude, longitude: this.state.longitude, - latitudeDelta: 0.0922, - longitudeDelta: 0.0421, + latitudeDelta: .001, + longitudeDelta: .05, }} > { description={(this.state.address) } /> + + + Your location : {this.state.latitude} , {this.state.longitude} + + + + + Accuracy:({this.state.coords.accuracy}) + + - + // {/* */} + {/* // */} + {/* // */} + {/* // */} {item.menu_name} @@ -93,9 +94,9 @@ export default class More extends Component { const styles = StyleSheet.create({ more_style1: { backgroundColor: colors.theme_bg_two }, - more_style2: { backgroundColor: colors.theme_bg_three, padding: 10 }, + more_style2: { backgroundColor: colors.theme_bg_three, padding: 13 }, more_style3: { - fontSize: 16, + fontSize: 20, color: colors.theme_fg_two, fontFamily: font_title, }, @@ -105,5 +106,6 @@ const styles = StyleSheet.create({ fontSize: 16, color: colors.theme_fg_two, fontFamily: font_description, + paddingLeft:12 }, });