From d5c97b45b00bd01c22db354697f2df884947793d Mon Sep 17 00:00:00 2001 From: Brandon Presley Date: Fri, 9 Sep 2022 15:32:47 +1200 Subject: [PATCH] Revert "Show count when adding a new set" This reverts commit 4aa91253a11b93970f8497689b0cee4944346c0e. --- EditSet.tsx | 20 +++++++------------- HomePage.tsx | 1 - SetList.tsx | 9 +++------ 3 files changed, 10 insertions(+), 20 deletions(-) diff --git a/EditSet.tsx b/EditSet.tsx index ddff98a..27164dd 100644 --- a/EditSet.tsx +++ b/EditSet.tsx @@ -21,20 +21,14 @@ export default function EditSet() { useFocusEffect( useCallback(() => { - getSettings().then(settings => { - let title = 'Edit set'; - if (!params.set.id && params.set.name) - title = `Add set (${params.count} / ${settings.sets})`; - if (!params.set.id && !params.set.name) title = 'Add set'; - navigation.getParent()?.setOptions({ - headerLeft: () => ( - navigation.goBack()} /> - ), - headerRight: null, - title, - }); + navigation.getParent()?.setOptions({ + headerLeft: () => ( + navigation.goBack()} /> + ), + headerRight: null, + title: params.set.id ? 'Edit set' : 'Create set', }); - }, [navigation, params]), + }, [navigation, params.set.id]), ); const startTimer = useCallback(async () => { diff --git a/HomePage.tsx b/HomePage.tsx index 4377b28..7198fa7 100644 --- a/HomePage.tsx +++ b/HomePage.tsx @@ -13,7 +13,6 @@ export type HomePageParams = { Sets: {}; EditSet: { set: Set; - count: number; workouts?: string[]; }; }; diff --git a/SetList.tsx b/SetList.tsx index 6181d26..7438c47 100644 --- a/SetList.tsx +++ b/SetList.tsx @@ -21,7 +21,6 @@ const limit = 15; export default function SetList() { const [sets, setSets] = useState(); const [set, setSet] = useState(); - const [count, setCount] = useState(1); const [workouts, setWorkouts] = useState([]); const [offset, setOffset] = useState(0); const [search, setSearch] = useState(''); @@ -53,12 +52,11 @@ export default function SetList() { let workout = todaysWorkouts[0]; console.log(`${SetList.name}.predict:`, {todaysSets, todaysWorkouts}); if (todaysWorkouts.includes(todaysSets[0]?.name) && todaysSets.length > 0) { - const _count = todaysSets.filter( + const count = todaysSets.filter( s => s.name === todaysSets[0].name, ).length; - setCount(_count); workout = todaysSets[0].name; - if (_count >= Number(settings.sets)) + if (count >= Number(settings.sets)) workout = todaysWorkouts[todaysWorkouts.indexOf(todaysSets[0].name!) + 1]; } @@ -119,10 +117,9 @@ export default function SetList() { const onAdd = useCallback(async () => { navigation.navigate('EditSet', { set: set || {...defaultSet}, - count, workouts, }); - }, [navigation, set, workouts, count]); + }, [navigation, set, workouts]); return (