ammar/cally
1
0
Fork 0
mirror of https://github.com/urosran/cally.git synced 2025-11-26 08:24:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Grocery list changes

Browse Source 
- Removed the Add item button from the bottom and added an empty grocery box
This commit is contained in:
Dejan
2024-12-08 14:01:35 +01:00
parent 47a0ea2f36
commit 1c2f18e288
3 changed files with 33 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
components/pages/grocery/EditGroceryItem.tsx
View File

@ -113,24 +113,24 @@ const EditGroceryItem = ({
}} }}
maxLength={25} maxLength={25}
/> />
<View row centerV> {(editGrocery.title || editGrocery.title !== "") && <View row centerV>
<AntDesign <AntDesign
name="check" name="check"
size={24} size={24}
style={{ style={{
color: "green", color: "green",
marginRight: 15, marginRight: 15,
}} }}
onPress={handleSubmit} onPress={handleSubmit}
/> />
<CloseXIcon <CloseXIcon
onPress={() => { onPress={() => {
if (editGrocery.closeEdit) { if (editGrocery.closeEdit) {
editGrocery.closeEdit(); editGrocery.closeEdit();
} }
}} }}
/> />
</View> </View>}
</View> </View>
<Dropdown <Dropdown
style={{ marginTop: 15 }} style={{ marginTop: 15 }}

34
components/pages/grocery/GroceryList.tsx
View File

@ -98,6 +98,12 @@ const GroceryList = ({onInputFocus}: {onInputFocus: (y: number) => void}) => {
setPendingGroceries(groceries?.filter((item) => !item.approved)); setPendingGroceries(groceries?.filter((item) => !item.approved));
}, [groceries]); }, [groceries]);
const handleCancelAddGrocery = () => {
setIsAddingGrocery(false);
setTitle("");
setCategory(GroceryCategory.None)
}
return ( return (
<View marginH-20 marginB-45> <View marginH-20 marginB-45>
<HeaderTemplate <HeaderTemplate
@ -244,21 +250,19 @@ const GroceryList = ({onInputFocus}: {onInputFocus: (y: number) => void}) => {
</Text> </Text>
</View> </View>
</View> </View>
{isAddingGrocery && ( <View style={{marginTop: 8}}>
<View style={{marginTop: 8}}> <EditGroceryItem
<EditGroceryItem editGrocery={{
editGrocery={{ title: title,
title: title, setCategory: setCategory,
setCategory: setCategory, category: category,
category: category, setTitle: setTitle,
setTitle: setTitle, setSubmit: setSubmitted,
setSubmit: setSubmitted, closeEdit: handleCancelAddGrocery
closeEdit: () => setIsAddingGrocery(false) }}
}} onInputFocus={onInputFocus}
onInputFocus={onInputFocus} />
/> </View>
</View>
)}
{/* Render Approved Groceries Grouped by Category */} {/* Render Approved Groceries Grouped by Category */}
{approvedGroceries?.length > 0 {approvedGroceries?.length > 0

1
components/pages/grocery/GroceryWrapper.tsx
View File

@ -71,7 +71,6 @@ const GroceryWrapper = () => {
<GroceryList onInputFocus={handleInputFocus} /> <GroceryList onInputFocus={handleInputFocus} />
</View> </View>
</ScrollView> </ScrollView>
{!isAddingGrocery && <AddGroceryItem />}
</> </>
); );
}; };