Merge branch 'dev'

This commit is contained in:
Milan Paunovic
2024-12-24 16:12:36 +01:00
13 changed files with 230 additions and 246 deletions

View File

@ -567,18 +567,10 @@ export const ManuallyAddEventModal = () => {
Save
</Text>
</TouchableOpacity>
{editEvent && (
<Button
style={styles.topBtn}
marginL-5
iconSource={() => <BinIcon/>}
onPress={showDeleteEventModal}
/>
)}
</View>
</View>
{/*)}*/}
<ScrollView style={{minHeight: "85%"}}>
<ScrollView style={{minHeight: "81%"}}>
<TextField
placeholder="Add event title"
ref={titleRef}
@ -788,7 +780,6 @@ export const ManuallyAddEventModal = () => {
<Button
disabled
marginH-30
marginB-30
label="Create event from image"
text70
style={{height: 47}}
@ -799,7 +790,24 @@ export const ManuallyAddEventModal = () => {
<CameraIcon color="white"/>
</View>
)}
/>
/>
{editEvent && (
<TouchableOpacity
onPress={showDeleteEventModal}
style={{ marginTop: 15, marginBottom: 40, alignSelf: "center" }}
hitSlop={{left: 30, right: 30, top: 10, bottom: 10}}
>
<Text
style={{
color: "#ff1637",
fontFamily: "PlusJakartaSans_500Medium",
fontSize: 15,
}}
>
Delete Event
</Text>
</TouchableOpacity>
)}
</View>
{editEvent && (
<DeleteEventDialog