diff --git a/BestList.tsx b/BestList.tsx index a0db7ff..052cd95 100644 --- a/BestList.tsx +++ b/BestList.tsx @@ -13,7 +13,6 @@ import Set from './set'; export default function BestList() { const [bests, setBests] = useState([]); const [search, setSearch] = useState(''); - const [refreshing, setRefresing] = useState(false); const navigation = useNavigation>(); const refresh = useCallback(async () => { @@ -56,12 +55,6 @@ export default function BestList() { description="Once sets have been added, this will highlight your personal bests." /> } - refreshing={refreshing} - onRefresh={async () => { - setRefresing(true); - await refresh(); - setRefresing(false); - }} renderItem={renderItem} data={bests} /> diff --git a/PlanList.tsx b/PlanList.tsx index 1ba6a28..54de6f5 100644 --- a/PlanList.tsx +++ b/PlanList.tsx @@ -16,7 +16,6 @@ import {PlanPageParams} from './PlanPage'; export default function PlanList() { const [search, setSearch] = useState(''); const [plans, setPlans] = useState([]); - const [refreshing, setRefresing] = useState(false); const navigation = useNavigation>(); const refresh = useCallback(async () => { @@ -51,11 +50,6 @@ export default function PlanList() { data={plans} renderItem={renderItem} keyExtractor={set => set.id?.toString() || ''} - refreshing={refreshing} - onRefresh={() => { - setRefresing(true); - refresh().finally(() => setRefresing(false)); - }} ListEmptyComponent={ ([]); const [offset, setOffset] = useState(0); const [search, setSearch] = useState(''); - const [refreshing, setRefreshing] = useState(false); const [end, setEnd] = useState(false); const [dates, setDates] = useState(false); const [images, setImages] = useState(true); @@ -42,11 +41,6 @@ export default function SetList() { setEnd(false); }, [search]); - const refreshLoader = useCallback(async () => { - setRefreshing(true); - refresh().finally(() => setRefreshing(false)); - }, [setRefreshing, refresh]); - useEffect(() => { refresh(); }, [search, refresh]); @@ -105,7 +99,6 @@ export default function SetList() { const next = useCallback(async () => { if (end) return; - setRefreshing(true); const newOffset = offset + limit; console.log(`${SetList.name}.next:`, { offset, @@ -147,8 +140,6 @@ export default function SetList() { renderItem={renderItem} keyExtractor={s => s.id!.toString()} onEndReached={next} - refreshing={refreshing} - onRefresh={refreshLoader} /> diff --git a/WorkoutList.tsx b/WorkoutList.tsx index 513ab82..0141e0a 100644 --- a/WorkoutList.tsx +++ b/WorkoutList.tsx @@ -19,7 +19,6 @@ export default function WorkoutList() { const [workouts, setWorkouts] = useState(); const [offset, setOffset] = useState(0); const [search, setSearch] = useState(''); - const [refreshing, setRefreshing] = useState(false); const [end, setEnd] = useState(false); const navigation = useNavigation>(); @@ -34,11 +33,6 @@ export default function WorkoutList() { setEnd(false); }, [search]); - const refreshLoader = useCallback(async () => { - setRefreshing(true); - refresh().finally(() => setRefreshing(false)); - }, [setRefreshing, refresh]); - useEffect(() => { refresh(); }, [search, refresh]); @@ -58,7 +52,6 @@ export default function WorkoutList() { const next = useCallback(async () => { if (end) return; - setRefreshing(true); const newOffset = offset + limit; console.log(`${SetList.name}.next:`, { offset, @@ -70,7 +63,7 @@ export default function WorkoutList() { search: `%${search}%`, limit, offset: newOffset, - }).finally(() => setRefreshing(false)); + }); if (newWorkouts.length === 0) return setEnd(true); if (!workouts) return; setWorkouts([...workouts, ...newWorkouts]); @@ -99,8 +92,6 @@ export default function WorkoutList() { renderItem={renderItem} keyExtractor={w => w.name} onEndReached={next} - refreshing={refreshing} - onRefresh={refreshLoader} />