Replace progress bar with toast in plan
It doesn't feel obvious enough when a new set has been added with the progress bar + number incrementing. I frequently found myself double-checking I had actually submitted a new set.
This commit is contained in:
parent
6b74b5114c
commit
b74f77e506
|
@ -2,9 +2,9 @@ import {RouteProp, useRoute} from '@react-navigation/native'
|
||||||
import {useCallback, useEffect, useMemo, useRef, useState} from 'react'
|
import {useCallback, useEffect, useMemo, useRef, useState} from 'react'
|
||||||
import {NativeModules, TextInput, View} from 'react-native'
|
import {NativeModules, TextInput, View} from 'react-native'
|
||||||
import {FlatList} from 'react-native-gesture-handler'
|
import {FlatList} from 'react-native-gesture-handler'
|
||||||
import {Button, ProgressBar} from 'react-native-paper'
|
import {Button} from 'react-native-paper'
|
||||||
import {getBestSet} from './best.service'
|
import {getBestSet} from './best.service'
|
||||||
import {MARGIN, PADDING} from './constants'
|
import {PADDING} from './constants'
|
||||||
import CountMany from './count-many'
|
import CountMany from './count-many'
|
||||||
import {AppDataSource} from './data-source'
|
import {AppDataSource} from './data-source'
|
||||||
import {getNow, setRepo, settingsRepo} from './db'
|
import {getNow, setRepo, settingsRepo} from './db'
|
||||||
|
@ -99,6 +99,7 @@ export default function StartPlan() {
|
||||||
(+weight > best.weight || (+reps > best.reps && +weight === best.weight))
|
(+weight > best.weight || (+reps > best.reps && +weight === best.weight))
|
||||||
)
|
)
|
||||||
toast("Great work King! That's a new record.")
|
toast("Great work King! That's a new record.")
|
||||||
|
else toast('Set added.')
|
||||||
if (!settings.alarm) return
|
if (!settings.alarm) return
|
||||||
const milliseconds =
|
const milliseconds =
|
||||||
Number(best.minutes) * 60 * 1000 + Number(best.seconds) * 1000
|
Number(best.minutes) * 60 * 1000 + Number(best.seconds) * 1000
|
||||||
|
@ -113,11 +114,6 @@ export default function StartPlan() {
|
||||||
toast('Commas and single quotes would break CSV exports')
|
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 (
|
return (
|
||||||
<>
|
<>
|
||||||
<StackHeader title={params.plan.days.replace(/,/g, ', ')} />
|
<StackHeader title={params.plan.days.replace(/,/g, ', ')} />
|
||||||
|
@ -165,9 +161,6 @@ export default function StartPlan() {
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
</View>
|
</View>
|
||||||
{progress && (
|
|
||||||
<ProgressBar progress={progress} style={{marginBottom: MARGIN}} />
|
|
||||||
)}
|
|
||||||
<Button mode="contained" icon="save" onPress={handleSubmit}>
|
<Button mode="contained" icon="save" onPress={handleSubmit}>
|
||||||
Save
|
Save
|
||||||
</Button>
|
</Button>
|
||||||
|
|
Loading…
Reference in New Issue
Block a user