diff --git a/LeftOvers/components/FoodElementText.tsx b/LeftOvers/components/FoodElementText.tsx index bc9eefc..7e211cd 100644 --- a/LeftOvers/components/FoodElementText.tsx +++ b/LeftOvers/components/FoodElementText.tsx @@ -1,6 +1,5 @@ import React, { useContext } from 'react'; -import {StyleSheet,Pressable, Text, View, Image} from 'react-native'; -import Separator from '../components/Separator'; +import {StyleSheet,Pressable, Text, View} from 'react-native'; import ColorContext from '../theme/ColorContext'; @@ -12,8 +11,8 @@ const componentHeight = 60; const componentWidth = 280; -export default function FoodElementText(props : any) { - const {colors, toggleColors } = useContext(ColorContext) +export default function FoodElementText(props : foodElementImageProps) { + const colors = useContext(ColorContext).colors const styles = StyleSheet.create({ button: { diff --git a/LeftOvers/screens/IngredientSelection.tsx b/LeftOvers/screens/IngredientSelection.tsx index bb206ed..aa37de7 100644 --- a/LeftOvers/screens/IngredientSelection.tsx +++ b/LeftOvers/screens/IngredientSelection.tsx @@ -1,4 +1,4 @@ -import React, { useEffect, useState } from 'react'; +import React, { useContext, useEffect, useState } from 'react'; import { View, StyleSheet, Text, Image, Pressable, ActivityIndicator, FlatList } from 'react-native'; import { SafeAreaProvider } from 'react-native-safe-area-context'; import { Searchbar } from 'react-native-paper'; @@ -7,11 +7,14 @@ import FoodElementText from '../components/FoodElementText'; import CustomButton from '../components/CustomButton'; import Ingredient from '../Models/Ingredient'; import IngredientService from '../Services/Ingredients/IngredientsServices'; +import ColorContext from '../theme/ColorContext'; import plus from '../assets/images/plus.png'; import moins from '../assets/images/minus.png'; export default function IngredientSelection(props) { + const colors = useContext(ColorContext).colors + const alphabetArray: Array = ["A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z"]; const [isLoading, setIsLoading] = useState(true); const [error, setError] = useState(); @@ -110,13 +113,13 @@ export default function IngredientSelection(props) { return ( - - + + {alphabetArray.map((source, index) => ( handleLetterPress(source)}> - {source} + {source} ))} @@ -128,9 +131,9 @@ export default function IngredientSelection(props) { value={searchQuery} style={{ margin: 10, - backgroundColor: '#F2F0E4', + backgroundColor: colors.cardBackground, borderWidth: 1, - borderColor: "#ACA279", + borderColor:colors.cardTitle, borderRadius: 15, height: 50, }} /> @@ -152,9 +155,9 @@ export default function IngredientSelection(props) { - + - Selected + Selected @@ -182,14 +185,12 @@ export default function IngredientSelection(props) { const styles = StyleSheet.create({ page: { flex: 1, - backgroundColor: '#59BDCD', alignItems: 'center', display: 'flex', flexWrap: 'wrap', padding: 20, }, element: { - backgroundColor: '#F2F0E4', borderRadius: 30, }, horizontalAlignement: {