diff --git a/src/assets/Theme.js b/src/assets/Theme.js index 7320237..4ca8fe8 100644 --- a/src/assets/Theme.js +++ b/src/assets/Theme.js @@ -3,7 +3,7 @@ export const theme = { primaryText: "#161819", secondaryText: "#787878", primary: "#fffefd", - primary: "#E5EAEE", + primary: "#ffffff", secondary: "#bbe6ec", secondary: "#9DBBE2", tertiary: "#152432", diff --git a/src/navigation/AppNavigator.js b/src/navigation/AppNavigator.js index d6cb0de..4fd450d 100644 --- a/src/navigation/AppNavigator.js +++ b/src/navigation/AppNavigator.js @@ -13,7 +13,7 @@ import ProfileScreen from '../screens/ProfileScreen'; import HistoryScreen from '../screens/HistoryScreen'; import OthersScreen from '../screens/OthersScreen'; import Icon from 'react-native-vector-icons/Ionicons'; -import { theme } from '../../constants'; +import { theme } from '../assets/Theme'; const Stack = createNativeStackNavigator(); @@ -26,59 +26,15 @@ const TabIcon = ({ name, color, size }) => { function AppNavigator() { return ( - - - ({ - tabBarIcon: ({ focused, color, size }) => ( - - - ), - })} - /> - ({ - tabBarIcon: ({ focused, color, size }) => ( - - ), - tabBarBadge: 3, //borrar - })} - /> - ({ - tabBarIcon: ({ focused, color, size }) => ( - - ), - })} - /> - - - ); -} - -function StackNavigator() { - return ( + + screenOptions={{ + animationEnabled: false, + headerShown: false, + }}> - + + + ); +} + +function TabNavigator() { + return ( + + ({ + tabBarIcon: ({ focused, color, size }) => ( + + + ), + })} + /> + ({ + tabBarIcon: ({ focused, color, size }) => ( + + ), + tabBarBadge: 3, //borrar + })} + /> + ({ + tabBarIcon: ({ focused, color, size }) => ( + + ), + })} + /> + ); } diff --git a/src/screens/HistoryScreen.js b/src/screens/HistoryScreen.js index a69a6fd..ffa5cf1 100644 --- a/src/screens/HistoryScreen.js +++ b/src/screens/HistoryScreen.js @@ -1,7 +1,7 @@ import React from 'react'; import { StyleSheet, Text, View } from 'react-native'; import { StatusBar } from 'expo-status-bar'; -import { theme } from '../../constants'; +import { theme } from '../assets/Theme'; const OthersScreen = () => { return ( diff --git a/src/screens/OthersScreen.js b/src/screens/OthersScreen.js index 3a2ca63..bde9b75 100644 --- a/src/screens/OthersScreen.js +++ b/src/screens/OthersScreen.js @@ -1,7 +1,7 @@ import React from 'react'; import { StyleSheet, Text, View, TouchableOpacity } from 'react-native'; import { StatusBar } from 'expo-status-bar'; -import { theme } from '../../constants'; +import { theme } from '../assets/Theme'; const OthersScreen = () => { return ( diff --git a/src/utils/StyledText.js b/src/utils/StyledText.js index 8192d72..c76b044 100644 --- a/src/utils/StyledText.js +++ b/src/utils/StyledText.js @@ -3,7 +3,7 @@ import { Text, StyleSheet, Dimensions } from 'react-native'; import { theme } from "../assets/Theme"; const { height } = Dimensions.get('window'); -const regularTextSize = height * 0.025 +const regularTextSize = height * 0.024 const bigTextSize = height * 0.025 const grandbigText = height * 0.04