Merge pull request #6 from fabianamasini/develop

Develop

coronasavior/App.js

@@ -1,18 +1,10 @@
 import React from 'react';
-import Router from './router.js';
-import { StyleSheet, Text } from 'react-native';
+import Routes from './router.js';
+
 
 export default function App() {
   return (
-    <Router />
+    <Routes/>
   );
 }
 
-const styles = StyleSheet.create({
-  container: {
-    flex: 1,
-    backgroundColor: '#fff',
-    alignItems: 'center',
-    justifyContent: 'center',
-  },
-});

coronasavior/components/FloatingLabelInput.js

@@ -1,11 +1,8 @@
-import React, { useState } from 'react';
+import React, { useState, forwardRef } from 'react';
 import { StyleSheet, View, TextInput, Text } from 'react-native'
 
-import { styles } from '../utils/style.js'
-
-const FloatingLabelInput = (props) => {
+const FloatingLabelInput = forwardRef((props, ref) => {
     const [isFocused, setIsFocused] = useState(false)
-    const [error, setError] = useState("")
 
     const handleFocus = () => {
         setIsFocused(true)
@@ -24,7 +21,7 @@ const FloatingLabelInput = (props) => {
           color: isFocused || props.value.length > 0  ?  '#000':'#aaa' ,
       }
   })
-
+      
     return (
       <View style={{ paddingTop: 20, paddingBottom: 20 }}>
           <Text style={componentStyles.labelStyle}>{props.label}</Text>
@@ -33,11 +30,14 @@ const FloatingLabelInput = (props) => {
               onFocus={handleFocus}
               onBlur={handleBlur}
               onChangeText={props.action}
-              onChange={() => setError('')}
               secureTextEntry={props.security ? props.security : false}
+              blurOnSubmit={false}
+              accessibilityLabel={props.accessibility}
+              ref={ref}
+              onSubmitEditing={props.onSubmitEditing}
           />
       </View>
     )
-}
+})
 
 export default FloatingLabelInput;

coronasavior/package.json

@@ -9,6 +9,9 @@
   },
   "dependencies": {
     "@react-native-community/masked-view": "^0.1.10",
+    "@react-navigation/drawer": "^5.7.4",
+    "@react-navigation/native": "^5.3.2",
+    "@react-navigation/stack": "^5.3.5",
     "axios": "^0.19.2",
     "expo": "~37.0.3",
     "react": "~16.9.0",
@@ -18,9 +21,7 @@
     "react-native-reanimated": "~1.7.0",
     "react-native-safe-area-context": "^1.0.0",
     "react-native-screens": "~2.2.0",
-    "react-native-web": "~0.11.7",
-    "react-navigation": "^4.3.9",
-    "react-navigation-stack": "^2.5.0"
+    "react-native-web": "~0.11.7"
   },
   "devDependencies": {
     "babel-preset-expo": "~8.1.0",

coronasavior/router.js

@@ -1,52 +1,21 @@
-import { createAppContainer } from 'react-navigation';
-import { createStackNavigator } from 'react-navigation-stack';
+import React from 'react';
+import { createStackNavigator }  from '@react-navigation/stack'
+import { NavigationContainer } from '@react-navigation/native'
 
-import { lightGreen } from './utils/constants'
+import stackNav from './routes/stackNavigation'
+import drawerNav from './routes/drawerNavigation'
 
-import Login from './screens/login';
-import SignUp from './screens/signup';
-import Profile from './screens/profile';
-import Home from './screens/home';
+const Stack = createStackNavigator()
 
-const Routes = createAppContainer(
-    createStackNavigator({
-        Login : {
-            screen: Login,
-            navigationOptions: {
-                headerShown: true,
-                headerLeft: () => null
-            }
-        },
-        SignUp : {
-            screen: SignUp,
-            navigationOptions: {
-                headerShown: true,
-                headerLeft: () => null
-            }
-        },
-        Profile : {
-            screen: Profile,
-            navigationOptions: {
-                headerShown: true,
-                headerLeft: () => null
-            }
-        },
-        Home : {
-            screen: Home,
-            navigationOptions: {
-                headerShown: true,
-                headerLeft: () => null
-            }
-        }
-    }, {
-        defaultNavigationOptions: {
-            headerTintColor: '#fff',
-            headerBackTitleVisible: false,
-            headerStyle: {
-                backgroundColor: lightGreen,
-            }
-        }
-    })
-);
+function Routes() {
+  return (
+    <NavigationContainer>
+      <Stack.Navigator screenOptions={{ headerShown: false }}>
+        <Stack.Screen name='Stack' component={stackNav}/>
+        <Stack.Screen name='Drawer' component={drawerNav} />
+      </Stack.Navigator>
+    </NavigationContainer>
+  )
+}
 
-export default Routes;
+export default Routes;

coronasavior/routes/drawerNavigation.js

@@ -0,0 +1,18 @@
+import { createDrawerNavigator } from '@react-navigation/drawer';
+import React from 'react';
+
+import Profile from '../screens/profile';
+import Home from '../screens/home';
+
+const Drawer = createDrawerNavigator()
+
+function drawerNav() {
+  return (
+    <Drawer.Navigator>
+      <Drawer.Screen name='Home' component={Home} />
+      <Drawer.Screen name='Profile' component={Profile}/>
+    </Drawer.Navigator>
+  )
+}
+
+export default drawerNav;