diff --git a/EditSet.tsx b/EditSet.tsx index 9c715e4..222ec12 100644 --- a/EditSet.tsx +++ b/EditSet.tsx @@ -30,6 +30,7 @@ import StackHeader from "./StackHeader"; import { toast } from "./toast"; import Select from "./Select"; import { PERMISSIONS, RESULTS, check, request } from "react-native-permissions"; +import { convert } from "./conversions"; export default function EditSet() { const { params } = useRoute>(); @@ -97,12 +98,19 @@ export default function EditSet() { const handleSubmit = async () => { if (!name) return; + let newWeight = Number(weight); + let newUnit = unit; + if (settings.autoConvert && unit !== settings.autoConvert) { + newUnit = settings.autoConvert; + newWeight = convert(newWeight, unit, settings.autoConvert); + } + const newSet: Partial = { id: set.id, name, reps: Number(reps || 0), - weight: Number(weight || 0), - unit, + weight: newWeight, + unit: newUnit, minutes: Number(set.minutes ?? 3), seconds: Number(set.seconds ?? 30), sets: set.sets ?? 3, diff --git a/SettingsPage.tsx b/SettingsPage.tsx index abede86..1be837a 100644 --- a/SettingsPage.tsx +++ b/SettingsPage.tsx @@ -214,6 +214,27 @@ export default function SettingsPage() { /> ), }, + { + name: "Auto convert", + renderItem: (name: string) => ( +