diff --git a/StartPlan.tsx b/StartPlan.tsx index de0a348..b9eba7a 100644 --- a/StartPlan.tsx +++ b/StartPlan.tsx @@ -2,9 +2,9 @@ import {RouteProp, useRoute} from '@react-navigation/native' import {useCallback, useEffect, useMemo, useRef, useState} from 'react' import {NativeModules, TextInput, View} from 'react-native' import {FlatList} from 'react-native-gesture-handler' -import {Button} from 'react-native-paper' +import {Button, ProgressBar} from 'react-native-paper' import {getBestSet} from './best.service' -import {PADDING} from './constants' +import {MARGIN, PADDING} from './constants' import CountMany from './count-many' import {AppDataSource} from './data-source' import {getNow, setRepo, settingsRepo} from './db' @@ -113,6 +113,11 @@ export default function StartPlan() { toast('Commas and single quotes would break CSV exports') }, []) + const progress = useMemo(() => { + if (!counts || !counts[selected].sets) return + return counts[selected].total / (counts[selected].sets ?? 1) + }, [counts, selected]) + return ( <> @@ -160,6 +165,9 @@ export default function StartPlan() { /> )} + {progress && ( + + )} diff --git a/StartPlanItem.tsx b/StartPlanItem.tsx index 2ee8245..c8baedd 100644 --- a/StartPlanItem.tsx +++ b/StartPlanItem.tsx @@ -1,13 +1,7 @@ import {NavigationProp, useNavigation} from '@react-navigation/native' import React, {useCallback, useState} from 'react' import {GestureResponderEvent, ListRenderItemInfo, View} from 'react-native' -import { - List, - Menu, - ProgressBar, - RadioButton, - useTheme, -} from 'react-native-paper' +import {List, Menu, RadioButton, useTheme} from 'react-native-paper' import {Like} from 'typeorm' import CountMany from './count-many' import {getNow, setRepo} from './db' @@ -92,7 +86,6 @@ export default function StartPlanItem(props: Props) { width: '25%', justifyContent: 'center', }}> - {item.sets > 0 && }