Commit 2eb305ec authored by Milan John Paul Digiuseppe's avatar Milan John Paul Digiuseppe
Browse files

Merge branch 'milan/expo-update-NEW' into 'master'

Update to Expo 39

See merge request !21
parents 0c327657 64837203
......@@ -3,7 +3,7 @@
"name": "Geo",
"slug": "geo",
"privacy": "public",
"sdkVersion": "36.0.0",
"sdkVersion": "39.0.0",
"platforms": ["ios", "android", "web"],
"version": "1.0.0",
"orientation": "portrait",
......@@ -19,7 +19,7 @@
"assetBundlePatterns": ["**/*"],
"facebookScheme": "fb710462976370982",
"facebookAppId": "710462976370982",
"facebookDisplayName": "GeoCache-",
"facebookDisplayName": "GeoCache",
"ios": {
"bundleIdentifier": "com.gamergroup.geo",
"buildNumber": "1.0.0",
......
This diff is collapsed.
......@@ -10,52 +10,53 @@
},
"dependencies": {
"@expo-google-fonts/nunito": "^0.1.0",
"@react-native-community/masked-view": "0.1.5",
"@react-navigation/bottom-tabs": "^5.4.1",
"@react-navigation/native": "^5.2.6",
"@react-navigation/stack": "^5.3.9",
"@react-native-community/masked-view": "0.1.10",
"@react-navigation/bottom-tabs": "5.11.2",
"@react-navigation/native": "5.8.10",
"@react-navigation/stack": "5.12.8",
"@reduxjs/toolkit": "^1.3.6",
"@types/react-native-indicators": "^0.16.0",
"@types/react-redux": "^7.1.7",
"expo": "^36.0.0",
"expo-asset": "~8.0.0",
"expo-av": "~8.0.0",
"expo-camera": "^8.2.0",
"expo-constants": "~8.0.0",
"expo-facebook": "~8.0.0",
"expo": "39.0.3",
"expo-asset": "8.2.0",
"expo-av": "8.6.0",
"expo-camera": "9.0.0",
"expo-constants": "9.2.0",
"expo-facebook": "9.0.0",
"expo-google-app-auth": "^8.1.2",
"expo-image-picker": "~8.0.1",
"expo-linear-gradient": "~8.0.0",
"expo-location": "~8.0.0",
"expo-permissions": "^8.1.0",
"firebase": "^7.15.0",
"expo-image-picker": "9.1.0",
"expo-linear-gradient": "8.3.0",
"expo-location": "9.0.0",
"expo-permissions": "9.3.0",
"expo-splash-screen": "0.8.1",
"firebase": "7.9.0",
"moment": "^2.24.0",
"react": "16.9.0",
"react-dom": "16.9.0",
"react-native": "https://github.com/expo/react-native/archive/sdk-36.0.1.tar.gz",
"react": "16.13.1",
"react-dom": "16.13.1",
"react-native": "https://github.com/expo/react-native/archive/sdk-39.0.3.tar.gz",
"react-native-drawer": "^2.5.1",
"react-native-elements": "^2.2.1",
"react-native-gesture-handler": "~1.5.0",
"react-native-gesture-handler": "1.7.0",
"react-native-indicators": "^0.17.0",
"react-native-maps": "0.26.1",
"react-native-modal": "^11.5.6",
"react-native-reanimated": "~1.4.0",
"react-native-safe-area-context": "0.6.0",
"react-native-screens": "2.0.0-alpha.12",
"react-native-svg": "9.13.3",
"react-native-maps": "0.27.1",
"react-native-modal": "11.5.6",
"react-native-reanimated": "1.13.0",
"react-native-safe-area-context": "3.1.4",
"react-native-screens": "2.10.1",
"react-native-svg": "12.1.0",
"react-native-swipe-list-view": "^2.4.0",
"react-native-swiper": "^1.6.0",
"react-native-touchable-scale": "^2.1.1",
"react-native-web": "^0.11.7",
"react-redux": "^7.1.1"
"react-native-web": "0.13.7",
"react-redux": "^7.2.1"
},
"devDependencies": {
"@babel/core": "^7.0.0",
"@types/react": "^16.9.0",
"@types/react-native": "^0.60.15",
"@types/react": "~16.9.35",
"@types/react-native": "~0.63.2",
"@typescript-eslint/eslint-plugin": "^2.31.0",
"@typescript-eslint/parser": "^2.31.0",
"babel-preset-expo": "^8.0.0",
"babel-preset-expo": "^8.3.0",
"eslint": "^6.8.0",
"eslint-config-airbnb": "^18.1.0",
"eslint-config-prettier": "^6.11.0",
......@@ -70,8 +71,9 @@
"eslint-plugin-react": "^7.19.0",
"eslint-plugin-react-hooks": "^2.5.1",
"eslint-plugin-standard": "^4.0.1",
"expo-cli": "4.0.13",
"prettier": "^2.0.5",
"typescript": "^3.8.3"
"typescript": "~3.9.2"
},
"private": true
}
......@@ -2,7 +2,7 @@
/* eslint-disable @typescript-eslint/no-var-requires */
/* eslint-disable @typescript-eslint/camelcase */
import React, { createContext } from 'react';
import { AppLoading } from 'expo';
import * as SplashScreen from 'expo-splash-screen';
import {
useFonts,
// Nunito_200ExtraLight,
......@@ -68,9 +68,11 @@ const AppLoader: React.FC = ({ children }) => {
geoLogoAsset.downloadAsync();
if (!fontsLoaded || !signInVideoAsset.downloaded || !geoLogoAsset.downloaded || authLoading) {
return <AppLoading />;
return null;
}
SplashScreen.hideAsync();
return (
<AssetContext.Provider value={{ signInVideo: signInVideoAsset, geoLogo: geoLogoAsset }}>
<View style={StyleSheet.absoluteFill}>
......
......@@ -65,7 +65,7 @@ export const UserLocationProvider: React.FC = ({ children }) => {
subscribeToUserLocation();
// Unsubscribe as component cleans up
return () => unsubscribe();
// return () => unsubscribe();
}, [setUserLocation]);
return (
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment