diff --git a/components/pages/brain_dump/BrainDumpPage.tsx b/components/pages/brain_dump/BrainDumpPage.tsx index 7f0e0c2..d4b5ff8 100644 --- a/components/pages/brain_dump/BrainDumpPage.tsx +++ b/components/pages/brain_dump/BrainDumpPage.tsx @@ -3,12 +3,13 @@ import React, {useState} from "react"; import {Button, Text, TextField, View} from "react-native-ui-lib"; import DumpList from "./DumpList"; import HeaderTemplate from "@/components/shared/HeaderTemplate"; -import {Feather, MaterialIcons} from "@expo/vector-icons"; +import {Feather} from "@expo/vector-icons"; import AddBrainDump from "./AddBrainDump"; import LinearGradient from "react-native-linear-gradient"; import PlusIcon from "@/assets/svgs/PlusIcon"; import * as Device from 'expo-device' import {DeviceType} from 'expo-device' + const BrainDumpPage = () => { const [searchText, setSearchText] = useState(""); const [isAddVisible, setIsAddVisible] = useState(false); @@ -21,7 +22,7 @@ const BrainDumpPage = () => { showsVerticalScrollIndicator={false} showsHorizontalScrollIndicator={false} > - + { marginV-5 paddingH-13 paddingV-10 - style={{ borderRadius: 15, elevation: 2 }} + style={{ borderRadius: 15, elevation: 0 }} > { is24Hour={profileData?.userType === ProfileType.PARENT ? false : true} onChange={(time) => { if (endDate.getDate() === startDate.getDate() && - time.getHours() >= endTime.getHours()) + time.getHours() >= endTime.getHours() && time.getMinutes() >= endTime.getHours()) { const newEndDate = new Date(endDate); @@ -435,7 +435,7 @@ export const ManuallyAddEventModal = () => { }} minuteInterval={5} mode="time" - timeFormat={profileData?.userType === ProfileType.PARENT ? "hh:mm" : "HH:mm"} + timeFormat={profileData?.userType === ProfileType.PARENT ? "hh:mm A" : "HH:mm A"} style={[styles.timePicker]} /> @@ -461,7 +461,8 @@ export const ManuallyAddEventModal = () => { setEndTime(time); if ( endDate.getDate() === startDate.getDate() && - time.getHours() < startTime.getHours() + time.getHours() <= startTime.getHours() && + time.getMinutes() <= startTime.getMinutes() ) { const newEndDate = new Date(endDate); newEndDate.setDate(newEndDate.getDate() + 1); @@ -470,7 +471,7 @@ export const ManuallyAddEventModal = () => { }} minuteInterval={5} mode="time" - timeFormat={profileData?.userType === ProfileType.PARENT ? "hh:mm" : "HH:mm"} + timeFormat={profileData?.userType === ProfileType.PARENT ? "hh:mm A" : "HH:mm A"} style={[styles.timePicker]} /> diff --git a/components/pages/todos/ToDosList.tsx b/components/pages/todos/ToDosList.tsx index faea2f9..c91e9ec 100644 --- a/components/pages/todos/ToDosList.tsx +++ b/components/pages/todos/ToDosList.tsx @@ -327,11 +327,16 @@ const ToDosList = ({ isSettings, members }: { isSettings?: boolean, members?: Ar style={{ marginRight: 8 }} /> )} - renderItem={(item) => { + renderItem={(item, selected) => { return ( - - {item.label} - + + + {item.label} + + ); }} onChange={(item) => {