diff --git a/src/components/Dropdown.js b/src/components/Dropdown.js
index cedcf3b..a0effda 100644
--- a/src/components/Dropdown.js
+++ b/src/components/Dropdown.js
@@ -1,6 +1,6 @@
import React from 'react'
import styled from 'styled-components'
-import { Text, View } from 'react-native'
+import { Text, TouchableOpacity, View } from 'react-native'
const WrapperDropdown = styled(View)`
display: flex;
@@ -17,7 +17,7 @@ const WrapperDropdown = styled(View)`
border-bottom-left-radius: 10px;
border-bottom-right-radius: 10px;
`
-const DropdownItem = styled(Text)`
+const DropdownItem = styled(TouchableOpacity)`
color: ${({ theme }) => theme.colors.textW2};
font-size: 20px;
`
@@ -41,7 +41,7 @@ const Dropdown = (props) => {
let dropdownList = newArray.map((element, index) => {
return (
- props.setElement(element)}>{element}
+ props.setElement(element)}>{element}
)
diff --git a/src/components/GroceryList/TabMenu.js b/src/components/GroceryList/TabMenu.js
index 7db535c..7e5c210 100644
--- a/src/components/GroceryList/TabMenu.js
+++ b/src/components/GroceryList/TabMenu.js
@@ -15,10 +15,10 @@ const TabMenu = (props) => {
return (
- handleTabPress("Groceries")}>
+ handleTabPress("Groceries")}>
{/* */}
- handleTabPress("Products")}>
+ handleTabPress("Products")}>
{/* */}
diff --git a/src/components/GroceryList/groceries/GroceryButtons.js b/src/components/GroceryList/groceries/GroceryButtons.js
index 907552d..8f9e95b 100644
--- a/src/components/GroceryList/groceries/GroceryButtons.js
+++ b/src/components/GroceryList/groceries/GroceryButtons.js
@@ -18,7 +18,7 @@ const SelectAllItemsButton = (props) => {
listId && setToggleAnim(!toggleAnim)
}
return (
-
+
{/* */}
)
@@ -33,7 +33,7 @@ const RemoveItemsButton = (props) => {
}
}
return (
-
+
{/* */}
)
@@ -45,7 +45,7 @@ export const ContainerButtons = (props) => {
<>
- setVisible(!visible)}>
+ setVisible(!visible)}>
{/* */}
>
@@ -59,7 +59,7 @@ export const AddItemButton = (props) => {
if (lists.find((list) => list.open === true)) {
return (
<>
- setVisibleItem(true)}>
+ setVisibleItem(true)}>
{/* */}
setVisibleItem(false)} />
@@ -68,7 +68,7 @@ export const AddItemButton = (props) => {
}
return (
<>
- setVisibleList(true)}>
+ setVisibleList(true)}>
{/* */}
setVisibleList(false)} />
diff --git a/src/components/GroceryList/groceries/ListedItem.js b/src/components/GroceryList/groceries/ListedItem.js
index 1fc9083..b9f5395 100644
--- a/src/components/GroceryList/groceries/ListedItem.js
+++ b/src/components/GroceryList/groceries/ListedItem.js
@@ -15,15 +15,15 @@ const ListedItem = React.memo((props) => {
return (
- { props.setVisible(true); return dispatch(modalToggle(item._id)) }}>
+ { props.setVisible(true); return dispatch(modalToggle(item._id)) }}>
{item.productName}
{item.details}
{item.amount.am}{item.amount.qt && " " + item.amount.qt}
{item.person && item.person}
- {/* {product.image && } */}
+ {/* {product.image && } */}
- dispatch(checkToggle(item._id))} >
+ dispatch(checkToggle(item._id))} >
diff --git a/src/components/GroceryList/groceries/styles/list.js b/src/components/GroceryList/groceries/styles/list.js
index e795304..bb60a80 100644
--- a/src/components/GroceryList/groceries/styles/list.js
+++ b/src/components/GroceryList/groceries/styles/list.js
@@ -85,7 +85,7 @@ export const TextTotalAmount = styled(Text)`
position: absolute;
align-self: flex-end;
z-index: 2;
- top:60px;
+ top:70px;
right:0px;
font-size: 20px;
color: ${({ theme }) => theme.colors.textW1};
diff --git a/src/components/GroceryList/groceries/styles/listedItem.js b/src/components/GroceryList/groceries/styles/listedItem.js
index 7905515..564c874 100644
--- a/src/components/GroceryList/groceries/styles/listedItem.js
+++ b/src/components/GroceryList/groceries/styles/listedItem.js
@@ -1,4 +1,4 @@
-import { Text, View, Image} from 'react-native'
+import { Text, View, Image, TouchableOpacity} from 'react-native'
import styled, { css } from 'styled-components'
export const Wrapper = styled(View)`
@@ -17,7 +17,7 @@ export const DarkLayer = styled(View)`
margin-left: 7px;
`
-export const WrapperItem = styled(View)`
+export const WrapperItem = styled(TouchableOpacity)`
box-shadow: ${({ theme }) => theme.colors.shadow};
display: flex;
min-height: ${props => props.person ? css`60px` : css`30px`};
@@ -30,7 +30,7 @@ export const WrapperItem = styled(View)`
background-color: ${props => props.checked ? props.theme.colors.itemSelected : props.color + '66'};
`
-export const WrapperButton = styled(View)`
+export const WrapperButton = styled(TouchableOpacity)`
height: 30px;
width: 40px;
`
@@ -90,7 +90,7 @@ export const TextPerson = styled(Text)`
`
export const StyledImage = styled(Image)`
position: absolute;
- object-fit: cover;
+ resize-mode: contain;
opacity: 0.05;
height: 100%;
width: 200px;
diff --git a/src/components/GroceryList/products/ListedProduct.js b/src/components/GroceryList/products/ListedProduct.js
index 09c3703..d6d6f97 100644
--- a/src/components/GroceryList/products/ListedProduct.js
+++ b/src/components/GroceryList/products/ListedProduct.js
@@ -13,15 +13,15 @@ const ListedProduct = React.memo((props) => {
const tag = useSelector(state => findTag(state, product.tag))
return (
- {props.setVisible(true); return dispatch(modalToggle(product._id))}}>
+ {props.setVisible(true); return dispatch(modalToggle(product._id))}}>
{product.productName}
{tag.tagName}
- {product.price !== 0&& € {product.price}}
+ {/* {product.price !== 0&& € {product.price}} */}
- {product.image && }
+ {/* {product.image && } */}
- dispatch(checkToggle(product._id))} >
+ dispatch(checkToggle(product._id))} >
{/* */}
diff --git a/src/components/GroceryList/products/styles/listedProduct.js b/src/components/GroceryList/products/styles/listedProduct.js
index ee01471..b28a598 100644
--- a/src/components/GroceryList/products/styles/listedProduct.js
+++ b/src/components/GroceryList/products/styles/listedProduct.js
@@ -1,4 +1,4 @@
-import { View, Text, Image } from 'react-native'
+import { View, Text, Image, TouchableOpacity } from 'react-native'
import styled, { css } from 'styled-components'
//dependencies
import { HiCheck } from 'react-icons/hi'
@@ -15,7 +15,7 @@ export const Wrapper = styled(View)`
width: 100vw;
}
`
-export const WrapperProduct = styled(View)`
+export const WrapperProduct = styled(TouchableOpacity)`
box-shadow: ${({theme})=> theme.colors.shadow};
display: flex;
flex: 1;
@@ -28,7 +28,7 @@ export const WrapperProduct = styled(View)`
background-color: ${props => props.checked ? props.theme.colors.itemSelected : props.color + '66'};
`
-export const WrapperButton = styled(View)`
+export const WrapperButton = styled(TouchableOpacity)`
height: 60px;
width: 40px;
`
@@ -45,7 +45,7 @@ export const CheckButton = styled(View)`
background-color: ${props => props.checked ? props.theme.colors.selected : props.theme.colors.buttonGrey};
`
-export const WrapperText = styled(View)`
+export const WrapperText = styled(Text)`
flex:1;
max-width:600px;
@media ${({ theme }) => theme.mediaQueries.below768}{
@@ -80,7 +80,7 @@ export const StyledImage = styled(Image)`
position: absolute;
top:0;
right:0;
- object-fit: cover;
+ resize-mode: contain;
width: 100px;
height: 100%;
max-height:120px;
diff --git a/src/components/GroceryList/styles/tabMenu.js b/src/components/GroceryList/styles/tabMenu.js
index 1ccb1ed..983f996 100644
--- a/src/components/GroceryList/styles/tabMenu.js
+++ b/src/components/GroceryList/styles/tabMenu.js
@@ -1,4 +1,4 @@
-import { View } from 'react-native'
+import { TouchableOpacity, View } from 'react-native'
import styled, { css } from 'styled-components'
import { RiShoppingBasketLine } from 'react-icons/ri'
import { FaAppleAlt } from 'react-icons/fa'
@@ -7,7 +7,7 @@ import { FaAppleAlt } from 'react-icons/fa'
const iconSize = '2.0px'
const iconSizeSelected = '2.5px'
-const WrapperIcon = styled(View)`
+const WrapperIcon = styled(TouchableOpacity)`
display: flex;
align-items: center;
justify-content: center;
diff --git a/src/components/modals/groceries/ModalAddItem.js b/src/components/modals/groceries/ModalAddItem.js
index 900ccd6..6829b43 100644
--- a/src/components/modals/groceries/ModalAddItem.js
+++ b/src/components/modals/groceries/ModalAddItem.js
@@ -66,7 +66,7 @@ const ModalAddItem = (props) => {
return (
Add product
- {/* {product && product.image && } */}
+ {/* {product && product.image && } */}
setFocusedProduct(true)} onBlur={() => { setTimeout(() => { setFocusedProduct(false) }, 100) }}
diff --git a/src/components/modals/groceries/ModalAddProduct.js b/src/components/modals/groceries/ModalAddProduct.js
index 9de82df..9185cf6 100644
--- a/src/components/modals/groceries/ModalAddProduct.js
+++ b/src/components/modals/groceries/ModalAddProduct.js
@@ -79,7 +79,7 @@ export const ModalAddProduct = (props) => {
onChange={(text) => setImage(text.target.value)}
placeholder="Image link" />
- {image && }
+ {image && }
diff --git a/src/components/modals/groceries/ModalEditItem.js b/src/components/modals/groceries/ModalEditItem.js
index dea57a3..7a5f2b8 100644
--- a/src/components/modals/groceries/ModalEditItem.js
+++ b/src/components/modals/groceries/ModalEditItem.js
@@ -63,7 +63,7 @@ const ModalEditItem = (props) => {
return (
- {product && product.image && }
+ {product && product.image && }
€ {price}
{tagState.tagName}
diff --git a/src/components/modals/groceries/ModalEditProduct.js b/src/components/modals/groceries/ModalEditProduct.js
index 39b5804..56ab0f4 100644
--- a/src/components/modals/groceries/ModalEditProduct.js
+++ b/src/components/modals/groceries/ModalEditProduct.js
@@ -48,7 +48,7 @@ const ModalEditProduct = (props) => {
return (
- {image && }
+ {image && }
€ {price}
{usedTag.tagName}
diff --git a/src/components/modals/groceries/styles/addItem.js b/src/components/modals/groceries/styles/addItem.js
index 6138bd7..ddc71a7 100644
--- a/src/components/modals/groceries/styles/addItem.js
+++ b/src/components/modals/groceries/styles/addItem.js
@@ -7,7 +7,7 @@ import { Image } from 'react-native'
export const StyledImage = styled(Image)`
position: absolute;
- object-fit: cover;
+ resize-mode: contain;
z-index:0;
opacity: 0.1;
width: 70%;
diff --git a/src/components/modals/groceries/styles/addProduct.js b/src/components/modals/groceries/styles/addProduct.js
index d00df31..b52e94d 100644
--- a/src/components/modals/groceries/styles/addProduct.js
+++ b/src/components/modals/groceries/styles/addProduct.js
@@ -7,7 +7,7 @@ import { Image } from 'react-native'
export const StyledImage = styled(Image)`
position: absolute;
- object-fit: cover;
+ resize-mode: contain;
width: 35%;
height: 50%;
right:0;
diff --git a/src/components/modals/groceries/styles/edit.js b/src/components/modals/groceries/styles/edit.js
index b4c7947..363ac5e 100644
--- a/src/components/modals/groceries/styles/edit.js
+++ b/src/components/modals/groceries/styles/edit.js
@@ -33,7 +33,7 @@ export const TextTag = styled(Text)`
margin: 0px 5px;
`
export const StyledImage = styled(Image)`
- object-fit: cover;
+ resize-mode: contain;
width: 150px;
height: 150px;
margin-top:-50px;
diff --git a/src/components/modals/recipes/ModalAddIngredients.js b/src/components/modals/recipes/ModalAddIngredients.js
index eee9288..74546c9 100644
--- a/src/components/modals/recipes/ModalAddIngredients.js
+++ b/src/components/modals/recipes/ModalAddIngredients.js
@@ -90,7 +90,7 @@ const ModalAddIngredients = (props) => {
min={amountOfServings}
step={amountOfServings}
placeholder="Multiplier" />
- servings
+ servings
{IngredientsList}
diff --git a/src/components/recipes/RecipeCard.js b/src/components/recipes/RecipeCard.js
index 45ca981..558eb53 100644
--- a/src/components/recipes/RecipeCard.js
+++ b/src/components/recipes/RecipeCard.js
@@ -5,7 +5,7 @@ const RecipeCard = (props) => {
let recipe = props.recipe
return (
- {recipe.image && }
+ {recipe.image && }
{recipe.name}
)
diff --git a/src/components/recipes/styles/recipeCard.js b/src/components/recipes/styles/recipeCard.js
index 432c8da..6db55f1 100644
--- a/src/components/recipes/styles/recipeCard.js
+++ b/src/components/recipes/styles/recipeCard.js
@@ -32,7 +32,7 @@ export const RecipeName = styled(Text)`
`
export const ImageRecipe = styled(Image)`
- object-fit: cover;
+ resize-mode: contain;
width: 100%;
height: 100%;
border-radius: 20px;
diff --git a/src/pages/groceryList/GroceryListPage.js b/src/pages/groceryList/GroceryListPage.js
index 6d82974..3d5b2b1 100644
--- a/src/pages/groceryList/GroceryListPage.js
+++ b/src/pages/groceryList/GroceryListPage.js
@@ -13,7 +13,7 @@ const GroceryListPage = () => {
{
currentTab === "Groceries" ? :
}
- {/* */}
+
)
}
diff --git a/src/pages/groceryList/storageManagement/Groceries.js b/src/pages/groceryList/storageManagement/Groceries.js
index 32b5ceb..04aaa16 100644
--- a/src/pages/groceryList/storageManagement/Groceries.js
+++ b/src/pages/groceryList/storageManagement/Groceries.js
@@ -14,7 +14,7 @@ import { useSelector } from 'react-redux'
const Groceries = () => {
const statusItems = useSelector(state => state.items.status)
return (
-
+
{statusItems === 'loading' ?
: }
diff --git a/src/pages/recipes/AddRecipe.js b/src/pages/recipes/AddRecipe.js
index 674c1dd..2d73b10 100644
--- a/src/pages/recipes/AddRecipe.js
+++ b/src/pages/recipes/AddRecipe.js
@@ -67,7 +67,7 @@ const AddRecipe = () => {
<>
- {image && }
+ {image && }
{/* */}
diff --git a/src/pages/recipes/Recipe.js b/src/pages/recipes/Recipe.js
index c4aec79..09f6485 100644
--- a/src/pages/recipes/Recipe.js
+++ b/src/pages/recipes/Recipe.js
@@ -31,7 +31,7 @@ const Recipe = () => {
<>
- {recipe.image && }
+ {recipe.image && }
{recipe.name}
diff --git a/src/pages/recipes/styles/addRecipe.js b/src/pages/recipes/styles/addRecipe.js
index c4aa139..9d4b370 100644
--- a/src/pages/recipes/styles/addRecipe.js
+++ b/src/pages/recipes/styles/addRecipe.js
@@ -63,7 +63,7 @@ export const InputInstructions = styled(Text)`
width: 100%;
`
export const StyledImage = styled(Image)`
- object-fit: cover;
+ resize-mode: contain;
width: 100px;
height: 100px;
`
diff --git a/src/pages/recipes/styles/recipe.js b/src/pages/recipes/styles/recipe.js
index 73c26cd..5aa16f1 100644
--- a/src/pages/recipes/styles/recipe.js
+++ b/src/pages/recipes/styles/recipe.js
@@ -34,7 +34,7 @@ export const InstructionNumber = styled(Text)`
export const StyledImage = styled(Image)`
margin-top: -70px;
- object-fit: cover;
+ resize-mode: contain;
height: 200px;
width: 100%;
@media ${({theme}) => theme.mediaQueries.above768}{
diff --git a/src/styles/componentBlueprints.js b/src/styles/componentBlueprints.js
index 2329d66..1dfc87d 100644
--- a/src/styles/componentBlueprints.js
+++ b/src/styles/componentBlueprints.js
@@ -1,4 +1,4 @@
-import { View } from "react-native"
+import { TouchableOpacity, View } from "react-native"
import React from 'react'
import styled, { css } from 'styled-components'
//deps
@@ -6,7 +6,7 @@ import { HiCheck } from 'react-icons/hi'
import LightenDarken from '../functions'
//standard button layout
-export const Button = styled(View)`
+export const Button = styled(TouchableOpacity)`
box-shadow: ${({ theme }) => theme.colors.shadow};
display: flex;
align-items: center;