diff --git a/LeftOvers/App.tsx b/LeftOvers/App.tsx index 02e37c5..8a8b1b2 100644 --- a/LeftOvers/App.tsx +++ b/LeftOvers/App.tsx @@ -5,6 +5,7 @@ import ValidateButton from './components/ValidateButton'; import { LinearGradient } from 'expo-linear-gradient'; import RecipeSuggestion from './screens/RecipeSuggestion'; import RecipeDetails from './screens/RecipeDetails'; +import IngredientSelection from './screens/IngredientSelection'; export default function App() { const all = [{value: "Mussels"}, {value: "Skimmed Milk"}, {value: "Nuts"}] @@ -36,14 +37,15 @@ export default function App() { const ingredients = generateList(); return ( - /* */ - + /**/ + /* + >*/ ); } diff --git a/LeftOvers/assets/images/fruit_icon.png b/LeftOvers/assets/images/fruit_icon.png new file mode 100644 index 0000000..4b20059 Binary files /dev/null and b/LeftOvers/assets/images/fruit_icon.png differ diff --git a/LeftOvers/assets/images/meat_icon.png b/LeftOvers/assets/images/meat_icon.png new file mode 100644 index 0000000..3eafc63 Binary files /dev/null and b/LeftOvers/assets/images/meat_icon.png differ diff --git a/LeftOvers/assets/images/vegetable_icon.png b/LeftOvers/assets/images/vegetable_icon.png new file mode 100644 index 0000000..2295c99 Binary files /dev/null and b/LeftOvers/assets/images/vegetable_icon.png differ diff --git a/LeftOvers/naviguation/parameter.png b/LeftOvers/naviguation/parameter.png deleted file mode 100644 index 08425b4..0000000 Binary files a/LeftOvers/naviguation/parameter.png and /dev/null differ diff --git a/LeftOvers/screens/IngredientSelection.tsx b/LeftOvers/screens/IngredientSelection.tsx index 6e8fa0a..8500cc5 100644 --- a/LeftOvers/screens/IngredientSelection.tsx +++ b/LeftOvers/screens/IngredientSelection.tsx @@ -6,14 +6,39 @@ import { Searchbar } from 'react-native-paper'; import brochette from '../assets/images/brochette.png'; import FoodElementText from '../components/FoodElementText'; import CustomButton from '../components/CustomButton'; +import plus from '../assets/images/plus.png'; +import moins from '../assets/images/minus.png'; +import meat from '../assets/images/meat_icon.png'; +import vegetable from '../assets/images/vegetable_icon.png'; +import fruit from '../assets/images/fruit_icon.png'; -export default function IngredientSelection() { +export default function IngredientSelection(props) { const [searchQuery, setSearchQuery] = React.useState(''); const onChangeSearch = query => setSearchQuery(query); + type ItemProps = {value: string} + + const AvailaibleItem = ({value}: ItemProps) => ( + <> + + + + + +) + +const ChooseItem = ({value}: ItemProps) => ( + <> + + + + + +) + return ( @@ -22,16 +47,13 @@ export default function IngredientSelection() { - - - - + - + - + @@ -49,70 +71,26 @@ export default function IngredientSelection() { - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + {props.listIngredient.map((source, index) => ( + + ))} - Available - + - - - - - - - - - - - - - - - - - + {props.listIngredient.map((source, index) => ( + + ))}