diff --git a/EditWorkout.tsx b/EditWorkout.tsx index 33f8c5a..383f880 100644 --- a/EditWorkout.tsx +++ b/EditWorkout.tsx @@ -12,9 +12,11 @@ import AppInput from "./AppInput"; import ConfirmDialog from "./ConfirmDialog"; import { MARGIN, PADDING } from "./constants"; import { getNow, planRepo, setRepo, settingsRepo } from "./db"; +import { fixNumeric } from "./fix-numeric"; import { defaultSet } from "./gym-set"; import Settings from "./settings"; import StackHeader from "./StackHeader"; +import { toast } from "./toast"; import { WorkoutsPageParams } from "./WorkoutsPage"; export default function EditWorkout() { @@ -131,7 +133,12 @@ export default function EditWorkout() { { + const fixed = fixNumeric(newSets); + setSets(fixed); + if (fixed.length !== newSets.length) + toast("Sets must be a number"); + }} label="Sets per workout" keyboardType="numeric" onSubmitEditing={() => minutesRef.current?.focus()} @@ -142,7 +149,12 @@ export default function EditWorkout() { innerRef={minutesRef} onSubmitEditing={() => secondsRef.current?.focus()} value={minutes} - onChangeText={setMinutes} + onChangeText={(newMinutes) => { + const fixed = fixNumeric(newMinutes); + setMinutes(fixed); + if (fixed.length !== newMinutes.length) + toast("Reps must be a number"); + }} label="Rest minutes" keyboardType="numeric" /> diff --git a/android/app/build.gradle b/android/app/build.gradle index fcd4d31..c0d19b2 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -85,8 +85,8 @@ android { applicationId "com.massive" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 36172 - versionName "1.146" + versionCode 36173 + versionName "1.147" } signingConfigs { release { diff --git a/package.json b/package.json index 73a7e04..c544d4f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "massive", - "version": "1.146", + "version": "1.147", "private": true, "license": "GPL-3.0-only", "scripts": {