brandon.presley/Massive
brandon.presley
/
Massive
4
8
Fork 3
Code Issues 14 Pull Requests Activity

Prevent blank workouts on new set 

Closes #46
This commit is contained in:
Brandon Presley 2022-09-24 15:33:45 +12:00
parent 32e46c48dd
commit 406d8e7738
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
HomePage.tsx
View File

@ -13,7 +13,7 @@ export type HomePageParams = {
Sets: {}; Sets: {};
EditSet: { EditSet: {
set: Set; set: Set;
workouts?: string[]; workouts: string[];
}; };
}; };

4
SetForm.tsx
View File

@ -13,7 +13,7 @@ export default function SetForm({
}: { }: {
set: Set; set: Set;
save: (set: Set) => void; save: (set: Set) => void;
workouts?: string[]; workouts: string[];
}) { }) {
const [name, setName] = useState(set.name); const [name, setName] = useState(set.name);
const [reps, setReps] = useState(set.reps.toString()); const [reps, setReps] = useState(set.reps.toString());
@ -91,7 +91,7 @@ export default function SetForm({
innerRef={unitRef} innerRef={unitRef}
/> />
)} )}
{workouts && ( {workouts.length > 0 && (
<MassiveInput <MassiveInput
label="Todays workout" label="Todays workout"
value={workouts?.join(', ')} value={workouts?.join(', ')}

6
SetItem.tsx
View File

@ -35,7 +35,7 @@ export default function SetItem({
const set: Set = {...item}; const set: Set = {...item};
delete set.id; delete set.id;
setShowMenu(false); setShowMenu(false);
navigation.navigate('EditSet', {set}); navigation.navigate('EditSet', {set, workouts: []});
}, [navigation, item]); }, [navigation, item]);
const longPress = useCallback( const longPress = useCallback(
@ -59,7 +59,9 @@ export default function SetItem({
return ( return (
<> <>
<List.Item <List.Item
onPress={() => navigation.navigate('EditSet', {set: item})} onPress={() =>
navigation.navigate('EditSet', {set: item, workouts: []})
}
title={item.name} title={item.name}
description={`${item.reps} x ${item.weight}${item.unit || 'kg'}`} description={`${item.reps} x ${item.weight}${item.unit || 'kg'}`}
onLongPress={longPress} onLongPress={longPress}