diff --git a/components/Nav.jsx b/components/Nav.jsx index af5921e..1b8058e 100644 --- a/components/Nav.jsx +++ b/components/Nav.jsx @@ -8,7 +8,7 @@ import { Caption } from './Typography'; const Nav = () => { const navigation = useNavigation(); return ( - + { const styles = StyleSheet.create({ nav: { - alignItems: 'center', - backgroundColor: '#fff', - borderColor: '#c2c2c2', - borderTopWidth: 1, - bottom: 0, - flexDirection: 'row', - height: 70, - justifyContent: 'space-around', - position: 'absolute', - textAlign: 'center', - width: '100%', + alignItems: 'center', + backgroundColor: '#fff', + borderColor: '#c2c2c2', + borderTopWidth: 1, + bottom: 0, + flexDirection: 'row', + height: 70, + justifyContent: 'space-around', + position: 'absolute', + textAlign: 'center', + width: '100%', }, innerNavContainer: { // justifyContent: 'space-around', diff --git a/components/RadioButton.jsx b/components/RadioButton.jsx index 70a366a..be5d76c 100644 --- a/components/RadioButton.jsx +++ b/components/RadioButton.jsx @@ -23,7 +23,9 @@ const RadioButton = ({ }, ]} /> - + {label || 'label'} diff --git a/screens/Home.jsx b/screens/Home.jsx index 0c9ed4f..1752bee 100644 --- a/screens/Home.jsx +++ b/screens/Home.jsx @@ -1,12 +1,18 @@ -import { SafeAreaView, ScrollView, StyleSheet, View } from 'react-native'; +import { + SafeAreaView, + ScrollView, + StyleSheet, + TouchableOpacity, + View, +} from 'react-native'; import Nav from '../components/Nav'; import FavoriteRecipesList from '../components/FavoriteRecipes'; import CategoryButton from '../components/CategoryButton'; import Macro from '../components/Macro'; import { useNavigation } from '@react-navigation/native'; import DietFilter from '../components/DietFilter'; -import { StatusBar } from 'react-native'; import { Title } from '../components/Typography'; +import { StatusBar } from 'react-native'; export const HomeScreen = () => { const navigation = useNavigation(); @@ -15,27 +21,38 @@ export const HomeScreen = () => { - - - - - + + + + + + + + navigation.navigate('Settings')} + > + + + navigation.navigate('Ingredient')} + title='Pantry' + /> + navigation.navigate('Filter')} + /> - - - navigation.navigate('Ingredients')} - title='Pantry' - /> - navigation.navigate('Filter')} - /> - - - Favorite Recipes - + + + Favorite Recipes + + + + + @@ -47,30 +64,36 @@ export const HomeScreen = () => { }; const styles = StyleSheet.create({ - screenContainer: { - backgroundColor: '#f2f2f2', - // padding: 10, - // marginBottom: 50, - }, - innerContainer: { + homeContainer: { paddingHorizontal: 16, + backgroundColor: '#f2f2f2', + paddingTop: 16, + flex: 1, }, macrosContainer: { backgroundColor: '#fff', - borderBottomRightRadius: 18, - borderBottomLeftRadius: 18, flexDirection: 'row', justifyContent: 'space-between', alignItems: 'center', - paddingVertical: 24, - paddingHorizontal: 16, + borderRadius: 9, + padding: 16, }, mainButtonsContainer: { flexDirection: 'row', - justifyContent: 'space-between', - paddingVertical: 48, + justifyContent: 'space-around', + marginVertical: 48, }, favoriteRecipesContainer: { - alignItems: 'center', + marginBottom: 16, + }, + favoriteRecipesTitle: { + borderBottomWidth: 1, + paddingBottom: 8, + borderColor: '#c2c2c2', + width: '100%', + marginBottom: 12, + }, + dietFilterContainer: { + marginBottom: 32, }, });