diff --git a/EditPlan.tsx b/EditPlan.tsx index c857a85..4e69281 100644 --- a/EditPlan.tsx +++ b/EditPlan.tsx @@ -79,8 +79,7 @@ export default function EditPlan() { {DAYS.map(day => ( toggleDay(value, day)} - onPress={() => toggleDay(!days.includes(day), day)} + onChange={value => toggleDay(value, day)} value={days.includes(day)}> {day} @@ -94,9 +93,8 @@ export default function EditPlan() { names.map(name => ( toggleWorkout(value, name)} - value={workouts.includes(name)} - onPress={() => toggleWorkout(!workouts.includes(name), name)}> + onChange={value => toggleWorkout(value, name)} + value={workouts.includes(name)}> {name} )) diff --git a/SettingsPage.tsx b/SettingsPage.tsx index 8f2d0de..64478ee 100644 --- a/SettingsPage.tsx +++ b/SettingsPage.tsx @@ -192,11 +192,7 @@ export default function SettingsPage() { const renderSwitch = useCallback( (item: Input) => ( - item.onChange(!item.value)} - key={item.name} - value={item.value} - onValueChange={item.onChange}> + {item.name} ), diff --git a/Switch.tsx b/Switch.tsx index 3885ded..198b1bd 100644 --- a/Switch.tsx +++ b/Switch.tsx @@ -4,20 +4,18 @@ import {MARGIN} from './constants' export default function Switch({ value, - onValueChange, - onPress, + onChange, children, }: { value?: boolean - onValueChange: (value: boolean) => void - onPress: () => void + onChange: (value: boolean) => void children: string }) { const {colors} = useTheme() return ( onChange(!value)} style={{ flexDirection: 'row', flexWrap: 'wrap', @@ -28,7 +26,7 @@ export default function Switch({ color={colors.primary} style={{marginRight: MARGIN}} value={value} - onValueChange={onValueChange} + onValueChange={onChange} /> {children}