diff --git a/src/App.js b/src/App.js index 7bdf159..683f1e5 100644 --- a/src/App.js +++ b/src/App.js @@ -4,6 +4,7 @@ import { NavigationContainer } from "@react-navigation/native"; import navigationTheme from "./app/navigation/navigationTheme"; import "./app/config/globals.js"; import openDatabase from "./app/database/database-connection"; +import { AppLoading } from "expo"; import initDatabase from "./app/database/database-init"; import FlashMessage from "react-native-flash-message"; @@ -17,6 +18,7 @@ import jwtDecode from "jwt-decode"; export default function App() { const [user, setUser] = useState(); + const [isReady, setIsReady] = useState(); const restoreToken = async () => { const token = await authStorage.getToken(); @@ -25,9 +27,10 @@ export default function App() { return setUser(jwtDecode(token)); }; - useEffect(() => { - restoreToken(); - }, []); + if (!isReady) + return ( + setIsReady(true)} /> + ); global.userDataBase = openDatabase(); initDatabase(global.userDataBase); diff --git a/src/app.json b/src/app.json index bb5bc09..281cb0f 100644 --- a/src/app.json +++ b/src/app.json @@ -6,7 +6,7 @@ "orientation": "portrait", "icon": "./app/assets/icon.png", "splash": { - "image": "./app/assets/splash.png", + "image": "./app/assets/icons/splash.png", "resizeMode": "contain", "backgroundColor": "#ffffff" }, diff --git a/src/app/assets/icons/logo_title.svg b/src/app/assets/icons/logo_title.svg new file mode 100644 index 0000000..cd041f9 --- /dev/null +++ b/src/app/assets/icons/logo_title.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/app/assets/icons/pega_chuva.png b/src/app/assets/icons/pega_chuva.png new file mode 100644 index 0000000..51c5111 Binary files /dev/null and b/src/app/assets/icons/pega_chuva.png differ diff --git a/src/app/assets/icons/splash.png b/src/app/assets/icons/splash.png new file mode 100644 index 0000000..562f05c Binary files /dev/null and b/src/app/assets/icons/splash.png differ diff --git a/src/app/assets/splash.png b/src/app/assets/splash.png deleted file mode 100644 index 74cbcb1..0000000 Binary files a/src/app/assets/splash.png and /dev/null differ diff --git a/src/app/config/assets.js b/src/app/config/assets.js index 8366300..03a3afb 100644 --- a/src/app/config/assets.js +++ b/src/app/config/assets.js @@ -2,6 +2,7 @@ import Pluviometer from "../assets/pluviometer/pluviometer-logo.svg"; import RainIcon from "../assets/rain/rain-icon.svg"; import RiverIcon from "../assets/river/river-logo.svg"; import FloodZones from "../assets/floodZonesAssets/floodZones-logo.svg"; +import AppLogoTitle from "../assets/icons/logo_title.svg"; import RiverFlood from "../assets/river/river_extravasado.svg"; import RiverLow from "../assets/river/river_low.svg"; @@ -79,4 +80,5 @@ export default { }, pluviometer: require("../assets/pluviometer/diario_pluviometrico.png"), PluviometerIcon: Pluviometer, + AppLogoTitle: AppLogoTitle, }; diff --git a/src/app/screens/LoginScreen.js b/src/app/screens/LoginScreen.js index 702faf2..12dbd70 100644 --- a/src/app/screens/LoginScreen.js +++ b/src/app/screens/LoginScreen.js @@ -15,6 +15,7 @@ import login from "../api/auth"; import jwdDecode from "jwt-decode"; import { AuthContext } from "../auth/context"; import authStorage from "../auth/storage"; +import assets from "../config/assets"; const phoneRegex = RegExp( /^\(?[\(]?([0-9]{2})?\)?[)\b]?([0-9]{4,5})[-. ]?([0-9]{4})$/ @@ -58,7 +59,8 @@ export default function LoginScreen(props) { handleSubmit(name, password, setLoginFailed) } > - Pega Chuva + {/* Pega Chuva */} +