From cc44ceea8bc558c286956d44086b5c5610417fea Mon Sep 17 00:00:00 2001
From: GabrielTrettel <gabrielmtrettel@gmail.com>
Date: Tue, 23 Mar 2021 21:49:02 -0300
Subject: [PATCH] Changing app logo in login and register.

---
 src/App.js                        | 13 +++-----
 src/app/auth/storage.js           |  8 ++++-
 src/app/screens/LoginScreen.js    | 13 ++++----
 src/app/screens/RegisterScreen.js | 52 +++++++++++++++++--------------
 4 files changed, 48 insertions(+), 38 deletions(-)

diff --git a/src/App.js b/src/App.js
index 683f1e5..4a12611 100644
--- a/src/App.js
+++ b/src/App.js
@@ -1,4 +1,4 @@
-import React, { useState, useContext, useEffect } from "react";
+import React, { useState } from "react";
 import { NavigationContainer } from "@react-navigation/native";
 
 import navigationTheme from "./app/navigation/navigationTheme";
@@ -14,22 +14,19 @@ import CurrentLocationProvider from "./app/context/CurrentLocationContext";
 import AuthNavigator from "./app/navigation/AuthNavigator";
 import { AuthContext } from "./app/auth/context";
 import authStorage from "./app/auth/storage";
-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();
-    if (!token) return;
-
-    return setUser(jwtDecode(token));
+  const restoreUser = async () => {
+    const user = await authStorage.getUser();
+    if (user) setUser(user);
   };
 
   if (!isReady)
     return (
-      <AppLoading startAsync={restoreToken} onFinish={() => setIsReady(true)} />
+      <AppLoading startAsync={restoreUser} onFinish={() => setIsReady(true)} />
     );
 
   global.userDataBase = openDatabase();
diff --git a/src/app/auth/storage.js b/src/app/auth/storage.js
index 8af5ba1..ce28423 100644
--- a/src/app/auth/storage.js
+++ b/src/app/auth/storage.js
@@ -1,4 +1,5 @@
 import * as SecureStore from "expo-secure-store";
+import jwtDecode from "jwt-decode";
 
 const key = "authToke";
 
@@ -26,4 +27,9 @@ const removeToken = async () => {
   }
 };
 
-export default { setToken, getToken, removeToken };
+const getUser = async () => {
+  const token = await getToken();
+  return token ? jwtDecode(token) : null;
+};
+
+export default { setToken, getUser, removeToken };
diff --git a/src/app/screens/LoginScreen.js b/src/app/screens/LoginScreen.js
index 12dbd70..32a36d7 100644
--- a/src/app/screens/LoginScreen.js
+++ b/src/app/screens/LoginScreen.js
@@ -59,8 +59,13 @@ export default function LoginScreen(props) {
           handleSubmit(name, password, setLoginFailed)
         }
       >
-        {/* <Text style={styles.title}>Pega Chuva</Text> */}
-        <assets.AppLogoTitle style={styles.title} />
+        <assets.AppLogoTitle
+          preserveAspectRatio="xMidYMid meet"
+          width={300}
+          height={30}
+          alignSelf="center"
+          marginBottom={dimensions.spacing.big_padding}
+        />
 
         <ErrorMessage error="Email ou senha inválidos" visible={loginFailed} />
         <FormField
@@ -100,8 +105,4 @@ const styles = StyleSheet.create({
     padding: 10,
     justifyContent: "center",
   },
-  title: {
-    alignSelf: "center",
-    marginBottom: dimensions.spacing.big_padding,
-  },
 });
diff --git a/src/app/screens/RegisterScreen.js b/src/app/screens/RegisterScreen.js
index 090c365..503d9c5 100644
--- a/src/app/screens/RegisterScreen.js
+++ b/src/app/screens/RegisterScreen.js
@@ -10,9 +10,9 @@ import Screen from "../components/Screen";
 import { dimensions } from "../config/dimensions";
 import colors from "../config/colors";
 import { KeyboardAwareScrollView } from "react-native-keyboard-aware-scroll-view";
+import assets from "../config/assets";
 import * as Yup from "yup";
 
-
 const phoneRegex = RegExp(
   /^\(?[\(]?([0-9]{2})?\)?[)\b]?([0-9]{4,5})[-. ]?([0-9]{4})$/
 );
@@ -34,20 +34,17 @@ const validationSchema = Yup.object().shape({
     .matches(/[a-zA-Z]/, "A senha só pode conter letras"),
 });
 
-
-
 export default function RegisterScreen(props) {
   const [singUpFailed, setSingUpFailed] = useState(false);
 
   const comparePassword = (password, confirmPassword) => {
-    if(password !== confirmPassword){
+    if (password !== confirmPassword) {
       setSingUpFailed(true);
-      console.log("Senhas Diferentes")
-    }
-    else{
+      console.log("Senhas Diferentes");
+    } else {
       setSingUpFailed(false);
     }
-  }
+  };
 
   return (
     <Screen style={styles.containter}>
@@ -58,19 +55,26 @@ export default function RegisterScreen(props) {
           password: "",
           confirmPassword: "",
         }}
-        onSubmit={({name, number, password, confirmPassword}) => {
+        onSubmit={({ name, number, password, confirmPassword }) => {
           comparePassword(password, confirmPassword);
-          console.log("cadastro ainda não implementado")
+          console.log("cadastro ainda não implementado");
         }}
         validationSchema={validationSchema}
       >
-        <View style={{ flex: 1, flexDirection: "column", justifyContent: "center" }}>
+        <View
+          style={{ flex: 1, flexDirection: "column", justifyContent: "center" }}
+        >
           <View style={{ flex: 1, justifyContent: "flex-end" }}>
-            <Text style={styles.title}>Pega Chuva</Text>
+            <assets.AppLogoTitle
+              preserveAspectRatio="xMidYMid meet"
+              width={300}
+              height={30}
+              alignSelf="center"
+              marginBottom={dimensions.spacing.big_padding}
+            />
           </View>
           <View style={{ flex: 6 }}>
-            <KeyboardAwareScrollView
-              scrollEnabled={true}>
+            <KeyboardAwareScrollView scrollEnabled={true}>
               <View>
                 <Text style={styles.labelStyle}> Nome Completo: </Text>
                 <FormField
@@ -106,10 +110,17 @@ export default function RegisterScreen(props) {
                   numberOfLines={1}
                   placeholder="Nome Completo"
                 />
-              </View>              
-              <ErrorMessage error="As senhas não correspondem" visible={singUpFailed} />
+              </View>
+              <ErrorMessage
+                error="As senhas não correspondem"
+                visible={singUpFailed}
+              />
 
-              <SubmitButton title="cadastrar" backgroundColor={colors.primary} marginTop={10} />
+              <SubmitButton
+                title="cadastrar"
+                backgroundColor={colors.primary}
+                marginTop={10}
+              />
 
               <TouchableNativeFeedback
                 onPress={() => {
@@ -125,7 +136,7 @@ export default function RegisterScreen(props) {
           </View>
         </View>
       </Form>
-    </Screen >
+    </Screen>
   );
 }
 
@@ -136,11 +147,6 @@ const styles = StyleSheet.create({
     textAlign: "center",
     padding: 10,
   },
-  title: {
-    fontSize: dimensions.text.header,
-    marginBottom: dimensions.spacing.big_padding,
-    textAlign: "center",
-  },
   labelStyle: {
     fontSize: dimensions.text.secondary,
     fontWeight: "bold",