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

Use deno fmt instead of prettier

This commit is contained in:
Brandon Presley 2023-06-27 15:16:59 +12:00
parent 23ed95dcdb
commit 4303fe2cc4
67 changed files with 897 additions and 820 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.prettierrc.js
View File

@ -1,8 +0,0 @@
module.exports = {
arrowParens: 'avoid',
bracketSameLine: true,
bracketSpacing: false,
singleQuote: true,
trailingComma: 'all',
semi: false,
};

9
App.tsx
View File

@ -99,7 +99,8 @@ const App = () => {
return (
<PaperProvider
theme={paperTheme}
settings={{icon: props => <MaterialIcon {...props} />}}>
settings={{ icon: (props) => <MaterialIcon {...props} /> }}
>
<NavigationContainer theme={paperTheme}>
{initialized && (
<ThemeContext.Provider
@ -110,7 +111,8 @@ const App = () => {
setLightColor,
darkColor,
setDarkColor,
}}>
}}
>
<Routes />
</ThemeContext.Provider>
)}
@ -120,7 +122,8 @@ const App = () => {
duration={3000}
onDismiss={() => setSnackbar('')}
visible={!!snackbar}
action={action}>
action={action}
>
{snackbar}
</Snackbar>
</PaperProvider>

6
AppFab.tsx
View File

@ -8,7 +8,7 @@ export default function AppFab(props: Partial<ComponentProps<typeof FAB>>) {
const fabColor = useMemo(
() =>
lightColors.map(color => color.hex).includes(colors.primary)
lightColors.map((color) => color.hex).includes(colors.primary)
? CombinedDarkTheme.colors.background
: CombinedDefaultTheme.colors.background,
[colors.primary],
@ -16,8 +16,8 @@ export default function AppFab(props: Partial<ComponentProps<typeof FAB>>) {
return (
<FAB
icon="add"
testID="add"
icon='add'
testID='add'
color={fabColor}
style={{
position: 'absolute',

26
BestList.tsx
View File

@ -73,24 +73,32 @@ export default function BestList() {
onPress={() => navigation.navigate('ViewBest', { best: item })}
left={() =>
(settings.images && item.image && (
<Image source={{uri: item.image}} style={{height: 75, width: 75}} />
<Image
source={{ uri: item.image }}
style={{ height: 75, width: 75 }}
/>
)) ||
null
}
null}
/>
)
return (
<>
<DrawerHeader name="Best" />
<DrawerHeader name='Best' />
<Page term={term} search={search}>
{bests?.length === 0 ? (
{bests?.length === 0
? (
<List.Item
title="No exercises yet"
description="Once sets have been added, this will highlight your personal bests."
title='No exercises yet'
description='Once sets have been added, this will highlight your personal bests.'
/>
)
: (
<FlatList
style={{ flex: 1 }}
renderItem={renderItem}
data={bests}
/>
) : (
<FlatList style={{flex: 1}} renderItem={renderItem} data={bests} />
)}
</Page>
</>

7
BestPage.tsx
View File

@ -14,9 +14,10 @@ export type BestPageParams = {
export default function BestPage() {
return (
<Stack.Navigator
screenOptions={{headerShown: false, animationEnabled: false}}>
<Stack.Screen name="BestList" component={BestList} />
<Stack.Screen name="ViewBest" component={ViewBest} />
screenOptions={{ headerShown: false, animationEnabled: false }}
>
<Stack.Screen name='BestList' component={BestList} />
<Stack.Screen name='ViewBest' component={ViewBest} />
</Stack.Navigator>
)
}

6
Chart.tsx
View File

@ -36,7 +36,8 @@ export default function Chart({
height: 300,
padding: PADDING,
flexDirection: 'row',
}}>
}}
>
<YAxis
data={yData}
style={{ marginBottom: xAxisHeight }}
@ -52,7 +53,8 @@ export default function Chart({
curve={shape.curveBasis}
svg={{
stroke: colors.primary,
}}>
}}
>
<Grid />
</LineChart>
<XAxis

2
DrawerHeader.tsx
View File

@ -18,7 +18,7 @@ export default function DrawerHeader({
<Appbar.Header>
<IconButton
color={dark ? 'white' : 'white'}
icon="menu"
icon='menu'
onPress={navigation.openDrawer}
/>
<Appbar.Content title={name} />

38
EditPlan.tsx
View File

@ -37,17 +37,17 @@ export default function EditPlan() {
.distinct(true)
.orderBy('name')
.getRawMany()
.then(values => {
.then((values) => {
console.log(EditPlan.name, { values })
setNames(values.map(value => value.name))
setNames(values.map((value) => value.name))
})
}, [])
const save = useCallback(async () => {
console.log(`${EditPlan.name}.save`, { days, workouts, plan })
if (!days || !workouts) return
const newWorkouts = workouts.filter(workout => workout).join(',')
const newDays = days.filter(day => day).join(',')
const newWorkouts = workouts.filter((workout) => workout).join(',')
const newDays = days.filter((day) => day).join(',')
await planRepo.save({ days: newDays, workouts: newWorkouts, id: plan.id })
navigation.goBack()
}, [days, workouts, plan, navigation])
@ -57,7 +57,7 @@ export default function EditPlan() {
if (on) {
setWorkouts([...workouts, name])
} else {
setWorkouts(workouts.filter(workout => workout !== name))
setWorkouts(workouts.filter((workout) => workout !== name))
}
},
[setWorkouts, workouts],
@ -68,7 +68,7 @@ export default function EditPlan() {
if (on) {
setDays([...days, day])
} else {
setDays(days.filter(d => d !== day))
setDays(days.filter((d) => d !== day))
}
},
[setDays, days],
@ -77,7 +77,8 @@ export default function EditPlan() {
return (
<>
<StackHeader
title={typeof plan.id === 'number' ? 'Edit plan' : 'Add plan'}>
title={typeof plan.id === 'number' ? 'Edit plan' : 'Add plan'}
>
<IconButton
color={dark ? 'white' : 'white'}
onPress={async () => {
@ -86,30 +87,32 @@ export default function EditPlan() {
delete first.id
navigation.navigate('StartPlan', { plan: params.plan, first })
}}
icon="play-arrow"
icon='play-arrow'
/>
</StackHeader>
<View style={{ padding: PADDING, flex: 1 }}>
<ScrollView style={{ flex: 1 }}>
<Text style={styles.title}>Days</Text>
{DAYS.map(day => (
{DAYS.map((day) => (
<Switch
key={day}
onChange={value => toggleDay(value, day)}
onChange={(value) => toggleDay(value, day)}
value={days.includes(day)}
title={day}
/>
))}
<Text style={[styles.title, { marginTop: MARGIN }]}>Workouts</Text>
{names.length === 0 ? (
{names.length === 0
? (
<View>
<Text>No workouts found.</Text>
</View>
) : (
names.map(name => (
)
: (
names.map((name) => (
<Switch
key={name}
onChange={value => toggleWorkout(value, name)}
onChange={(value) => toggleWorkout(value, name)}
value={workouts.includes(name)}
title={name}
/>
@ -120,9 +123,10 @@ export default function EditPlan() {
<Button
disabled={workouts.length === 0 && days.length === 0}
style={styles.button}
mode="contained"
icon="save"
onPress={save}>
mode='contained'
icon='save'
onPress={save}
>
Save
</Button>
</View>

50
EditSet.tsx
View File

@ -54,8 +54,8 @@ export default function EditSet() {
async (value: string) => {
if (!settings.alarm) return
const first = await setRepo.findOne({ where: { name: value } })
const milliseconds =
(first?.minutes ?? 3) * 60 * 1000 + (first?.seconds ?? 0) * 1000
const milliseconds = (first?.minutes ?? 3) * 60 * 1000 +
(first?.seconds ?? 0) * 1000
if (milliseconds) NativeModules.AlarmModule.timer(milliseconds)
},
[settings],
@ -69,8 +69,9 @@ export default function EditSet() {
if (
value.weight > set.weight ||
(value.reps > set.reps && value.weight === set.weight)
)
toast("Great work King! That's a new record.")
) {
toast('Great work King! That\'s a new record.')
}
},
[startTimer, set, settings],
)
@ -79,8 +80,9 @@ export default function EditSet() {
console.log(`${EditSet.name}.handleSubmit:`, { set, uri: newImage, name })
if (!name) return
let image = newImage
if (!newImage && !removeImage)
image = await setRepo.findOne({where: {name}}).then(s => s?.image)
if (!newImage && !removeImage) {
image = await setRepo.findOne({ where: { name } }).then((s) => s?.image)
}
console.log(`${EditSet.name}.handleSubmit:`, { image })
const now = await getNow()
@ -139,7 +141,7 @@ export default function EditSet() {
<View style={{ padding: PADDING, flex: 1 }}>
<AppInput
label="Name"
label='Name'
value={name}
onChangeText={setName}
autoCorrect={false}
@ -148,20 +150,20 @@ export default function EditSet() {
/>
<AppInput
label="Reps"
keyboardType="numeric"
label='Reps'
keyboardType='numeric'
value={reps}
onChangeText={setReps}
onSubmitEditing={() => weightRef.current?.focus()}
selection={selection}
onSelectionChange={e => setSelection(e.nativeEvent.selection)}
onSelectionChange={(e) => setSelection(e.nativeEvent.selection)}
autoFocus={!!name}
innerRef={repsRef}
/>
<AppInput
label="Weight"
keyboardType="numeric"
label='Weight'
keyboardType='numeric'
value={weight}
onChangeText={setWeight}
onSubmitEditing={handleSubmit}
@ -170,8 +172,8 @@ export default function EditSet() {
{settings.showUnit && (
<AppInput
autoCapitalize="none"
label="Unit"
autoCapitalize='none'
label='Unit'
value={unit}
onChangeText={setUnit}
innerRef={unitRef}
@ -180,7 +182,7 @@ export default function EditSet() {
{typeof set.id === 'number' && settings.showDate && (
<AppInput
label="Created"
label='Created'
value={format(created, settings.date || 'P')}
onPressOut={pickDate}
/>
@ -190,7 +192,8 @@ export default function EditSet() {
<TouchableRipple
style={{ marginBottom: MARGIN }}
onPress={changeImage}
onLongPress={() => setShowRemove(true)}>
onLongPress={() => setShowRemove(true)}
>
<Card.Cover source={{ uri: newImage }} />
</TouchableRipple>
)}
@ -199,7 +202,8 @@ export default function EditSet() {
<Button
style={{ marginBottom: MARGIN }}
onPress={changeImage}
icon="add-photo-alternate">
icon='add-photo-alternate'
>
Image
</Button>
)}
@ -207,18 +211,20 @@ export default function EditSet() {
<Button
disabled={!name}
mode="contained"
icon="save"
mode='contained'
icon='save'
style={{ margin: MARGIN }}
onPress={handleSubmit}>
onPress={handleSubmit}
>
Save
</Button>
<ConfirmDialog
title="Remove image"
title='Remove image'
onOk={handleRemove}
show={showRemove}
setShow={setShowRemove}>
setShow={setShowRemove}
>
Are you sure you want to remove the image?
</ConfirmDialog>
</>

36
EditSets.tsx
View File

@ -42,11 +42,11 @@ export default function EditSets() {
useFocusEffect(
useCallback(() => {
settingsRepo.findOne({ where: {} }).then(setSettings)
setRepo.find({where: {id: In(ids)}}).then(sets => {
setNames(sets.map(set => set.name).join(', '))
setOldReps(sets.map(set => set.reps).join(', '))
setWeights(sets.map(set => set.weight).join(', '))
setUnits(sets.map(set => set.unit).join(', '))
setRepo.find({ where: { id: In(ids) } }).then((sets) => {
setNames(sets.map((set) => set.name).join(', '))
setOldReps(sets.map((set) => set.reps).join(', '))
setWeights(sets.map((set) => set.weight).join(', '))
setUnits(sets.map((set) => set.unit).join(', '))
})
}, [ids]),
)
@ -91,17 +91,17 @@ export default function EditSets() {
<AppInput
label={`Reps: ${oldReps}`}
keyboardType="numeric"
keyboardType='numeric'
value={reps}
onChangeText={setReps}
selection={selection}
onSelectionChange={e => setSelection(e.nativeEvent.selection)}
onSelectionChange={(e) => setSelection(e.nativeEvent.selection)}
autoFocus={!!name}
/>
<AppInput
label={`Weights: ${weights}`}
keyboardType="numeric"
keyboardType='numeric'
value={weight}
onChangeText={setWeight}
onSubmitEditing={handleSubmit}
@ -109,7 +109,7 @@ export default function EditSets() {
{settings.showUnit && (
<AppInput
autoCapitalize="none"
autoCapitalize='none'
label={`Units: ${units}`}
value={unit}
onChangeText={setUnit}
@ -120,15 +120,17 @@ export default function EditSets() {
<TouchableRipple
style={{ marginBottom: MARGIN }}
onPress={changeImage}
onLongPress={() => setShowRemove(true)}>
onLongPress={() => setShowRemove(true)}
>
<Card.Cover source={{ uri: newImage }} />
</TouchableRipple>
)}
<ConfirmDialog
title="Remove image"
title='Remove image'
onOk={handleRemove}
show={showRemove}
setShow={setShowRemove}>
setShow={setShowRemove}
>
Are you sure you want to remove the image?
</ConfirmDialog>
@ -136,17 +138,19 @@ export default function EditSets() {
<Button
style={{ marginBottom: MARGIN }}
onPress={changeImage}
icon="add-photo-alternate">
icon='add-photo-alternate'
>
Image
</Button>
)}
</View>
<Button
mode="contained"
icon="save"
mode='contained'
icon='save'
style={{ margin: MARGIN }}
onPress={handleSubmit}>
onPress={handleSubmit}
>
Save
</Button>
</>

29
EditWorkout.tsx
View File

@ -112,7 +112,7 @@ export default function EditWorkout() {
<ScrollView style={{ flex: 1 }}>
<AppInput
autoFocus
label="Name"
label='Name'
value={name}
onChangeText={setName}
onSubmitEditing={submitName}
@ -123,7 +123,7 @@ export default function EditWorkout() {
selectTextOnFocus={false}
value={steps}
onChangeText={setSteps}
label="Steps"
label='Steps'
multiline
onSubmitEditing={() => setsRef.current?.focus()}
/>
@ -132,8 +132,8 @@ export default function EditWorkout() {
innerRef={setsRef}
value={sets}
onChangeText={setSets}
label="Sets per workout"
keyboardType="numeric"
label='Sets per workout'
keyboardType='numeric'
onSubmitEditing={() => minutesRef.current?.focus()}
/>
{settings?.alarm && (
@ -143,15 +143,15 @@ export default function EditWorkout() {
onSubmitEditing={() => secondsRef.current?.focus()}
value={minutes}
onChangeText={setMinutes}
label="Rest minutes"
keyboardType="numeric"
label='Rest minutes'
keyboardType='numeric'
/>
<AppInput
innerRef={secondsRef}
value={seconds}
onChangeText={setSeconds}
label="Rest seconds"
keyboardType="numeric"
label='Rest seconds'
keyboardType='numeric'
blurOnSubmit
/>
</>
@ -160,7 +160,8 @@ export default function EditWorkout() {
<TouchableRipple
style={{ marginBottom: MARGIN }}
onPress={changeImage}
onLongPress={() => setShowRemove(true)}>
onLongPress={() => setShowRemove(true)}
>
<Card.Cover source={{ uri }} />
</TouchableRipple>
)}
@ -168,19 +169,21 @@ export default function EditWorkout() {
<Button
style={{ marginBottom: MARGIN }}
onPress={changeImage}
icon="add-photo-alternate">
icon='add-photo-alternate'
>
Image
</Button>
)}
</ScrollView>
<Button disabled={!name} mode="contained" icon="save" onPress={save}>
<Button disabled={!name} mode='contained' icon='save' onPress={save}>
Save
</Button>
<ConfirmDialog
title="Remove image"
title='Remove image'
onOk={handleRemove}
show={showRemove}
setShow={setShowRemove}>
setShow={setShowRemove}
>
Are you sure you want to remove the image?
</ConfirmDialog>
</View>

9
HomePage.tsx
View File

@ -9,10 +9,11 @@ const Stack = createStackNavigator<HomePageParams>()
export default function HomePage() {
return (
<Stack.Navigator
screenOptions={{headerShown: false, animationEnabled: false}}>
<Stack.Screen name="Sets" component={SetList} />
<Stack.Screen name="EditSet" component={EditSet} />
<Stack.Screen name="EditSets" component={EditSets} />
screenOptions={{ headerShown: false, animationEnabled: false }}
>
<Stack.Screen name='Sets' component={SetList} />
<Stack.Screen name='EditSet' component={EditSet} />
<Stack.Screen name='EditSets' component={EditSets} />
</Stack.Navigator>
)
}

34
ListMenu.tsx
View File

@ -55,45 +55,45 @@ export default function ListMenu({
<IconButton
color={dark ? 'white' : 'white'}
onPress={() => setShowMenu(true)}
icon="more-vert"
icon='more-vert'
/>
}>
<Menu.Item icon="done-all" title="Select all" onPress={select} />
}
>
<Menu.Item icon='done-all' title='Select all' onPress={select} />
<Menu.Item
icon="clear"
title="Clear"
icon='clear'
title='Clear'
onPress={clear}
disabled={ids?.length === 0}
/>
<Menu.Item
icon="edit"
title="Edit"
icon='edit'
title='Edit'
onPress={edit}
disabled={ids?.length === 0}
/>
<Menu.Item
icon="content-copy"
title="Copy"
icon='content-copy'
title='Copy'
onPress={copy}
disabled={ids?.length === 0}
/>
<Divider />
<Menu.Item
icon="delete"
icon='delete'
onPress={() => setShowRemove(true)}
title="Delete"
title='Delete'
/>
<ConfirmDialog
title={ids?.length === 0 ? 'Delete all' : 'Delete selected'}
show={showRemove}
setShow={setShowRemove}
onOk={remove}
onCancel={() => setShowMenu(false)}>
{ids?.length === 0 ? (
<>This irreversibly deletes records from the app. Are you sure?</>
) : (
<>This will delete {ids?.length} record(s). Are you sure?</>
)}
onCancel={() => setShowMenu(false)}
>
{ids?.length === 0
? <>This irreversibly deletes records from the app. Are you sure?</>
: <>This will delete {ids?.length} record(s). Are you sure?</>}
</ConfirmDialog>
</Menu>
)

6
Page.tsx
View File

@ -19,11 +19,11 @@ export default function Page({
return (
<View style={[styles.view, style]}>
<Searchbar
placeholder="Search"
placeholder='Search'
value={term}
onChangeText={search}
icon="search"
clearIcon="clear"
icon='search'
clearIcon='clear'
/>
{children}
{onAdd && <AppFab onPress={onAdd} />}

17
PlanItem.tsx
View File

@ -40,10 +40,11 @@ export default function PlanItem({
let first = await getLast(workout)
if (!first) first = { ...defaultSet, name: workout }
delete first.id
if (ids.length === 0)
if (ids.length === 0) {
return navigation.navigate('StartPlan', { plan: item, first })
const removing = ids.find(id => id === item.id)
if (removing) setIds(ids.filter(id => id !== item.id))
}
const removing = ids.find((id) => id === item.id)
if (removing) setIds(ids.filter((id) => id !== item.id))
else setIds([...ids, item.id])
}, [ids, setIds, item, navigation])
@ -56,11 +57,15 @@ export default function PlanItem({
() =>
days.map((day, index) => (
<Text key={day}>
{day === today ? (
<Text style={{fontWeight: 'bold', textDecorationLine: 'underline'}}>
{day === today
? (
<Text
style={{ fontWeight: 'bold', textDecorationLine: 'underline' }}
>
{day}
</Text>
) : (
)
: (
day
)}
{index === days.length - 1 ? '' : ', '}

14
PlanList.tsx
View File

@ -82,7 +82,7 @@ export default function PlanList() {
}, [ids, refresh, term])
const select = useCallback(() => {
setIds(plans.map(plan => plan.id))
setIds(plans.map((plan) => plan.id))
}, [plans])
return (
@ -98,17 +98,19 @@ export default function PlanList() {
/>
</DrawerHeader>
<Page onAdd={onAdd} term={term} search={search}>
{plans?.length === 0 ? (
{plans?.length === 0
? (
<List.Item
title="No plans yet"
description="A plan is a list of workouts for certain days."
title='No plans yet'
description='A plan is a list of workouts for certain days.'
/>
) : (
)
: (
<FlatList
style={{ flex: 1 }}
data={plans}
renderItem={renderItem}
keyExtractor={set => set.id?.toString() || ''}
keyExtractor={(set) => set.id?.toString() || ''}
/>
)}
</Page>

11
PlanPage.tsx
View File

@ -10,11 +10,12 @@ const Stack = createStackNavigator<PlanPageParams>()
export default function PlanPage() {
return (
<Stack.Navigator
screenOptions={{headerShown: false, animationEnabled: false}}>
<Stack.Screen name="PlanList" component={PlanList} />
<Stack.Screen name="EditPlan" component={EditPlan} />
<Stack.Screen name="StartPlan" component={StartPlan} />
<Stack.Screen name="EditSet" component={EditSet} />
screenOptions={{ headerShown: false, animationEnabled: false }}
>
<Stack.Screen name='PlanList' component={PlanList} />
<Stack.Screen name='EditPlan' component={EditPlan} />
<Stack.Screen name='StartPlan' component={StartPlan} />
<Stack.Screen name='EditSet' component={EditSet} />
</Stack.Navigator>
)
}

27
Routes.tsx
View File

@ -20,36 +20,37 @@ export default function Routes() {
headerTintColor: dark ? 'white' : 'black',
swipeEdgeWidth: 1000,
headerShown: false,
}}>
}}
>
<Drawer.Screen
name="Home"
name='Home'
component={HomePage}
options={{drawerIcon: () => <IconButton icon="home" />}}
options={{ drawerIcon: () => <IconButton icon='home' /> }}
/>
<Drawer.Screen
name="Plans"
name='Plans'
component={PlanPage}
options={{drawerIcon: () => <IconButton icon="event" />}}
options={{ drawerIcon: () => <IconButton icon='event' /> }}
/>
<Drawer.Screen
name="Best"
name='Best'
component={BestPage}
options={{drawerIcon: () => <IconButton icon="insights" />}}
options={{ drawerIcon: () => <IconButton icon='insights' /> }}
/>
<Drawer.Screen
name="Workouts"
name='Workouts'
component={WorkoutsPage}
options={{drawerIcon: () => <IconButton icon="fitness-center" />}}
options={{ drawerIcon: () => <IconButton icon='fitness-center' /> }}
/>
<Drawer.Screen
name="Timer"
name='Timer'
component={TimerPage}
options={{drawerIcon: () => <IconButton icon="access-time" />}}
options={{ drawerIcon: () => <IconButton icon='access-time' /> }}
/>
<Drawer.Screen
name="Settings"
name='Settings'
component={SettingsPage}
options={{drawerIcon: () => <IconButton icon="settings" />}}
options={{ drawerIcon: () => <IconButton icon='settings' /> }}
/>
</Drawer.Navigator>
)

13
Select.tsx
View File

@ -24,7 +24,7 @@ function Select({
const { colors } = useTheme()
const selected = useMemo(
() => items.find(item => item.value === value) || items[0],
() => items.find((item) => item.value === value) || items[0],
[items, value],
)
@ -42,7 +42,8 @@ function Select({
flexDirection: 'row',
alignItems: 'center',
paddingLeft: ITEM_PADDING,
}}>
}}
>
{label && <Subheading style={{ width: 100 }}>{label}</Subheading>}
<Menu
visible={show}
@ -52,11 +53,13 @@ function Select({
onPress={() => setShow(true)}
style={{
alignSelf: 'flex-start',
}}>
}}
>
{selected?.label}
</Button>
}>
{items.map(item => (
}
>
{items.map((item) => (
<Menu.Item
key={item.value}
titleStyle={{ color: item.color || colors.text }}

15
SetItem.tsx
View File

@ -31,8 +31,8 @@ export default function SetItem({
const press = useCallback(() => {
if (ids.length === 0) return navigation.navigate('EditSet', { set: item })
const removing = ids.find(id => id === item.id)
if (removing) setIds(ids.filter(id => id !== item.id))
const removing = ids.find((id) => id === item.id)
if (removing) setIds(ids.filter((id) => id !== item.id))
else setIds([...ids, item.id])
}, [ids, item, navigation, setIds])
@ -53,9 +53,11 @@ export default function SetItem({
left={() =>
settings.images &&
item.image && (
<Image source={{uri: item.image}} style={{height: 75, width: 75}} />
)
}
<Image
source={{ uri: item.image }}
style={{ height: 75, width: 75 }}
/>
)}
right={() => (
<>
{settings.showDate && (
@ -63,7 +65,8 @@ export default function SetItem({
style={{
alignSelf: 'center',
color: dark ? '#909090ff' : '#717171ff',
}}>
}}
>
{format(new Date(item.created), settings.date || 'P')}
</Text>
)}

12
SetList.tsx
View File

@ -121,7 +121,7 @@ export default function SetList() {
}, [ids, refresh, term])
const select = useCallback(() => {
setIds(sets.map(set => set.id))
setIds(sets.map((set) => set.id))
}, [sets])
return (
@ -138,12 +138,14 @@ export default function SetList() {
</DrawerHeader>
<Page onAdd={onAdd} term={term} search={search}>
{sets?.length === 0 ? (
{sets?.length === 0
? (
<List.Item
title="No sets yet"
description="A set is a group of repetitions. E.g. 8 reps of Squats."
title='No sets yet'
description='A set is a group of repetitions. E.g. 8 reps of Squats.'
/>
) : (
)
: (
settings && (
<FlatList
data={sets}

42
SettingsPage.tsx
View File

@ -52,8 +52,14 @@ export default function SettingsPage() {
})
const settings = watch()
const {theme, setTheme, lightColor, setLightColor, darkColor, setDarkColor} =
useTheme()
const {
theme,
setTheme,
lightColor,
setLightColor,
darkColor,
setDarkColor,
} = useTheme()
useEffect(() => {
NativeModules.SettingsModule.ignoringBattery(setIgnoring)
@ -168,7 +174,7 @@ export default function SettingsPage() {
<Switch
key={item.name}
value={item.value}
onChange={value => changeBoolean(item.key, value)}
onChange={(value) => changeBoolean(item.key, value)}
title={item.name}
/>
),
@ -176,7 +182,7 @@ export default function SettingsPage() {
)
const switchesMarkup = useMemo(
() => switches.filter(filter).map(s => renderSwitch(s)),
() => switches.filter(filter).map((s) => renderSwitch(s)),
[filter, switches, renderSwitch],
)
@ -227,7 +233,7 @@ export default function SettingsPage() {
{
name: 'Date format',
value: settings.date,
items: formatOptions.map(option => ({
items: formatOptions.map((option) => ({
label: format(today, option),
value: option,
})),
@ -241,7 +247,7 @@ export default function SettingsPage() {
<Select
key={item.name}
value={item.value}
onChange={value => changeString(item.key, value)}
onChange={(value) => changeString(item.key, value)}
label={item.name}
items={item.items}
/>
@ -287,12 +293,13 @@ export default function SettingsPage() {
name: 'Alarm sound',
element: (
<View
key="alarm-sound"
key='alarm-sound'
style={{
flexDirection: 'row',
alignItems: 'center',
paddingLeft: ITEM_PADDING,
}}>
}}
>
<Subheading style={{ width: 100 }}>Alarm sound</Subheading>
<Button onPress={changeSound}>{soundString || 'Default'}</Button>
</View>
@ -302,9 +309,10 @@ export default function SettingsPage() {
name: 'Export database',
element: (
<Button
key="export-db"
key='export-db'
style={{ alignSelf: 'flex-start' }}
onPress={exportDatabase}>
onPress={exportDatabase}
>
Export database
</Button>
),
@ -313,9 +321,10 @@ export default function SettingsPage() {
name: 'Import database',
element: (
<Button
key="import-db"
key='import-db'
style={{ alignSelf: 'flex-start' }}
onPress={() => setImporting(true)}>
onPress={() => setImporting(true)}
>
Import database
</Button>
),
@ -325,13 +334,13 @@ export default function SettingsPage() {
)
const buttonsMarkup = useMemo(
() => buttons.filter(filter).map(b => b.element),
() => buttons.filter(filter).map((b) => b.element),
[buttons, filter],
)
return (
<>
<DrawerHeader name="Settings" />
<DrawerHeader name='Settings' />
<Page term={term} search={setTerm} style={{ flexGrow: 1 }}>
<ScrollView style={{ marginTop: MARGIN, flex: 1 }}>
@ -342,10 +351,11 @@ export default function SettingsPage() {
</Page>
<ConfirmDialog
title="Are you sure?"
title='Are you sure?'
onOk={confirmImport}
setShow={setImporting}
show={importing}>
show={importing}
>
Importing a database overwrites your current data. This action cannot be
reversed!
</ConfirmDialog>

2
StackHeader.tsx
View File

@ -16,7 +16,7 @@ export default function StackHeader({
<Appbar.Header>
<IconButton
color={dark ? 'white' : 'white'}
icon="arrow-back"
icon='arrow-back'
onPress={navigation.goBack}
/>
<Appbar.Content title={title} />

29
StartPlan.tsx
View File

@ -104,11 +104,12 @@ export default function StartPlan() {
if (
settings.notify &&
(+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.')
}
if (!settings.alarm) return
const milliseconds =
Number(best.minutes) * 60 * 1000 + Number(best.seconds) * 1000
const milliseconds = Number(best.minutes) * 60 * 1000 +
Number(best.seconds) * 1000
NativeModules.AlarmModule.timer(milliseconds)
}
@ -118,24 +119,24 @@ export default function StartPlan() {
<IconButton
color={dark ? 'white' : 'white'}
onPress={() => navigation.navigate('EditPlan', { plan: params.plan })}
icon="edit"
icon='edit'
/>
</StackHeader>
<View style={{ padding: PADDING, flex: 1, flexDirection: 'column' }}>
<View style={{ flex: 1 }}>
<AppInput
label="Reps"
keyboardType="numeric"
label='Reps'
keyboardType='numeric'
value={reps}
onChangeText={setReps}
onSubmitEditing={() => weightRef.current?.focus()}
selection={selection}
onSelectionChange={e => setSelection(e.nativeEvent.selection)}
onSelectionChange={(e) => setSelection(e.nativeEvent.selection)}
innerRef={repsRef}
/>
<AppInput
label="Weight"
keyboardType="numeric"
label='Weight'
keyboardType='numeric'
value={weight}
onChangeText={setWeight}
onSubmitEditing={handleSubmit}
@ -144,8 +145,8 @@ export default function StartPlan() {
/>
{settings?.showUnit && (
<AppInput
autoCapitalize="none"
label="Unit"
autoCapitalize='none'
label='Unit'
value={unit}
onChangeText={setUnit}
innerRef={unitRef}
@ -154,7 +155,7 @@ export default function StartPlan() {
{counts && (
<FlatList
data={counts}
renderItem={props => (
renderItem={(props) => (
<View>
<StartPlanItem
{...props}
@ -170,7 +171,7 @@ export default function StartPlan() {
/>
)}
</View>
<Button mode="contained" icon="save" onPress={handleSubmit}>
<Button mode='contained' icon='save' onPress={handleSubmit}>
Save
</Button>
</View>

19
StartPlanItem.tsx
View File

@ -66,14 +66,15 @@ export default function StartPlanItem(props: Props) {
<List.Item
onLongPress={longPress}
title={item.name}
description={
item.sets ? `${item.total} / ${item.sets}` : item.total.toString()
}
description={item.sets
? `${item.total} / ${item.sets}`
: item.total.toString()}
onPress={() => onSelect(index)}
left={() => (
<View style={{ alignItems: 'center', justifyContent: 'center' }}>
<RadioButton
onPress={() => onSelect(index)}
onPress={() =>
onSelect(index)}
value={index.toString()}
status={selected === index ? 'checked' : 'unchecked'}
color={colors.primary}
@ -85,13 +86,15 @@ export default function StartPlanItem(props: Props) {
style={{
width: '25%',
justifyContent: 'center',
}}>
}}
>
<Menu
anchor={anchor}
visible={showMenu}
onDismiss={() => setShowMenu(false)}>
<Menu.Item icon="edit" onPress={edit} title="Edit" />
<Menu.Item icon="undo" onPress={undo} title="Undo" />
onDismiss={() => setShowMenu(false)}
>
<Menu.Item icon='edit' onPress={edit} title='Edit' />
<Menu.Item icon='undo' onPress={undo} title='Undo' />
</Menu>
</View>
)}

3
Switch.tsx
View File

@ -22,7 +22,8 @@ function Switch({
flexWrap: 'wrap',
alignItems: 'center',
marginBottom: Platform.OS === 'ios' ? MARGIN : null,
}}>
}}
>
<PaperSwitch
color={colors.primary}
style={{ marginRight: MARGIN }}

7
TimerPage.tsx
View File

@ -45,14 +45,15 @@ export default function TimerPage() {
return (
<>
<DrawerHeader name="Timer" />
<DrawerHeader name='Timer' />
<View style={{ flexGrow: 1, padding: PADDING }}>
<View
style={{
flex: 1,
justifyContent: 'center',
alignItems: 'center',
}}>
}}
>
<Text style={{ fontSize: 70, position: 'absolute' }}>
{minutes}:{seconds}
</Text>
@ -68,7 +69,7 @@ export default function TimerPage() {
<Button onPress={add} style={{ position: 'absolute', top: '82%', left }}>
Add 1 min
</Button>
<AppFab icon="stop" onPress={stop} />
<AppFab icon='stop' onPress={stop} />
</>
)
}

44
ViewBest.tsx
View File

@ -34,11 +34,11 @@ export default function ViewBest() {
if (period === Periods.Yearly) group = '%Y-%m'
const builder = setRepo
.createQueryBuilder()
.select("STRFTIME('%Y-%m-%d', created)", 'created')
.select('STRFTIME(\'%Y-%m-%d\', created)', 'created')
.addSelect('unit')
.where('name = :name', { name: params.best.name })
.andWhere('NOT hidden')
.andWhere("DATE(created) >= DATE('now', 'weekday 0', :difference)", {
.andWhere('DATE(created) >= DATE(\'now\', \'weekday 0\', :difference)', {
difference,
})
.groupBy('name')
@ -64,7 +64,7 @@ export default function ViewBest() {
'weight',
)
.getRawMany()
.then(newWeights => {
.then((newWeights) => {
console.log({ weights: newWeights })
setWeights(newWeights)
})
@ -76,32 +76,31 @@ export default function ViewBest() {
(metric === Metrics.Volume && volumes?.length === 0) ||
(metric === Metrics.Weight && weights?.length === 0) ||
(metric === Metrics.OneRepMax && weights?.length === 0)
)
return <List.Item title="No data yet." />
if (metric === Metrics.Volume && volumes?.length && weights?.length)
) {
return <List.Item title='No data yet.' />
}
if (metric === Metrics.Volume && volumes?.length && weights?.length) {
return (
<Chart
yData={volumes.map(v => v.value)}
yData={volumes.map((v) => v.value)}
yFormat={(value: number) =>
`${value.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ',')}${
volumes[0].unit || 'kg'
}`
}
}`}
xData={weights}
xFormat={(_value, index) =>
format(new Date(weights[index].created), 'd/M')
}
format(new Date(weights[index].created), 'd/M')}
/>
)
}
return (
<Chart
yData={weights?.map(set => set.weight) || []}
yFormat={value => `${value}${weights?.[0].unit}`}
yData={weights?.map((set) => set.weight) || []}
yFormat={(value) => `${value}${weights?.[0].unit}`}
xData={weights || []}
xFormat={(_value, index) =>
format(new Date(weights?.[index].created), 'd/M')
}
format(new Date(weights?.[index].created), 'd/M')}
/>
)
}, [volumes, weights, metric])
@ -112,21 +111,20 @@ export default function ViewBest() {
<IconButton
color={dark ? 'white' : 'white'}
onPress={() =>
captureScreen().then(async uri => {
captureScreen().then(async (uri) => {
const base64 = await FileSystem.readFile(uri, 'base64')
const url = `data:image/jpeg;base64,${base64}`
Share.open({
type: 'image/jpeg',
url,
})
})
}
icon="share"
})}
icon='share'
/>
</StackHeader>
<View style={{ padding: PADDING }}>
<Select
label="Metric"
label='Metric'
items={[
{ value: Metrics.Volume, label: Metrics.Volume },
{ value: Metrics.OneRepMax, label: Metrics.OneRepMax },
@ -135,17 +133,17 @@ export default function ViewBest() {
value: Metrics.Weight,
},
]}
onChange={value => setMetric(value as Metrics)}
onChange={(value) => setMetric(value as Metrics)}
value={metric}
/>
<Select
label="Period"
label='Period'
items={[
{ value: Periods.Weekly, label: Periods.Weekly },
{ value: Periods.Monthly, label: Periods.Monthly },
{ value: Periods.Yearly, label: Periods.Yearly },
]}
onChange={value => setPeriod(value as Periods)}
onChange={(value) => setPeriod(value as Periods)}
value={period}
/>
{charts}

23
WorkoutItem.tsx
View File

@ -50,25 +50,29 @@ export default function WorkoutItem({
left={() =>
images &&
item.image && (
<Image source={{uri: item.image}} style={{height: 75, width: 75}} />
)
}
<Image
source={{ uri: item.image }}
style={{ height: 75, width: 75 }}
/>
)}
right={() => (
<Text
style={{
alignSelf: 'center',
}}>
}}
>
<Menu
anchor={anchor}
visible={showMenu}
onDismiss={() => setShowMenu(false)}>
onDismiss={() => setShowMenu(false)}
>
<Menu.Item
icon="delete"
icon='delete'
onPress={() => {
setShowRemove(item.name)
setShowMenu(false)
}}
title="Delete"
title='Delete'
/>
</Menu>
</Text>
@ -77,8 +81,9 @@ export default function WorkoutItem({
<ConfirmDialog
title={`Delete ${showRemove}`}
show={!!showRemove}
setShow={show => (show ? null : setShowRemove(''))}
onOk={remove}>
setShow={(show) => (show ? null : setShowRemove(''))}
onOk={remove}
>
This irreversibly deletes ALL sets related to this workout. Are you
sure?
</ConfirmDialog>

14
WorkoutList.tsx
View File

@ -100,19 +100,21 @@ export default function WorkoutList() {
return (
<>
<DrawerHeader name="Workouts" />
<DrawerHeader name='Workouts' />
<Page onAdd={onAdd} term={term} search={search}>
{workouts?.length === 0 ? (
{workouts?.length === 0
? (
<List.Item
title="No workouts yet."
description="A workout is something you do at the gym. For example Deadlifts are a workout."
title='No workouts yet.'
description='A workout is something you do at the gym. For example Deadlifts are a workout.'
/>
) : (
)
: (
<FlatList
data={workouts}
style={{ flex: 1 }}
renderItem={renderItem}
keyExtractor={w => w.name}
keyExtractor={(w) => w.name}
onEndReached={next}
/>
)}

7
WorkoutsPage.tsx
View File

@ -15,9 +15,10 @@ const Stack = createStackNavigator<WorkoutsPageParams>()
export default function WorkoutsPage() {
return (
<Stack.Navigator
screenOptions={{headerShown: false, animationEnabled: false}}>
<Stack.Screen name="WorkoutList" component={WorkoutList} />
<Stack.Screen name="EditWorkout" component={EditWorkout} />
screenOptions={{ headerShown: false, animationEnabled: false }}
>
<Stack.Screen name='WorkoutList' component={WorkoutList} />
<Stack.Screen name='EditWorkout' component={EditWorkout} />
</Stack.Navigator>
)
}

4
best.service.ts
View File

@ -19,8 +19,8 @@ export const getLast = async (name: string): Promise<GymSet> => {
.createQueryBuilder()
.where('name = :name', { name })
.andWhere('reps >= 5')
.andWhere("strftime('%Y-%m-%d', 'now', 'localtime') > created")
.groupBy("STRFTIME('%Y-%m-%d', created)")
.andWhere('strftime(\'%Y-%m-%d\', \'now\', \'localtime\') > created')
.groupBy('STRFTIME(\'%Y-%m-%d\', created)')
.orderBy('created', 'DESC')
.select('reps')
.addSelect('MAX(weight) as weight')

3
colors.ts
View File

@ -18,8 +18,9 @@ export const darkColors = [
export const colorShade = (color: any, amount: number) => {
color = color.replace(/^#/, '')
if (color.length === 3)
if (color.length === 3) {
color = color[0] + color[0] + color[1] + color[1] + color[2] + color[2]
}
let [r, g, b] = color.match(/.{2}/g)
;[r, g, b] = [

2
db.ts
View File

@ -9,7 +9,7 @@ export const settingsRepo = AppDataSource.manager.getRepository(Settings)
export const getNow = async (): Promise<string> => {
const query = await AppDataSource.manager.query(
"SELECT STRFTIME('%Y-%m-%dT%H:%M:%S','now','localtime') AS now",
'SELECT STRFTIME(\'%Y-%m-%dT%H:%M:%S\',\'now\',\'localtime\') AS now',
)
return query[0].now
}

11
deno.json Normal file
View File

@ -0,0 +1,11 @@
{
"fmt": {
"useTabs": false,
"lineWidth": 80,
"semiColons": false,
"singleQuote": true,
"proseWrap": "preserve",
"include": ["src/"],
"exclude": ["src/testdata/", "data/fixtures/**/*.ts"]
}
}

5
mock-providers.tsx
View File

@ -13,7 +13,7 @@ export const MockProviders = ({
}: {
children: JSX.Element | JSX.Element[]
}) => (
<PaperProvider settings={{icon: props => <MaterialIcon {...props} />}}>
<PaperProvider settings={{ icon: (props) => <MaterialIcon {...props} /> }}>
<ThemeContext.Provider
value={{
theme: 'system',
@ -22,7 +22,8 @@ export const MockProviders = ({
darkColor: DarkTheme.colors.primary,
setLightColor: jest.fn(),
setDarkColor: jest.fn(),
}}>
}}
>
<NavigationContainer>{children}</NavigationContainer>
</ThemeContext.Provider>
</PaperProvider>

4
options.ts
View File

@ -6,13 +6,13 @@ export const themeOptions = [
{ label: 'Light', value: 'light' },
]
export const lightOptions = lightColors.map(color => ({
export const lightOptions = lightColors.map((color) => ({
label: color.name,
value: color.hex,
color: color.hex,
}))
export const darkOptions = darkColors.map(color => ({
export const darkOptions = darkColors.map((color) => ({
label: color.name,
value: color.hex,
color: color.hex,

2
organize.sh
View File

@ -1,3 +1,3 @@
#!/bin/sh
organize-imports-cli *.ts* tests/*.ts* && prettier --write *.ts* tests/*.ts*
organize-imports-cli *.ts* tests/*.ts* && deno fmt *.ts* tests/*.ts*

2
tests/BestPage.test.tsx
View File

@ -34,7 +34,7 @@ jest.mock('../db.ts', () => ({
reps: 10,
image: 'https://picsum.photos/id/1/1000/600',
},
]),
])
),
}),
},

4
tests/EditPlan.test.tsx
View File

@ -18,7 +18,7 @@ jest.mock('../db.ts', () => ({
{ name: 'Bench press' },
{ name: 'Bicep curls' },
{ name: 'Rows' },
]),
])
),
}),
},
@ -37,7 +37,7 @@ test('renders correctly', async () => {
id: 1,
} as Plan,
}}
name="EditPlan"
name='EditPlan'
component={EditPlan}
/>
</Stack.Navigator>

6
tests/EditSet.test.tsx
View File

@ -37,7 +37,7 @@ test('renders correctly', async () => {
id: 1,
} as GymSet,
}}
name="EditSet"
name='EditSet'
component={EditSet}
/>
</Stack.Navigator>
@ -58,7 +58,7 @@ test('saves', async () => {
const { getByText, getAllByText, getByTestId } = render(
<MockProviders>
<Stack.Navigator>
<Stack.Screen name="Sets" component={SetList} />
<Stack.Screen name='Sets' component={SetList} />
<Stack.Screen
initialParams={{
set: {
@ -66,7 +66,7 @@ test('saves', async () => {
id: 1,
} as GymSet,
}}
name="EditSet"
name='EditSet'
component={EditSet}
/>
</Stack.Navigator>

4
tests/EditSets.test.tsx
View File

@ -43,7 +43,7 @@ test('renders correctly', async () => {
<Stack.Navigator>
<Stack.Screen
initialParams={{ ids: [1, 2, 3] }}
name="EditSets"
name='EditSets'
component={EditSets}
/>
</Stack.Navigator>
@ -65,7 +65,7 @@ test('saves', async () => {
<Stack.Navigator>
<Stack.Screen
initialParams={{ ids: [1, 2, 3] }}
name="EditSets"
name='EditSets'
component={EditSets}
/>
</Stack.Navigator>

2
tests/EditWorkout.test.tsx
View File

@ -27,7 +27,7 @@ test('renders correctly', async () => {
initialParams={{
value: { name: 'Bench press' } as GymSet,
}}
name="EditWorkout"
name='EditWorkout'
component={EditWorkout}
/>
</Stack.Navigator>

2
tests/PlanList.test.tsx
View File

@ -26,7 +26,7 @@ jest.mock('../db.ts', () => ({
{
name: 'Rows',
},
]),
])
),
}),
},

6
tests/StartPlan.test.tsx
View File

@ -37,7 +37,7 @@ jest.mock('../data-source.ts', () => ({
{ name: 'Bench', total: 0 },
{ name: 'Rows', total: 0 },
{ name: 'Curls', total: 0 },
]),
])
),
},
},
@ -56,7 +56,7 @@ test('renders correctly', async () => {
days: 'Monday,Tuesday,Thursday',
} as Plan,
}}
name="StartPlan"
name='StartPlan'
component={StartPlan}
/>
</Stack.Navigator>
@ -86,7 +86,7 @@ test('saves', async () => {
days: 'Monday,Tuesday,Thursday',
} as Plan,
}}
name="StartPlan"
name='StartPlan'
component={StartPlan}
/>
</Stack.Navigator>

4
tests/ViewBest.test.tsx
View File

@ -35,7 +35,7 @@ jest.mock('../db.ts', () => ({
created: '2021-01-05T03:58:02.565Z',
weight: 28,
},
]),
])
),
getMany: jest.fn(() =>
Promise.resolve([
@ -57,7 +57,7 @@ jest.mock('../db.ts', () => ({
reps: 10,
image: 'https://picsum.photos/id/1/1000/600',
},
]),
])
),
}),
},

3
write.ts
View File

@ -14,7 +14,8 @@ export const write = async (name: string, data: string) => {
const granted = await permission()
if (!granted) return
await FileSystem.writeFile(filePath, data)
if (Platform.OS === 'android')
if (Platform.OS === 'android') {
await FileSystem.cpExternal(filePath, name, 'downloads')
}
toast(`Downloaded ${name}`)
}