ordering-ui-react-native 0.18.58-test → 0.18.58-test1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ordering-ui-react-native",
-  "version": "0.18.58-test",
+  "version": "0.18.58-test1",
   "description": "Reusable components made in react native",
   "main": "src/index.tsx",
   "author": "ordering.inc",

package/themes/original/src/components/AddressForm/index.tsx

@@ -6,6 +6,7 @@ import {
 	Keyboard,
 	TouchableWithoutFeedback,
 	Platform,
+	Text,
 } from 'react-native';
 import {
 	AddressForm as AddressFormController,
@@ -145,6 +146,7 @@ const AddressFormUI = (props: AddressFormParams) => {
 		address: null,
 	});
 	const [isFirstTime, setIsFirstTime] = useState(true);
+	const [errorState, setErrorState] = useState({});
 	const [locationChange, setLocationChange] = useState(
 		isEditing
 			? addressState?.address?.location
@@ -344,6 +346,10 @@ const AddressFormUI = (props: AddressFormParams) => {
 	};
 
 	const handleChangeAddress = (data: any, details: any) => {
+		setErrorState({
+			...errorState,
+			handleChangeAddress: {data: data, details: details}
+		})
 		const addressSelected = {
 			address: data?.description || data?.address,
 			location: details?.geometry?.location,
@@ -644,6 +650,8 @@ const AddressFormUI = (props: AddressFormParams) => {
 												}}
 												IconButton={<OIcon src={theme.images.general.pin} width={16} />}
 												isIntGeoCoder
+												errorState={errorState}
+												setErrorState={setErrorState}
 											/>
 										</View>
 									)}
@@ -808,6 +816,9 @@ const AddressFormUI = (props: AddressFormParams) => {
 								/>
 							)}
 						</FormInput>
+						<Text>
+							{JSON.stringify(errorState)}
+						</Text>
 						{!isHideIcons && (
 							<IconsContainer>
 								{tagsName.map((tag) => (

package/themes/original/src/components/GPSButton/index.tsx

@@ -3,6 +3,14 @@ import Geocoder from 'react-native-geocoding'
 import { ActivityIndicator } from 'react-native-paper'
 import Geolocation from '@react-native-community/geolocation'
 import { getTrackingStatus, requestTrackingPermission } from 'react-native-tracking-transparency'
+import { Platform } from 'react-native'
+
+import {
+	PERMISSIONS,
+	PermissionStatus,
+	request,
+	openSettings,
+} from 'react-native-permissions';
 
 import { OText } from '../shared'
 import { GpsButtonStyle } from './styles'
@@ -13,7 +21,9 @@ export const GPSButton = (props: any) => {
 		apiKey,
     IconButton,
     IconLoadingButton,
-    isIntGeoCoder
+    isIntGeoCoder,
+    errorState,
+    setErrorState
   } = props
 
 	const [isLoading, setLoading] = useState(false);
@@ -23,6 +33,10 @@ export const GPSButton = (props: any) => {
       latitude: pos.latitude,
       longitude: pos.longitude
     }).then(({ results }: any) => {
+      setErrorState({
+        ...errorState,
+        geoCodePosition: results
+      })
       let zipcode = null
       if (results && results.length > 0) {
         for (const component of results[0].address_components) {
@@ -32,7 +46,7 @@ export const GPSButton = (props: any) => {
             break
           }
         }
-        let data = null
+        let data : any
         const details = {
           geometry: { location: { lat: pos.latitude, lng: pos.longitude } }
         }
@@ -52,6 +66,10 @@ export const GPSButton = (props: any) => {
 			setLoading(false);
     }).catch((err: any) => {
       console.log(err);
+      setErrorState({
+        ...errorState,
+        fallbackGeoCodePosition: err
+      })
 			setLoading(false);
     })
   }
@@ -61,17 +79,58 @@ export const GPSButton = (props: any) => {
     if (trackingStatus === 'not-determined') {
       trackingStatus = await requestTrackingPermission()
     }
+    setErrorState({
+      ...errorState,
+      trackingStatus: trackingStatus
+    })
     if (trackingStatus === 'authorized' || trackingStatus === 'unavailable') {
       setLoading(true)
       Geolocation.getCurrentPosition((pos) => {
+        setErrorState({
+          ...errorState,
+          getCurrentPosition: pos
+        })
         geoCodePosition(pos.coords)
       }, (err) => {
+        setErrorState({
+          ...errorState,
+          fallbackGetCurrentPosition: err
+        })
         setLoading(false);
         console.log(`ERROR(${err.code}): ${err.message}`)
       }, {
         enableHighAccuracy: true, timeout: 15000, maximumAge: 10000
       })
+      return
     }
+    let permissionStatus: PermissionStatus;
+		setLoading(true)
+		if (Platform.OS === 'ios') {
+		  permissionStatus = await request(PERMISSIONS.IOS.LOCATION_WHEN_IN_USE);
+		} else {
+		  permissionStatus = await request(
+			  PERMISSIONS.ANDROID.ACCESS_FINE_LOCATION,
+		  );
+		}
+    if (permissionStatus === 'denied') {
+		  openSettings();
+		}
+    Geolocation.getCurrentPosition((pos) => {
+      setErrorState({
+        ...errorState,
+        getCurrentPositionNew: pos
+      })
+      geoCodePosition(pos.coords)
+    }, (err) => {
+      setErrorState({
+        ...errorState,
+        fallbackGetCurrentPositionNew: err
+      })
+      setLoading(false);
+      console.log(`ERROR(${err.code}): ${err.message}`)
+    }, {
+      enableHighAccuracy: true, timeout: 15000, maximumAge: 10000
+    })
   }
 
   useEffect(() => {